[Libreoffice-commits] core.git: dbaccess/source sc/inc sc/source svx/source uui/source xmlsecurity/inc xmlsecurity/source xmlsecurity/workben
Stefan Weiberg
stefan.weiberg at germandev.org
Mon Sep 8 01:03:23 PDT 2014
dbaccess/source/core/recovery/dbdocrecovery.cxx | 58 +++++-----
dbaccess/source/core/recovery/subcomponentrecovery.cxx | 71 ++++++-------
dbaccess/source/core/recovery/subcomponentrecovery.hxx | 38 +++---
dbaccess/source/core/recovery/subcomponents.hxx | 10 -
sc/inc/ScPanelFactory.hxx | 13 +-
sc/inc/validat.hxx | 1
sc/source/core/data/documen3.cxx | 2
sc/source/core/data/validat.cxx | 6 -
sc/source/filter/excel/xecontent.cxx | 2
sc/source/filter/excel/xicontent.cxx | 2
sc/source/ui/dbgui/validate.cxx | 2
sc/source/ui/view/cellsh2.cxx | 2
sc/source/ui/view/gridwin.cxx | 2
svx/source/sidebar/insert/InsertPropertyPanel.hxx | 5
uui/source/secmacrowarnings.hxx | 14 +-
xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx | 11 --
xmlsecurity/source/component/documentdigitalsignatures.cxx | 4
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 6 -
xmlsecurity/workben/signaturetest.cxx | 2
19 files changed, 123 insertions(+), 128 deletions(-)
New commits:
commit 481cd6368bd1af2b4a51be57bcedfb8fc631bf0e
Author: Stefan Weiberg <stefan.weiberg at germandev.org>
Date: Fri Sep 5 15:34:48 2014 +0000
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 at redhat.com>
Tested-by: David Tardon <dtardon at redhat.com>
diff --git a/dbaccess/source/core/recovery/dbdocrecovery.cxx b/dbaccess/source/core/recovery/dbdocrecovery.cxx
index 2708589..94cdb49 100644
--- a/dbaccess/source/core/recovery/dbdocrecovery.cxx
+++ b/dbaccess/source/core/recovery/dbdocrecovery.cxx
@@ -43,35 +43,35 @@
namespace dbaccess
{
- using ::com::sun::star::uno::Reference;
- using ::com::sun::star::uno::XInterface;
- using ::com::sun::star::uno::UNO_QUERY;
- using ::com::sun::star::uno::UNO_QUERY_THROW;
- using ::com::sun::star::uno::UNO_SET_THROW;
- using ::com::sun::star::uno::Exception;
- using ::com::sun::star::uno::RuntimeException;
- using ::com::sun::star::uno::Any;
- using ::com::sun::star::uno::makeAny;
- using ::com::sun::star::uno::Sequence;
- using ::com::sun::star::uno::Type;
- using ::com::sun::star::uno::XComponentContext;
- using ::com::sun::star::embed::XStorage;
- using ::com::sun::star::frame::XController;
- using ::com::sun::star::sdb::application::XDatabaseDocumentUI;
- using ::com::sun::star::lang::XComponent;
- using ::com::sun::star::document::XStorageBasedDocument;
- using ::com::sun::star::beans::PropertyValue;
- using ::com::sun::star::io::XStream;
- using ::com::sun::star::io::XTextOutputStream;
- using ::com::sun::star::io::XActiveDataSource;
- using ::com::sun::star::io::TextInputStream;
- using ::com::sun::star::io::XTextInputStream2;
- using ::com::sun::star::io::XActiveDataSink;
- using ::com::sun::star::frame::XModel;
- using ::com::sun::star::util::XModifiable;
- using ::com::sun::star::beans::XPropertySet;
-
- namespace ElementModes = ::com::sun::star::embed::ElementModes;
+ using css::uno::Reference;
+ using css::uno::XInterface;
+ using css::uno::UNO_QUERY;
+ using css::uno::UNO_QUERY_THROW;
+ using css::uno::UNO_SET_THROW;
+ using css::uno::Exception;
+ using css::uno::RuntimeException;
+ using css::uno::Any;
+ using css::uno::makeAny;
+ using css::uno::Sequence;
+ using css::uno::Type;
+ using css::uno::XComponentContext;
+ using css::embed::XStorage;
+ using css::frame::XController;
+ using css::sdb::application::XDatabaseDocumentUI;
+ using css::lang::XComponent;
+ using css::document::XStorageBasedDocument;
+ using css::beans::PropertyValue;
+ using css::io::XStream;
+ using css::io::XTextOutputStream;
+ using css::io::XActiveDataSource;
+ using css::io::TextInputStream;
+ using css::io::XTextInputStream2;
+ using css::io::XActiveDataSink;
+ using css::frame::XModel;
+ using css::util::XModifiable;
+ using css::beans::XPropertySet;
+
+ namespace ElementModes = css::embed::ElementModes;
// helpers
namespace
diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.cxx b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
index c5b977e..f50d175 100644
--- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx
+++ b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
@@ -42,40 +42,41 @@
namespace dbaccess
{
- using ::com::sun::star::uno::Reference;
- using ::com::sun::star::uno::XInterface;
- using ::com::sun::star::uno::UNO_QUERY;
- using ::com::sun::star::uno::UNO_QUERY_THROW;
- using ::com::sun::star::uno::UNO_SET_THROW;
- using ::com::sun::star::uno::Exception;
- using ::com::sun::star::uno::RuntimeException;
- using ::com::sun::star::uno::Any;
- using ::com::sun::star::uno::makeAny;
- using ::com::sun::star::uno::Sequence;
- using ::com::sun::star::uno::Type;
- using ::com::sun::star::uno::XComponentContext;
- using ::com::sun::star::lang::XMultiServiceFactory;
- using ::com::sun::star::embed::XStorage;
- using ::com::sun::star::sdb::application::XDatabaseDocumentUI;
- using ::com::sun::star::beans::Pair;
- using ::com::sun::star::frame::ModuleManager;
- using ::com::sun::star::frame::XModuleManager2;
- using ::com::sun::star::lang::XComponent;
- using ::com::sun::star::frame::XModel;
- using ::com::sun::star::frame::XController;
- using ::com::sun::star::beans::XPropertySet;
- using ::com::sun::star::beans::PropertyValue;
- using ::com::sun::star::document::XStorageBasedDocument;
- using ::com::sun::star::ucb::XCommandProcessor;
- using ::com::sun::star::container::XHierarchicalNameAccess;
- using ::com::sun::star::sdb::XFormDocumentsSupplier;
- using ::com::sun::star::sdb::XReportDocumentsSupplier;
- using ::com::sun::star::xml::sax::SAXException;
- using ::com::sun::star::xml::sax::XLocator;
- using ::com::sun::star::xml::sax::XDocumentHandler;
- using ::com::sun::star::xml::sax::XAttributeList;
-
- namespace ElementModes = ::com::sun::star::embed::ElementModes;
+ using css::uno::Reference;
+ using css::uno::XInterface;
+ using css::uno::UNO_QUERY;
+ using css::uno::UNO_QUERY_THROW;
+ using css::uno::UNO_SET_THROW;
+ using css::uno::Exception;
+ using css::uno::RuntimeException;
+ using css::uno::Any;
+ using css::uno::makeAny;
+ using css::uno::Sequence;
+ using css::uno::Type;
+ using css::uno::XComponentContext;
+ using css::lang::XMultiServiceFactory;
+ using css::embed::XStorage;
+ using css::sdb::application::XDatabaseDocumentUI;
+ using css::beans::Pair;
+ using css::frame::ModuleManager;
+ using css::frame::XModuleManager2;
+ using css::lang::XComponent;
+ using css::frame::XModel;
+ using css::frame::XController;
+ using css::beans::XPropertySet;
+ using css::beans::PropertyValue;
+ using css::document::XStorageBasedDocument;
+ using css::ucb::XCommandProcessor;
+ using css::container::XHierarchicalNameAccess;
+ using css::sdb::XFormDocumentsSupplier;
+ using css::sdb::XReportDocumentsSupplier;
+ using css::xml::sax::SAXException;
+ using css::xml::sax::XLocator;
+ using css::xml::sax::XDocumentHandler;
+ using css::xml::sax::XAttributeList;
+
+ namespace ElementModes = css::embed::ElementModes;
+ namespace DatabaseObject = css::sdb::application::DatabaseObject;
// helper
namespace
@@ -200,7 +201,7 @@ namespace dbaccess
virtual void EndElement ( const bool i_bIgnoreWhitespace ) SAL_OVERRIDE;
virtual void Characters( const OUString& i_rCharacters ) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
+ virtual css::uno::Reference< css::uno::XComponentContext >
GetComponentContext() const SAL_OVERRIDE;
private:
diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.hxx b/dbaccess/source/core/recovery/subcomponentrecovery.hxx
index 788149d..263d2cb 100644
--- a/dbaccess/source/core/recovery/subcomponentrecovery.hxx
+++ b/dbaccess/source/core/recovery/subcomponentrecovery.hxx
@@ -34,11 +34,11 @@ namespace dbaccess
{
public:
SubComponentRecovery(
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext,
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XDatabaseDocumentUI >& i_rController,
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& i_rComponent )
+ const css::uno::Reference< css::uno::XComponentContext >& i_rContext,
+ const css::uno::Reference< css::sdb::application::XDatabaseDocumentUI >& i_rController,
+ const css::uno::Reference< css::lang::XComponent >& i_rComponent )
:m_rContext( i_rContext )
- ,m_xDocumentUI( i_rController, ::com::sun::star::uno::UNO_SET_THROW )
+ ,m_xDocumentUI( i_rController, css::uno::UNO_SET_THROW )
,m_xComponent( i_rComponent )
,m_eType( UNKNOWN )
,m_aCompDesc()
@@ -47,11 +47,11 @@ namespace dbaccess
}
SubComponentRecovery(
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext,
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XDatabaseDocumentUI >& i_rController,
+ const css::uno::Reference< css::uno::XComponentContext >& i_rContext,
+ const css::uno::Reference< css::sdb::application::XDatabaseDocumentUI >& i_rController,
const SubComponentType i_eType )
:m_rContext( i_rContext )
- ,m_xDocumentUI( i_rController, ::com::sun::star::uno::UNO_SET_THROW )
+ ,m_xDocumentUI( i_rController, css::uno::UNO_SET_THROW )
,m_xComponent()
,m_eType( i_eType )
,m_aCompDesc()
@@ -60,14 +60,14 @@ namespace dbaccess
// only to be used after being constructed with a component
void saveToRecoveryStorage(
- const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& i_rRecoveryStorage,
+ const css::uno::Reference< css::embed::XStorage >& i_rRecoveryStorage,
MapCompTypeToCompDescs& io_mapCompDescs
);
// only to be used after being constructed with a type
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >
+ css::uno::Reference< css::lang::XComponent >
recoverFromStorage(
- const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& i_rRecoveryStorage,
+ const css::uno::Reference< css::embed::XStorage >& i_rRecoveryStorage,
const OUString& i_rComponentName,
const bool i_bForEditing
);
@@ -76,23 +76,23 @@ namespace dbaccess
private:
void impl_saveSubDocument_throw(
- const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& i_rObjectStorage
+ const css::uno::Reference< css::embed::XStorage >& i_rObjectStorage
);
void impl_saveQueryDesign_throw(
- const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& i_rObjectStorage
+ const css::uno::Reference< css::embed::XStorage >& i_rObjectStorage
);
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >
+ css::uno::Reference< css::lang::XComponent >
impl_recoverSubDocument_throw(
- const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& i_rRecoveryStorage,
+ const css::uno::Reference< css::embed::XStorage >& i_rRecoveryStorage,
const OUString& i_rComponentName,
const bool i_bForEditing
);
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >
+ css::uno::Reference< css::lang::XComponent >
impl_recoverQueryDesign_throw(
- const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& i_rRecoveryStorage,
+ const css::uno::Reference< css::embed::XStorage >& i_rRecoveryStorage,
const OUString& i_rComponentName,
const bool i_bForEditing
);
@@ -100,11 +100,11 @@ namespace dbaccess
void impl_identifyComponent_throw();
private:
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&
+ const css::uno::Reference< css::uno::XComponentContext >&
m_rContext;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XDatabaseDocumentUI >
+ css::uno::Reference< css::sdb::application::XDatabaseDocumentUI >
m_xDocumentUI;
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >
+ const css::uno::Reference< css::lang::XComponent >
m_xComponent;
SubComponentType m_eType;
SubComponentDescriptor m_aCompDesc;
diff --git a/dbaccess/source/core/recovery/subcomponents.hxx b/dbaccess/source/core/recovery/subcomponents.hxx
index f0a3a53..dfa944e 100644
--- a/dbaccess/source/core/recovery/subcomponents.hxx
+++ b/dbaccess/source/core/recovery/subcomponents.hxx
@@ -32,14 +32,12 @@
namespace dbaccess
{
- namespace DatabaseObject = ::com::sun::star::sdb::application::DatabaseObject;
-
enum SubComponentType
{
- TABLE = DatabaseObject::TABLE,
- QUERY = DatabaseObject::QUERY,
- FORM = DatabaseObject::FORM,
- REPORT = DatabaseObject::REPORT,
+ TABLE = css::sdb::application::DatabaseObject::TABLE,
+ QUERY = css::sdb::application::DatabaseObject::QUERY,
+ FORM = css::sdb::application::DatabaseObject::FORM,
+ REPORT = css::sdb::application::DatabaseObject::REPORT,
RELATION_DESIGN = 1000,
diff --git a/sc/inc/ScPanelFactory.hxx b/sc/inc/ScPanelFactory.hxx
index c3b5ed3..afef80e 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 5b185cb..724ea96 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 d439a44..6bf981c 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 3d445c4..c85ad25 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 f0e8a07..7e39536 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 d572ae7..491517a9 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 c4b9514..ef4351e 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 0375c96..e921a1a 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 e405524..071558c 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();
diff --git a/svx/source/sidebar/insert/InsertPropertyPanel.hxx b/svx/source/sidebar/insert/InsertPropertyPanel.hxx
index 9b670ce..e694e82 100644
--- a/svx/source/sidebar/insert/InsertPropertyPanel.hxx
+++ b/svx/source/sidebar/insert/InsertPropertyPanel.hxx
@@ -27,7 +27,6 @@
#include <map>
#include <svx/sidebar/PanelLayout.hxx>
-namespace cssu = ::com::sun::star::uno;
class ToolBox;
@@ -41,13 +40,13 @@ class InsertPropertyPanel
public:
InsertPropertyPanel (
Window* pParent,
- const cssu::Reference<css::frame::XFrame>& rxFrame);
+ const css::uno::Reference<css::frame::XFrame>& rxFrame);
virtual ~InsertPropertyPanel (void);
private:
ToolBox* mpStandardShapesToolBox;
ToolBox* mpCustomShapesToolBox;
- const cssu::Reference<css::frame::XFrame> mxFrame;
+ const css::uno::Reference<css::frame::XFrame> mxFrame;
DECL_LINK(WindowEventListener, VclSimpleEvent*);
};
diff --git a/uui/source/secmacrowarnings.hxx b/uui/source/secmacrowarnings.hxx
index cac7ed3..da05fa5 100644
--- a/uui/source/secmacrowarnings.hxx
+++ b/uui/source/secmacrowarnings.hxx
@@ -35,16 +35,14 @@ namespace security {
#include <com/sun/star/uno/Sequence.hxx>
-namespace cssu = com::sun::star::uno;
-
class MacroWarning : public ModalDialog
{
private:
- cssu::Reference< css::security::XCertificate > mxCert;
- cssu::Reference< css::embed::XStorage > mxStore;
+ css::uno::Reference< css::security::XCertificate > mxCert;
+ css::uno::Reference< css::embed::XStorage > mxStore;
OUString maODFVersion;
- const cssu::Sequence< css::security::DocumentSignatureInformation >* mpInfos;
+ const css::uno::Sequence< css::security::DocumentSignatureInformation >* mpInfos;
FixedImage* mpSymbolImg;
FixedText* mpDocNameFI;
@@ -73,10 +71,10 @@ public:
void SetDocumentURL( const OUString& rDocURL );
- void SetStorage( const cssu::Reference < css::embed::XStorage >& rxStore,
+ void SetStorage( const css::uno::Reference < css::embed::XStorage >& rxStore,
const OUString& aODFVersion,
- const cssu::Sequence< css::security::DocumentSignatureInformation >& _rInfos );
- void SetCertificate( const cssu::Reference< css::security::XCertificate >& _rxCert );
+ const css::uno::Sequence< css::security::DocumentSignatureInformation >& _rInfos );
+ void SetCertificate( const css::uno::Reference< css::security::XCertificate >& _rxCert );
};
#endif
diff --git a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
index c417eef..c16ae4b 100644
--- a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
+++ b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
@@ -45,14 +45,13 @@ namespace xml { namespace dom {
class XDocumentBuilder; } }
}}}
-namespace cssu = com::sun::star::uno;
class HeaderBar;
class DigitalSignaturesDialog : public ModalDialog
{
private:
- cssu::Reference< cssu::XComponentContext >& mxCtx;
+ css::uno::Reference< css::uno::XComponentContext >& mxCtx;
XMLSignatureHelper maSignatureHelper;
css::uno::Reference < css::embed::XStorage > mxStore;
@@ -114,8 +113,8 @@ private:
bool canAddRemove();
public:
- DigitalSignaturesDialog( Window* pParent, cssu::Reference<
- cssu::XComponentContext >& rxCtx, DocumentSignatureMode eMode,
+ DigitalSignaturesDialog( Window* pParent, css::uno::Reference<
+ css::uno::XComponentContext >& rxCtx, DocumentSignatureMode eMode,
bool bReadOnly, const OUString& sODFVersion, bool bHasDocumentSignature);
virtual ~DigitalSignaturesDialog();
@@ -123,8 +122,8 @@ public:
bool Init();
// Set the storage which should be signed or verified
- void SetStorage( const cssu::Reference < css::embed::XStorage >& rxStore );
- void SetSignatureStream( const cssu::Reference < css::io::XStream >& rxStream );
+ void SetStorage( const css::uno::Reference < css::embed::XStorage >& rxStore );
+ void SetSignatureStream( const css::uno::Reference < css::io::XStream >& rxStream );
// Execute the dialog...
short Execute() SAL_OVERRIDE;
diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx
index 20d6fae..2780bb2 100644
--- a/xmlsecurity/source/component/documentdigitalsignatures.cxx
+++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx
@@ -47,8 +47,8 @@
#include <stdio.h>
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
+using namespace css;
+using namespace css::uno;
DocumentDigitalSignatures::DocumentDigitalSignatures( const Reference< XComponentContext >& rxCtx ):
mxCtx(rxCtx),
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index c0c08d7..032e6d6 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -57,9 +57,9 @@
#include <vcl/layout.hxx>
#include <unotools/configitem.hxx>
-using namespace ::com::sun::star::security;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star;
+using namespace css::security;
+using namespace css::uno;
+using namespace css;
namespace
{
diff --git a/xmlsecurity/workben/signaturetest.cxx b/xmlsecurity/workben/signaturetest.cxx
index 4d1a6f4..f3c4db8 100644
--- a/xmlsecurity/workben/signaturetest.cxx
+++ b/xmlsecurity/workben/signaturetest.cxx
@@ -49,7 +49,7 @@
#include <com/sun/star/security/DocumentDigitalSignatures.hpp>
-using namespace ::com::sun::star;
+using namespace css;
void Main();
More information about the Libreoffice-commits
mailing list