diff options
author | Stefan Weiberg <stefan.weiberg@germandev.org> | 2014-09-05 15:34:48 +0000 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2014-09-08 03:02:57 -0500 |
commit | 481cd6368bd1af2b4a51be57bcedfb8fc631bf0e (patch) | |
tree | 5ad82755ca6c11db9d47ac5034b1562c4bfb96ab /sc | |
parent | 34a68f0aa92de05123c1e951899c08eed5a55543 (diff) |
Related #82088: removed last css aliases in hxx
* Only unfixed header namespace alias in
ConnectionLog.hxx:
LogLevel = ::com::sun::star::logging::LogLevel
Change-Id: I48c941a4762830f2265c8241f4c1695a43ec891a
Reviewed-on: https://gerrit.libreoffice.org/11333
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'sc')
-rw-r--r-- | sc/inc/ScPanelFactory.hxx | 13 | ||||
-rw-r--r-- | sc/inc/validat.hxx | 1 | ||||
-rw-r--r-- | sc/source/core/data/documen3.cxx | 2 | ||||
-rw-r--r-- | sc/source/core/data/validat.cxx | 6 | ||||
-rw-r--r-- | sc/source/filter/excel/xecontent.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/excel/xicontent.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/dbgui/validate.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/cellsh2.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/gridwin.cxx | 2 |
9 files changed, 16 insertions, 16 deletions
diff --git a/sc/inc/ScPanelFactory.hxx b/sc/inc/ScPanelFactory.hxx index c3b5ed3ad554..afef80e29d55 100644 --- a/sc/inc/ScPanelFactory.hxx +++ b/sc/inc/ScPanelFactory.hxx @@ -24,7 +24,6 @@ #include <com/sun/star/ui/XUIElementFactory.hpp> #include <boost/noncopyable.hpp> -namespace cssu = ::com::sun::star::uno; namespace sc { namespace sidebar { @@ -42,21 +41,21 @@ class ScPanelFactory { public: static ::rtl::OUString SAL_CALL getImplementationName(void); - static cssu::Reference<cssu::XInterface> SAL_CALL createInstance( - const cssu::Reference<css::lang::XMultiServiceFactory>& rxFactory); - static cssu::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames(void); + static css::uno::Reference<css::uno::XInterface> SAL_CALL createInstance( + const css::uno::Reference<css::lang::XMultiServiceFactory>& rxFactory); + static css::uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames(void); ScPanelFactory(void); virtual ~ScPanelFactory(void); // XUIElementFactory - cssu::Reference<css::ui::XUIElement> SAL_CALL createUIElement( + css::uno::Reference<css::ui::XUIElement> SAL_CALL createUIElement( const ::rtl::OUString& rsResourceURL, - const ::cssu::Sequence<css::beans::PropertyValue>& rArguments) + const ::css::uno::Sequence<css::beans::PropertyValue>& rArguments) throw( css::container::NoSuchElementException, css::lang::IllegalArgumentException, - cssu::RuntimeException, std::exception ) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; } } // end of namespace sc::sidebar diff --git a/sc/inc/validat.hxx b/sc/inc/validat.hxx index 5b185cb50e8b..724ea9643a73 100644 --- a/sc/inc/validat.hxx +++ b/sc/inc/validat.hxx @@ -24,7 +24,6 @@ #include <com/sun/star/sheet/TableValidationVisibility.hpp> #include "scdllapi.h" -namespace ValidListType = ::com::sun::star::sheet::TableValidationVisibility; namespace sc { diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx index d439a44dee49..6bf981c07a7c 100644 --- a/sc/source/core/data/documen3.cxx +++ b/sc/source/core/data/documen3.cxx @@ -1530,7 +1530,7 @@ bool ScDocument::GetDataEntries( const ScValidationData* pData = GetValidationEntry( nValidation ); if( pData && pData->FillSelectionList( rStrings, ScAddress( nCol, nRow, nTab ) ) ) { - if (pData->GetListType() == ValidListType::SORTEDASCENDING) + if (pData->GetListType() == css::sheet::TableValidationVisibility::SORTEDASCENDING) sortAndRemoveDuplicates(rStrings, bCaseSens); return true; diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx index 3d445c49aef0..c85ad2527b24 100644 --- a/sc/source/core/data/validat.cxx +++ b/sc/source/core/data/validat.cxx @@ -68,7 +68,7 @@ ScValidationData::ScValidationData( ScValidationMode eMode, ScConditionMode eOpe , bShowInput(false) , bShowError(false) , eErrorStyle( SC_VALERR_STOP ) - , mnListType( ValidListType::UNSORTED ) + , mnListType( css::sheet::TableValidationVisibility::UNSORTED ) { } @@ -81,7 +81,7 @@ ScValidationData::ScValidationData( ScValidationMode eMode, ScConditionMode eOpe , bShowInput(false) , bShowError(false) , eErrorStyle( SC_VALERR_STOP ) - , mnListType( ValidListType::UNSORTED ) + , mnListType( css::sheet::TableValidationVisibility::UNSORTED ) { } @@ -613,7 +613,7 @@ sal_uLong lclGetCellFormat( ScDocument& rDoc, const ScAddress& rPos ) bool ScValidationData::HasSelectionList() const { - return (eDataMode == SC_VALID_LIST) && (mnListType != ValidListType::INVISIBLE); + return (eDataMode == SC_VALID_LIST) && (mnListType != css::sheet::TableValidationVisibility::INVISIBLE); } bool ScValidationData::GetSelectionFromFormula( diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx index f0e8a079e502..7e395364732b 100644 --- a/sc/source/filter/excel/xecontent.cxx +++ b/sc/source/filter/excel/xecontent.cxx @@ -1530,7 +1530,7 @@ XclExpDV::XclExpDV( const XclExpRoot& rRoot, sal_uLong nScHandle ) : default: OSL_FAIL( "XclExpDV::XclExpDV - unknown error style" ); } ::set_flag( mnFlags, EXC_DV_IGNOREBLANK, pValData->IsIgnoreBlank() ); - ::set_flag( mnFlags, EXC_DV_SUPPRESSDROPDOWN, pValData->GetListType() == ValidListType::INVISIBLE ); + ::set_flag( mnFlags, EXC_DV_SUPPRESSDROPDOWN, pValData->GetListType() == css::sheet::TableValidationVisibility::INVISIBLE ); ::set_flag( mnFlags, EXC_DV_SHOWPROMPT, bShowPrompt ); ::set_flag( mnFlags, EXC_DV_SHOWERROR, bShowError ); diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx index d572ae709449..491517a9f210 100644 --- a/sc/source/filter/excel/xicontent.cxx +++ b/sc/source/filter/excel/xicontent.cxx @@ -857,7 +857,7 @@ void XclImpValidationManager::ReadDV( XclImpStream& rStrm ) DVItem& rItem = maDVItems.back(); rItem.maValidData.SetIgnoreBlank( ::get_flag( nFlags, EXC_DV_IGNOREBLANK ) ); - rItem.maValidData.SetListType( ::get_flagvalue( nFlags, EXC_DV_SUPPRESSDROPDOWN, ValidListType::INVISIBLE, ValidListType::UNSORTED ) ); + rItem.maValidData.SetListType( ::get_flagvalue( nFlags, EXC_DV_SUPPRESSDROPDOWN, css::sheet::TableValidationVisibility::INVISIBLE, css::sheet::TableValidationVisibility::UNSORTED ) ); // *** prompt box *** if( !aPromptTitle.isEmpty() || !aPromptMessage.isEmpty() ) diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index c4b9514ddc98..ef4351ece0ea 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -71,6 +71,8 @@ #define SC_VALIDDLG_DATA_VALIDRANGE 6 #define SC_VALIDDLG_DATA_INVALIDRANGE 7 +namespace ValidListType = css::sheet::TableValidationVisibility; + static const sal_uInt16 pValueRanges[] = { FID_VALID_MODE, FID_VALID_ERRTEXT, diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx index 0375c96731ce..e921a1aabcd8 100644 --- a/sc/source/ui/view/cellsh2.cxx +++ b/sc/source/ui/view/cellsh2.cxx @@ -789,7 +789,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) ScConditionMode eOper = SC_COND_EQUAL; OUString aExpr1, aExpr2; bool bBlank = true; - sal_Int16 nListType = ValidListType::UNSORTED; + sal_Int16 nListType = css::sheet::TableValidationVisibility::UNSORTED; bool bShowHelp = false; OUString aHelpTitle, aHelpText; bool bShowError = false; diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index e405524aa874..071558c4e3fc 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -1271,7 +1271,7 @@ void ScGridWindow::LaunchDataSelectMenu( SCCOL nCol, SCROW nRow, bool bDataSelec else pNew.reset(new ScTypedStrData(aDocStr, 0.0, ScTypedStrData::Standard)); - bool bSortList = ( pData->GetListType() == ValidListType::SORTEDASCENDING); + bool bSortList = ( pData->GetListType() == css::sheet::TableValidationVisibility::SORTEDASCENDING); if ( bSortList ) { std::vector<ScTypedStrData>::const_iterator itBeg = aStrings.begin(), itEnd = aStrings.end(); |