cui/source/customize/cfg.cxx | 41 +++----
cui/source/customize/cfgutil.cxx | 2
cui/source/customize/eventdlg.hxx | 8 -
cui/source/dialogs/SpellAttrib.hxx | 12 +-
cui/source/dialogs/SpellDialog.cxx | 8 -
cui/source/dialogs/about.cxx | 6 -
cui/source/dialogs/cuifmsearch.cxx | 10 -
cui/source/dialogs/cuigaldlg.cxx | 18 +--
cui/source/dialogs/hangulhanjadlg.cxx | 12 +-
cui/source/dialogs/hldocntp.cxx | 2
cui/source/dialogs/hldoctp.cxx | 2
cui/source/dialogs/hlmarkwn.cxx | 4
cui/source/dialogs/insdlg.cxx | 4
cui/source/dialogs/pastedlg.cxx | 2
cui/source/dialogs/scriptdlg.cxx | 22 ++--
cui/source/dialogs/showcols.cxx | 8 -
cui/source/factory/dlgfact.cxx | 23 ++--
cui/source/factory/dlgfact.hxx | 30 ++---
cui/source/inc/SpellDialog.hxx | 8 -
cui/source/inc/cfg.hxx | 177 ++++++++++++++--------------------
cui/source/inc/cfgutil.hxx | 16 +--
cui/source/inc/cuifmsearch.hxx | 4
cui/source/inc/cuigaldlg.hxx | 16 +--
cui/source/inc/hangulhanjadlg.hxx | 10 -
cui/source/inc/hlmarkwn.hxx | 2
cui/source/inc/hltpbase.hxx | 8 -
cui/source/inc/insdlg.hxx | 22 ++--
cui/source/inc/macroass.hxx | 4
cui/source/inc/macropg.hxx | 20 +--
cui/source/inc/optdict.hxx | 36 +++---
cui/source/inc/optlingu.hxx | 18 +--
cui/source/inc/optpath.hxx | 6 -
cui/source/inc/scriptdlg.hxx | 35 +++---
cui/source/inc/selector.hxx | 37 +++----
cui/source/inc/showcols.hxx | 4
cui/source/inc/treeopt.hxx | 34 +++---
cui/source/options/cfgchart.cxx | 2
cui/source/options/cfgchart.hxx | 10 -
cui/source/options/optaboutconfig.cxx | 18 +--
cui/source/options/optaboutconfig.hxx | 6 -
cui/source/options/optgdlg.cxx | 24 ++--
cui/source/options/optinet2.cxx | 14 +-
cui/source/options/optjava.hxx | 10 -
cui/source/options/optlingu.cxx | 12 +-
cui/source/options/optpath.cxx | 8 -
cui/source/options/optupdt.cxx | 2
cui/source/options/optupdt.hxx | 2
cui/source/options/sdbcdriverenum.cxx | 8 -
cui/source/options/treeopt.cxx | 12 +-
cui/source/tabpages/autocdlg.cxx | 6 -
cui/source/tabpages/macroass.cxx | 4
cui/source/tabpages/numfmt.cxx | 3
cui/source/tabpages/textattr.cxx | 2
cui/source/tabpages/tpbitmap.cxx | 4
cui/source/tabpages/tpgradnt.cxx | 4
cui/source/tabpages/tphatch.cxx | 4
cui/source/tabpages/tpline.cxx | 50 ++++-----
cui/source/tabpages/tplnedef.cxx | 4
cui/source/tabpages/tplneend.cxx | 6 -
59 files changed, 427 insertions(+), 459 deletions(-)
New commits:
commit 0c5f72b06f7d3b06e61cc5a0eabc8abc7bb72ef5
Author: Noel Grandin <n...@peralex.com>
Date: Tue Jul 28 14:18:40 2015 +0200
com::sun::star->css in cui
Change-Id: I70ee15db7c8de507fa21a9dfc705f518f223a70b
Reviewed-on: https://gerrit.libreoffice.org/17385
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noelgran...@gmail.com>
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 6ad0193..2326ff4 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -519,7 +519,7 @@ bool GetMenuItemData(
return true;
}
}
- catch ( ::com::sun::star::lang::IndexOutOfBoundsException& )
+ catch ( css::lang::IndexOutOfBoundsException& )
{
}
@@ -572,7 +572,7 @@ bool GetToolbarItemData(
return true;
}
}
- catch ( ::com::sun::star::lang::IndexOutOfBoundsException& )
+ catch ( css::lang::IndexOutOfBoundsException& )
{
}
@@ -809,7 +809,7 @@ SvxConfigDialog::SvxConfigDialog(vcl::Window * pParent,
const SfxItemSet* pInSet
}
}
-void SvxConfigDialog::SetFrame(const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XFrame >& xFrame)
+void SvxConfigDialog::SetFrame(const css::uno::Reference< css::frame::XFrame
>& xFrame)
{
m_xFrame = xFrame;
@@ -972,7 +972,7 @@ bool SaveInData::PersistChanges(
}
}
}
- catch ( com::sun::star::io::IOException& )
+ catch ( css::io::IOException& )
{
result = false;
}
@@ -1199,11 +1199,11 @@ bool MenuSaveInData::Apply()
{
OSL_TRACE("caught container::NoSuchElementException saving
settings");
}
- catch ( com::sun::star::io::IOException& )
+ catch ( css::io::IOException& )
{
OSL_TRACE("caught IOException saving settings");
}
- catch ( com::sun::star::uno::Exception& )
+ catch ( css::uno::Exception& )
{
OSL_TRACE("caught some other exception saving settings");
}
@@ -3532,10 +3532,9 @@ void ToolbarSaveInData::SetSystemStyle(
// check reference before we call getRealInterface. The layout manager
// can only provide references for elements that have been created
// before. It's possible that the current element is not available.
- uno::Reference< com::sun::star::awt::XWindow > xWindow;
+ uno::Reference< css::awt::XWindow > xWindow;
if ( xUIElement.is() )
- xWindow = uno::Reference< com::sun::star::awt::XWindow >(
- xUIElement->getRealInterface(), uno::UNO_QUERY );
+ xWindow = uno::Reference< css::awt::XWindow >(
xUIElement->getRealInterface(), uno::UNO_QUERY );
window = VCLUnoHelper::GetWindow( xWindow );
}
@@ -4055,11 +4054,11 @@ void ToolbarSaveInData::ApplyToolbar( SvxConfigEntry*
pToolbar )
{
OSL_TRACE("caught container::NoSuchElementException saving settings");
}
- catch ( com::sun::star::io::IOException& )
+ catch ( css::io::IOException& )
{
OSL_TRACE("caught IOException saving settings");
}
- catch ( com::sun::star::uno::Exception& )
+ catch ( css::uno::Exception& )
{
OSL_TRACE("caught some other exception saving settings");
}
@@ -4091,15 +4090,15 @@ void ToolbarSaveInData::CreateToolbar( SvxConfigEntry*
pToolbar )
{
OSL_TRACE("caught ElementExistsException saving settings");
}
- catch ( com::sun::star::lang::IllegalArgumentException& )
+ catch ( css::lang::IllegalArgumentException& )
{
OSL_TRACE("caught IOException saving settings");
}
- catch ( com::sun::star::lang::IllegalAccessException& )
+ catch ( css::lang::IllegalAccessException& )
{
OSL_TRACE("caught IOException saving settings");
}
- catch ( com::sun::star::uno::Exception& )
+ catch ( css::uno::Exception& )
{
OSL_TRACE("caught some other exception saving settings");
}
@@ -4838,13 +4837,13 @@ SvxIconSelectorDialog::SvxIconSelectorDialog(
vcl::Window *pWindow,
aDirectory += "soffice.cfg/import";
uno::Reference< lang::XSingleServiceFactory > xStorageFactory(
- ::com::sun::star::embed::FileSystemStorageFactory::create(
xComponentContext ) );
+ css::embed::FileSystemStorageFactory::create( xComponentContext ) );
uno::Sequence< uno::Any > aArgs( 2 );
aArgs[ 0 ] <<= aDirectory;
- aArgs[ 1 ] <<= com::sun::star::embed::ElementModes::READWRITE;
+ aArgs[ 1 ] <<= css::embed::ElementModes::READWRITE;
- uno::Reference< com::sun::star::embed::XStorage > xStorage(
+ uno::Reference< css::embed::XStorage > xStorage(
xStorageFactory->createInstanceWithArguments( aArgs ), uno::UNO_QUERY
);
uno::Sequence< uno::Any > aProp( 2 );
@@ -4855,7 +4854,7 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( vcl::Window
*pWindow,
aProp[ 0 ] <<= aPropValue;
aPropValue.Name = "OpenMode";
- aPropValue.Value <<= com::sun::star::embed::ElementModes::READWRITE;
+ aPropValue.Value <<= css::embed::ElementModes::READWRITE;
aProp[ 1 ] <<= aPropValue;
m_xImportedImageManager = css::ui::ImageManager::create( xComponentContext
);
@@ -5115,7 +5114,7 @@ bool SvxIconSelectorDialog::ReplaceGraphicItem(
aMediaProps[0].Name = "URL";
aMediaProps[0].Value <<= aURL;
- com::sun::star::awt::Size aSize;
+ css::awt::Size aSize;
bool bOK = false;
try
{
@@ -5169,7 +5168,7 @@ bool SvxIconSelectorDialog::ReplaceGraphicItem(
bResult = true;
break;
}
- catch ( ::com::sun::star::uno::Exception& )
+ catch ( css::uno::Exception& )
{
break;
}
@@ -5293,7 +5292,7 @@ bool SvxIconSelectorDialog::ImportGraphic( const
OUString& aURL )
aMediaProps[0].Name = "URL";
uno::Reference< graphic::XGraphic > xGraphic;
- com::sun::star::awt::Size aSize;
+ css::awt::Size aSize;
aMediaProps[0].Value <<= aURL;
try
{
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 33b5067..7d0b3ad 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -70,7 +70,7 @@ using namespace ::com::sun::star::document;
SfxStylesInfo_Impl::SfxStylesInfo_Impl()
{}
-void SfxStylesInfo_Impl::setModel(const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XModel >& xModel)
+void SfxStylesInfo_Impl::setModel(const css::uno::Reference<
css::frame::XModel >& xModel)
{
m_xDoc = xModel;
}
diff --git a/cui/source/customize/eventdlg.hxx
b/cui/source/customize/eventdlg.hxx
index 385df86..e3b25e6 100644
--- a/cui/source/customize/eventdlg.hxx
+++ b/cui/source/customize/eventdlg.hxx
@@ -31,9 +31,9 @@ class SvxEventConfigPage : public _SvxMacroTabPage
{
VclPtr<ListBox> m_pSaveInListBox;
- ::com::sun::star::uno::Reference<
::com::sun::star::container::XNameReplace > m_xAppEvents;
- ::com::sun::star::uno::Reference<
::com::sun::star::container::XNameReplace > m_xDocumentEvents;
- ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifiable >
m_xDocumentModifiable;
+ css::uno::Reference< css::container::XNameReplace > m_xAppEvents;
+ css::uno::Reference< css::container::XNameReplace > m_xDocumentEvents;
+ css::uno::Reference< css::util::XModifiable >
m_xDocumentModifiable;
bool bAppConfig;
@@ -50,7 +50,7 @@ public:
virtual ~SvxEventConfigPage();
virtual void dispose() SAL_OVERRIDE;
- void LateInit( const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XFrame >& _rxFrame );
+ void LateInit( const css::uno::Reference< css::frame::XFrame >&
_rxFrame );
protected:
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
diff --git a/cui/source/dialogs/SpellAttrib.hxx
b/cui/source/dialogs/SpellAttrib.hxx
index 646f70b..52af93d 100644
--- a/cui/source/dialogs/SpellAttrib.hxx
+++ b/cui/source/dialogs/SpellAttrib.hxx
@@ -39,10 +39,10 @@ struct SpellErrorDescription
OUString sDialogTitle;
OUString sExplanation;
OUString sExplanationURL;
- ::com::sun::star::lang::Locale aLocale;
- ::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XProofreader > xGrammarChecker;
+ css::lang::Locale aLocale;
+ css::uno::Reference< css::linguistic2::XProofreader > xGrammarChecker;
OUString sServiceName; ///< service
name of GrammarChecker/SpellChecker
- ::com::sun::star::uno::Sequence< OUString > aSuggestions;
+ css::uno::Sequence< OUString > aSuggestions;
OUString sRuleId;
SpellErrorDescription() :
@@ -50,9 +50,9 @@ struct SpellErrorDescription
SpellErrorDescription( bool bGrammar,
const OUString& rText,
- const ::com::sun::star::lang::Locale& rLocale,
- const ::com::sun::star::uno::Sequence< OUString >&
rSuggestions,
- ::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XProofreader > rxGrammarChecker,
+ const css::lang::Locale& rLocale,
+ const css::uno::Sequence< OUString >& rSuggestions,
+ css::uno::Reference< css::linguistic2::XProofreader >
rxGrammarChecker,
const OUString& rServiceName,
const OUString* pDialogTitle = 0,
const OUString* pExplanation = 0,
diff --git a/cui/source/dialogs/SpellDialog.cxx
b/cui/source/dialogs/SpellDialog.cxx
index ab539a6..3520300 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -1550,7 +1550,7 @@ bool SentenceEditWindow_Impl::PreNotify( NotifyEvent&
rNEvt )
}
-bool SentenceEditWindow_Impl::MarkNextError( bool bIgnoreCurrentError,
com::sun::star::uno::Reference<com::sun::star::linguistic2::XSpellChecker1>
xSpell )
+bool SentenceEditWindow_Impl::MarkNextError( bool bIgnoreCurrentError,
css::uno::Reference<css::linguistic2::XSpellChecker1> xSpell )
{
if (bIgnoreCurrentError)
m_aIgnoreErrorsAt.insert( m_nErrorStart );
@@ -2034,9 +2034,9 @@ IMPL_LINK( SpellDialog, HandleHyperlink, FixedHyperlink*,
pHyperlink )
return 1;
try
{
- uno::Reference< com::sun::star::system::XSystemShellExecute >
xSystemShellExecute(
-
com::sun::star::system::SystemShellExecute::create(::comphelper::getProcessComponentContext())
);
- xSystemShellExecute->execute( sURL, OUString(),
com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY );
+ uno::Reference< css::system::XSystemShellExecute > xSystemShellExecute(
+
css::system::SystemShellExecute::create(::comphelper::getProcessComponentContext())
);
+ xSystemShellExecute->execute( sURL, OUString(),
css::system::SystemShellExecuteFlags::URIS_ONLY );
}
catch ( uno::Exception& )
{
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 630dd30..eeeadd1 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -134,9 +134,9 @@ IMPL_LINK( AboutDialog, HandleClick, PushButton*, pButton )
return 1;
try
{
- Reference< com::sun::star::system::XSystemShellExecute >
xSystemShellExecute(
-
com::sun::star::system::SystemShellExecute::create(::comphelper::getProcessComponentContext()
) );
- xSystemShellExecute->execute( sURL, OUString(),
com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY );
+ Reference< css::system::XSystemShellExecute > xSystemShellExecute(
+
css::system::SystemShellExecute::create(::comphelper::getProcessComponentContext()
) );
+ xSystemShellExecute->execute( sURL, OUString(),
css::system::SystemShellExecuteFlags::URIS_ONLY );
}
catch (const Exception&)
{
diff --git a/cui/source/dialogs/cuifmsearch.cxx
b/cui/source/dialogs/cuifmsearch.cxx
index 981ff31..dedad53 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -38,11 +38,11 @@
#include <sal/macros.h>
#include <boost/scoped_ptr.hpp>
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::i18n;
+using namespace css::uno;
+using namespace css::i18n;
using namespace ::svxform;
-using namespace ::com::sun::star::sdbc;
-using namespace ::com::sun::star::util;
+using namespace css::sdbc;
+using namespace css::util;
#define MAX_HISTORY_ENTRIES 50
@@ -692,7 +692,7 @@ IMPL_LINK_NOARG_TYPED(FmSearchDialog, OnDelayedPaint, Timer
*, void)
EnableControlPaint(true);
}
-void FmSearchDialog::OnFound(const ::com::sun::star::uno::Any& aCursorPos,
sal_Int16 nFieldPos)
+void FmSearchDialog::OnFound(const css::uno::Any& aCursorPos, sal_Int16
nFieldPos)
{
FmFoundRecordInformation friInfo;
friInfo.nContext = m_plbForm->GetSelectEntryPos();
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index def7872..1a588e2 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -128,19 +128,19 @@ void SearchThread::ImplSearch( const INetURLObject&
rStartURL,
try
{
- ::com::sun::star::uno::Reference< XCommandEnvironment > xEnv;
+ css::uno::Reference< XCommandEnvironment > xEnv;
Content aCnt( rStartURL.GetMainURL( INetURLObject::NO_DECODE ), xEnv,
comphelper::getProcessComponentContext() );
Sequence< OUString > aProps( 2 );
aProps.getArray()[ 0 ] = "IsFolder";
aProps.getArray()[ 1 ] = "IsDocument";
- ::com::sun::star::uno::Reference< XResultSet > xResultSet(
+ css::uno::Reference< XResultSet > xResultSet(
aCnt.createCursor( aProps, INCLUDE_FOLDERS_AND_DOCUMENTS ) );
if( xResultSet.is() )
{
- ::com::sun::star::uno::Reference< XContentAccess > xContentAccess(
xResultSet, UNO_QUERY_THROW );
- ::com::sun::star::uno::Reference< XRow > xRow( xResultSet,
UNO_QUERY_THROW );
+ css::uno::Reference< XContentAccess > xContentAccess( xResultSet,
UNO_QUERY_THROW );
+ css::uno::Reference< XRow > xRow( xResultSet, UNO_QUERY_THROW );
while( xResultSet->next() && schedule() )
{
@@ -191,10 +191,10 @@ void SearchThread::ImplSearch( const INetURLObject&
rStartURL,
catch (const ContentCreationException&)
{
}
- catch (const ::com::sun::star::uno::RuntimeException&)
+ catch (const css::uno::RuntimeException&)
{
}
- catch (const ::com::sun::star::uno::Exception&)
+ catch (const css::uno::Exception&)
{
}
}
@@ -1056,7 +1056,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickSearchHdl)
try
{
// setup folder picker
- com::sun::star::uno::Reference< XComponentContext > xContext(
::comphelper::getProcessComponentContext() );
+ css::uno::Reference< XComponentContext > xContext(
::comphelper::getProcessComponentContext() );
xFolderPicker = FolderPicker::create(xContext);
OUString aDlgPathName( SvtPathOptions().GetGraphicPath() );
@@ -1064,7 +1064,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickSearchHdl)
aPreviewTimer.Stop();
- com::sun::star::uno::Reference< XAsynchronousExecutableDialog >
xAsyncDlg( xFolderPicker, UNO_QUERY );
+ css::uno::Reference< XAsynchronousExecutableDialog > xAsyncDlg(
xFolderPicker, UNO_QUERY );
if ( xAsyncDlg.is() )
xAsyncDlg->startExecuteModal( xDialogListener.get() );
else
@@ -1274,7 +1274,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties,
EndSearchProgressHdl)
-IMPL_LINK( TPGalleryThemeProperties, DialogClosedHdl,
::com::sun::star::ui::dialogs::DialogClosedEvent*, pEvt )
+IMPL_LINK( TPGalleryThemeProperties, DialogClosedHdl,
css::ui::dialogs::DialogClosedEvent*, pEvt )
{
DBG_ASSERT( xFolderPicker.is(),
"TPGalleryThemeProperties::DialogClosedHdl(): no folder picker" );
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx
b/cui/source/dialogs/hangulhanjadlg.cxx
index 0d3c96d..c6ceba7 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -49,10 +49,10 @@ namespace svx
{
using namespace ::com::sun::star;
- using namespace ::com::sun::star::uno;
- using namespace ::com::sun::star::linguistic2;
- using namespace ::com::sun::star::lang;
- using namespace ::com::sun::star::container;
+ using namespace css::uno;
+ using namespace css::linguistic2;
+ using namespace css::lang;
+ using namespace css::container;
namespace
@@ -633,7 +633,7 @@ namespace svx
ModalDialog::dispose();
}
- void HangulHanjaConversionDialog::FillSuggestions( const
::com::sun::star::uno::Sequence< OUString >& _rSuggestions )
+ void HangulHanjaConversionDialog::FillSuggestions( const
css::uno::Sequence< OUString >& _rSuggestions )
{
m_pSuggestions->Clear();
const OUString* pSuggestions = _rSuggestions.getConstArray();
@@ -1493,7 +1493,7 @@ namespace svx
0,
_rOrg.getLength(),
ConversionDirection_FROM_LEFT,
-
::com::sun::star::i18n::TextConversionOption::NONE );
+
css::i18n::TextConversionOption::NONE );
bRet = _rEntries.getLength() > 0;
}
catch( const IllegalArgumentException& )
diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index 1ae6e03..332d45f 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -311,7 +311,7 @@ void SvxHyperlinkNewDocTp::DoApply ()
// check if file exists, warn before we overwrite it
{
- com::sun::star::uno::Reference <
com::sun::star::task::XInteractionHandler > xHandler;
+ css::uno::Reference < css::task::XInteractionHandler >
xHandler;
SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream(
aURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ, xHandler );
bool bOk = pIStm && ( pIStm->GetError() == 0);
diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx
index 936c5f8..2ff99465 100644
--- a/cui/source/dialogs/hldoctp.cxx
+++ b/cui/source/dialogs/hldoctp.cxx
@@ -194,7 +194,7 @@ IMPL_LINK_NOARG(SvxHyperlinkDocTp, ClickFileopenHdl_Impl)
{
// Open Fileopen-Dialog
::sfx2::FileDialogHelper aDlg(
- com::sun::star::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0,
+ css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0,
GetParent() );
OUString aOldURL( GetCurrentURL() );
if( aOldURL.startsWithIgnoreAsciiCase( sFileScheme ) )
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index 6245fd8..de23e79 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -472,7 +472,7 @@ int SvxHlinkDlgMarkWnd::FillTree( uno::Reference<
container::XNameAccess > xLink
nEntries++;
}
}
- catch(const com::sun::star::uno::Exception&)
+ catch(const css::uno::Exception&)
{
// insert Displayname into treelist without bitmaps
pEntry = mpLbTree->InsertEntry ( aStrDisplayname,
@@ -486,7 +486,7 @@ int SvxHlinkDlgMarkWnd::FillTree( uno::Reference<
container::XNameAccess > xLink
if( xLTS.is() )
nEntries += FillTree( xLTS->getLinks(), pEntry );
}
- catch(const com::sun::star::uno::Exception&)
+ catch(const css::uno::Exception&)
{
}
}
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index a68af45..8c267f0 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -92,7 +92,7 @@ uno::Reference< io::XInputStream >
InsertObjectDialog_Impl::GetIconIfIconified(
InsertObjectDialog_Impl::InsertObjectDialog_Impl(vcl::Window * pParent, const
OUString& rID,
const OUString& rUIXMLDescription,
- const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&
xStorage)
+ const css::uno::Reference < css::embed::XStorage >& xStorage)
: ModalDialog(pParent, rID, rUIXMLDescription)
, m_xStorage( xStorage )
, aCnt( m_xStorage )
@@ -494,7 +494,7 @@ short SvInsertPlugInDialog::Execute()
}
SfxInsertFloatingFrameDialog::SfxInsertFloatingFrameDialog( vcl::Window
*pParent,
- const com::sun::star::uno::Reference <
com::sun::star::embed::XStorage >& xStorage )
+ const css::uno::Reference < css::embed::XStorage
>& xStorage )
: InsertObjectDialog_Impl( pParent, "InsertFloatingFrameDialog",
"cui/ui/insertfloatingframe.ui",
xStorage )
{
diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx
index 4c1d5ab..e41cbc2 100644
--- a/cui/source/dialogs/pastedlg.cxx
+++ b/cui/source/dialogs/pastedlg.cxx
@@ -124,7 +124,7 @@ SotClipboardFormatId SvPasteObjectDialog::GetFormat( const
TransferableDataHelpe
aEnd( ((DataFlavorExVector&)*pFormats).end()
);
while( aIter != aEnd )
{
- ::com::sun::star::datatransfer::DataFlavor aFlavor( *aIter );
+ css::datatransfer::DataFlavor aFlavor( *aIter );
SotClipboardFormatId nFormat = (*aIter++).mnSotId;
::std::map< SotClipboardFormatId, OUString >::iterator itName =
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 8fbf409..8a4d6bb 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -65,10 +65,10 @@
#include <boost/scoped_ptr.hpp>
using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::script;
-using namespace ::com::sun::star::frame;
-using namespace ::com::sun::star::document;
+using namespace css::uno;
+using namespace css::script;
+using namespace css::frame;
+using namespace css::document;
void ShowErrorDialog( const Any& aException )
{
@@ -302,7 +302,7 @@ SFTreeListBox::getLangNodeFromRootNode( Reference<
browse::XBrowseNode >& rootNo
return langNode;
}
-void SFTreeListBox:: RequestSubEntries( SvTreeListEntry* pRootEntry,
Reference< ::com::sun::star::script::browse::XBrowseNode >& node,
+void SFTreeListBox:: RequestSubEntries( SvTreeListEntry* pRootEntry,
Reference< css::script::browse::XBrowseNode >& node,
Reference< XModel >& model )
{
if (! node.is() )
@@ -737,22 +737,22 @@ IMPL_LINK( SvxScriptOrgDialog, ButtonHdl, Button *,
pButton )
}
catch ( reflection::InvocationTargetException& ite )
{
- ::com::sun::star::uno::Any a = makeAny(ite);
+ css::uno::Any a = makeAny(ite);
ShowErrorDialog(a);
}
catch ( provider::ScriptFrameworkErrorException& ite )
{
- ::com::sun::star::uno::Any a = makeAny(ite);
+ css::uno::Any a = makeAny(ite);
ShowErrorDialog(a);
}
catch ( RuntimeException& re )
{
- ::com::sun::star::uno::Any a = makeAny(re);
+ css::uno::Any a = makeAny(re);
ShowErrorDialog(a);
}
catch ( Exception& e )
{
- ::com::sun::star::uno::Any a = makeAny(e);
+ css::uno::Any a = makeAny(e);
ShowErrorDialog(a);
}
}
@@ -1407,7 +1407,7 @@ OUString GetErrorMessage( const Exception& e )
return message;
}
-OUString GetErrorMessage( const com::sun::star::uno::Any& aException )
+OUString GetErrorMessage( const css::uno::Any& aException )
{
if ( aException.getValueType() ==
cppu::UnoType<reflection::InvocationTargetException>::get())
@@ -1457,7 +1457,7 @@ OUString GetErrorMessage( const com::sun::star::uno::Any&
aException )
}
SvxScriptErrorDialog::SvxScriptErrorDialog(
- vcl::Window* , ::com::sun::star::uno::Any aException )
+ vcl::Window* , css::uno::Any aException )
: m_sMessage()
{
SolarMutexGuard aGuard;
diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx
index 79bdda9..7af9b34 100644
--- a/cui/source/dialogs/showcols.cxx
+++ b/cui/source/dialogs/showcols.cxx
@@ -56,7 +56,7 @@ IMPL_LINK_NOARG(FmShowColsDialog, OnClickedOk)
DBG_ASSERT(m_xColumns.is(), "FmShowColsDialog::OnClickedOk : you should
call SetColumns before executing the dialog !");
if (m_xColumns.is())
{
- ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > xCol;
+ css::uno::Reference< css::beans::XPropertySet > xCol;
for (sal_Int32 i=0; i < m_pList->GetSelectEntryCount(); ++i)
{
m_xColumns->getByIndex(sal::static_int_cast<sal_Int32>(reinterpret_cast<sal_uIntPtr>(m_pList->GetEntryData(m_pList->GetSelectEntryPos(i)))))
>>= xCol;
@@ -79,7 +79,7 @@ IMPL_LINK_NOARG(FmShowColsDialog, OnClickedOk)
}
-void FmShowColsDialog::SetColumns(const ::com::sun::star::uno::Reference<
::com::sun::star::container::XIndexContainer>& xCols)
+void FmShowColsDialog::SetColumns(const css::uno::Reference<
css::container::XIndexContainer>& xCols)
{
DBG_ASSERT(xCols.is(), "FmShowColsDialog::SetColumns : invalid columns !");
if (!xCols.is())
@@ -88,7 +88,7 @@ void FmShowColsDialog::SetColumns(const
::com::sun::star::uno::Reference< ::com:
m_pList->Clear();
- ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>
xCurCol;
+ css::uno::Reference< css::beans::XPropertySet> xCurCol;
OUString sCurName;
for (sal_Int32 i=0; i<xCols->getCount(); ++i)
{
@@ -97,7 +97,7 @@ void FmShowColsDialog::SetColumns(const
::com::sun::star::uno::Reference< ::com:
bool bIsHidden = false;
try
{
- ::com::sun::star::uno::Any aHidden =
xCurCol->getPropertyValue(CUIFM_PROP_HIDDEN);
+ css::uno::Any aHidden =
xCurCol->getPropertyValue(CUIFM_PROP_HIDDEN);
bIsHidden = ::comphelper::getBOOL(aHidden);
OUString sName;
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 4825e95..efdc6f1 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -312,7 +312,7 @@ editeng::HangulHanjaConversion::ConversionDirection
AbstractHangulHanjaConversio
void AbstractHangulHanjaConversionDialog_Impl::SetCurrentString(
const OUString& _rNewString,
- const ::com::sun::star::uno::Sequence< OUString >&
_rSuggestions,
+ const css::uno::Sequence< OUString >& _rSuggestions,
bool _bOriginatesFromDocument
)
{
@@ -347,7 +347,7 @@ vcl::Window* AbstractHyphenWordDialog_Impl::GetWindow()
return pDlg;
}
-Reference < com::sun::star::embed::XEmbeddedObject >
AbstractInsertObjectDialog_Impl::GetObject()
+Reference < css::embed::XEmbeddedObject >
AbstractInsertObjectDialog_Impl::GetObject()
{
return pDlg->GetObject();
}
@@ -357,7 +357,7 @@ bool AbstractInsertObjectDialog_Impl::IsCreateNew()
return pDlg->IsCreateNew();
}
-::Reference< ::com::sun::star::io::XInputStream >
AbstractInsertObjectDialog_Impl::GetIconIfIconified( OUString*
pGraphicMediaType )
+::Reference< css::io::XInputStream >
AbstractInsertObjectDialog_Impl::GetIconIfIconified( OUString*
pGraphicMediaType )
{
return pDlg->GetIconIfIconified( pGraphicMediaType );
}
@@ -379,7 +379,7 @@ SotClipboardFormatId AbstractPasteDialog_Impl::GetFormat(
const TransferableData
return pDlg->GetFormat( aHelper, pFormats, pDesc );
}
-void AbstractFmShowColsDialog_Impl::SetColumns(const ::Reference<
::com::sun::star::container::XIndexContainer>& xCols)
+void AbstractFmShowColsDialog_Impl::SetColumns(const ::Reference<
css::container::XIndexContainer>& xCols)
{
pDlg->SetColumns(xCols);
}
@@ -577,8 +577,7 @@ long AbstractFmInputRecordNoDialog_Impl::GetValue() const
return pDlg->GetValue();
}
-::Reference<
- ::com::sun::star::linguistic2::XDictionary >
AbstractSvxNewDictionaryDialog_Impl::GetNewDictionary()
+::Reference< css::linguistic2::XDictionary >
AbstractSvxNewDictionaryDialog_Impl::GetNewDictionary()
{
return pDlg->GetNewDictionary();
}
@@ -990,7 +989,7 @@ AbstractThesaurusDialog*
AbstractDialogFactory_Impl::CreateThesaurusDialog( vcl:
AbstractHyphenWordDialog* AbstractDialogFactory_Impl::CreateHyphenWordDialog(
vcl::Window* pParent,
const OUString &rWord,
LanguageType nLang,
-
::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenator >
&xHyphen,
+ css::uno::Reference<
css::linguistic2::XHyphenator > &xHyphen,
SvxSpellWrapper* pWrapper )
{
VclPtrInstance<SvxHyphenWordDialog> pDlg( rWord, nLang, pParent, xHyphen,
pWrapper );
@@ -1026,7 +1025,7 @@ VclAbstractRefreshableDialog *
AbstractDialogFactory_Impl::CreateActualizeProgre
VclAbstractDialog*
AbstractDialogFactory_Impl::CreateScriptErrorDialog(
- vcl::Window* pParent, const ::com::sun::star::uno::Any& rException)
+ vcl::Window* pParent, const css::uno::Any& rException)
{
return new SvxScriptErrorDialog(pParent, rException);
}
@@ -1189,7 +1188,7 @@ AbstractFmInputRecordNoDialog *
AbstractDialogFactory_Impl::CreateFmInputRecordN
}
AbstractSvxNewDictionaryDialog *
AbstractDialogFactory_Impl::CreateSvxNewDictionaryDialog( vcl::Window* pParent,
- ::Reference<
::com::sun::star::linguistic2::XSpellChecker1 > &xSpl )
+ ::Reference<
css::linguistic2::XSpellChecker1 > &xSpl )
{
VclPtrInstance<SvxNewDictionaryDialog> pDlg( pParent, xSpl );
return new AbstractSvxNewDictionaryDialog_Impl( pDlg );
@@ -1197,7 +1196,7 @@ AbstractSvxNewDictionaryDialog *
AbstractDialogFactory_Impl::CreateSvxNewDiction
VclAbstractDialog*
AbstractDialogFactory_Impl::CreateSvxEditDictionaryDialog( vcl::Window* pParent,
const OUString& rName,
- ::Reference<
::com::sun::star::linguistic2::XSpellChecker1> &xSpl,
+ ::Reference<
css::linguistic2::XSpellChecker1> &xSpl,
sal_uInt32 nResId )
{
Dialog* pDlg=NULL;
@@ -1573,7 +1572,7 @@ GetTabPageRanges
AbstractDialogFactory_Impl::GetTabPageRangesFunc( sal_uInt16 nI
}
SfxAbstractInsertObjectDialog*
AbstractDialogFactory_Impl::CreateInsertObjectDialog( vcl::Window* pParent,
const OUString& rCommand,
- const Reference < com::sun::star::embed::XStorage >& xStor,
+ const Reference < css::embed::XStorage >& xStor,
const SvObjectServerList* pList )
{
InsertObjectDialog_Impl* pDlg=0;
@@ -1593,7 +1592,7 @@ SfxAbstractInsertObjectDialog*
AbstractDialogFactory_Impl::CreateInsertObjectDia
}
VclAbstractDialog* AbstractDialogFactory_Impl::CreateEditObjectDialog(
vcl::Window* pParent, const OUString& rCommand,
- const Reference < com::sun::star::embed::XEmbeddedObject >& xObj )
+ const Reference < css::embed::XEmbeddedObject >& xObj )
{
if ( rCommand == ".uno:InsertObjectFloatingFrame" )
{
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 90e412d..bff3db9 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -152,7 +152,7 @@ class AbstractHangulHanjaConversionDialog_Impl: public
AbstractHangulHanjaConver
GetDirection(
editeng::HangulHanjaConversion::ConversionDirection _eDefaultDirection ) const
SAL_OVERRIDE;
virtual void SetCurrentString(
const OUString& _rNewString,
- const ::com::sun::star::uno::Sequence< OUString >&
_rSuggestions,
+ const css::uno::Sequence< OUString >& _rSuggestions,
bool _bOriginatesFromDocument = true
) SAL_OVERRIDE;
virtual OUString GetCurrentString( ) const SAL_OVERRIDE ;
@@ -178,7 +178,7 @@ class FmShowColsDialog;
class AbstractFmShowColsDialog_Impl : public AbstractFmShowColsDialog
{
DECL_ABSTDLG_BASE(AbstractFmShowColsDialog_Impl,FmShowColsDialog)
- virtual void SetColumns(const ::com::sun::star::uno::Reference<
::com::sun::star::container::XIndexContainer>& xCols) SAL_OVERRIDE;
+ virtual void SetColumns(const css::uno::Reference<
css::container::XIndexContainer>& xCols) SAL_OVERRIDE;
};
class SvxZoomDialog;
@@ -317,7 +317,7 @@ class SvxNewDictionaryDialog;
class AbstractSvxNewDictionaryDialog_Impl :public
AbstractSvxNewDictionaryDialog
{
DECL_ABSTDLG_BASE(AbstractSvxNewDictionaryDialog_Impl,SvxNewDictionaryDialog)
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XDictionary > GetNewDictionary() SAL_OVERRIDE;
+ virtual css::uno::Reference< css::linguistic2::XDictionary >
GetNewDictionary() SAL_OVERRIDE;
};
class SvxNameDialog;
@@ -420,8 +420,8 @@ class AbstractSvxAreaTabDialog_Impl :public
AbstractSvxAreaTabDialog
class AbstractInsertObjectDialog_Impl : public SfxAbstractInsertObjectDialog
{
DECL_ABSTDLG_BASE(AbstractInsertObjectDialog_Impl, InsertObjectDialog_Impl)
- virtual com::sun::star::uno::Reference <
com::sun::star::embed::XEmbeddedObject > GetObject() SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::io::XInputStream > GetIconIfIconified( OUString*
pGraphicMediaType ) SAL_OVERRIDE;
+ virtual css::uno::Reference < css::embed::XEmbeddedObject > GetObject()
SAL_OVERRIDE;
+ virtual css::uno::Reference< css::io::XInputStream > GetIconIfIconified(
OUString* pGraphicMediaType ) SAL_OVERRIDE;
virtual bool IsCreateNew() SAL_OVERRIDE;
};
@@ -501,7 +501,7 @@ public:
virtual SfxAbstractTabDialog* CreateTabDialog( sal_uInt32 nResId,
vcl::Window* pParent,
const SfxItemSet* pAttrSet,
- const
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xViewFrame,
+ const css::uno::Reference<
css::frame::XFrame >& xViewFrame,
bool bEditFmt=false,
const OUString *pUserButtonText=0
) SAL_OVERRIDE;
virtual SfxAbstractTabDialog* CreateTextTabDialog( vcl::Window*
pParent,
@@ -518,21 +518,21 @@ public:
SvxDistributeHorizontal eHor =
SvxDistributeHorizontalNone,
SvxDistributeVertical eVer =
SvxDistributeVerticalNone) SAL_OVERRIDE;
virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog(
vcl::Window* pParent, const OUString& rCommmand,
- const com::sun::star::uno::Reference <
com::sun::star::embed::XStorage >& xStor,
+ const css::uno::Reference < css::embed::XStorage >& xStor,
const SvObjectServerList* pList = 0 ) SAL_OVERRIDE;
virtual VclAbstractDialog* CreateEditObjectDialog( vcl::Window*
pParent, const OUString& rCommmand,
- const com::sun::star::uno::Reference <
com::sun::star::embed::XEmbeddedObject >& xObj ) SAL_OVERRIDE;
+ const css::uno::Reference < css::embed::XEmbeddedObject >& xObj )
SAL_OVERRIDE;
virtual SfxAbstractPasteDialog* CreatePasteDialog( vcl::Window*
pParent ) SAL_OVERRIDE;
virtual SfxAbstractLinksDialog* CreateLinksDialog( vcl::Window*
pParent, sfx2::LinkManager* pMgr, bool bHTML, sfx2::SvBaseLink* p=0 )
SAL_OVERRIDE;
virtual AbstractHangulHanjaConversionDialog *
CreateHangulHanjaConversionDialog( vcl::Window* _pParent,
editeng::HangulHanjaConversion::ConversionDirection _ePrimaryDirection )
SAL_OVERRIDE;
- virtual AbstractThesaurusDialog* CreateThesaurusDialog(
vcl::Window*, ::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XThesaurus > xThesaurus,
+ virtual AbstractThesaurusDialog* CreateThesaurusDialog(
vcl::Window*, css::uno::Reference< css::linguistic2::XThesaurus > xThesaurus,
const OUString &rWord,
sal_Int16 nLanguage ) SAL_OVERRIDE;
virtual AbstractHyphenWordDialog* CreateHyphenWordDialog(
vcl::Window*,
const OUString &rWord,
LanguageType nLang,
-
::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenator >
&xHyphen,
+ css::uno::Reference<
css::linguistic2::XHyphenator > &xHyphen,
SvxSpellWrapper* pWrapper )
SAL_OVERRIDE;
virtual AbstractFmShowColsDialog * CreateFmShowColsDialog( vcl::Window*
pParent ) SAL_OVERRIDE;
@@ -586,10 +586,10 @@ public:
sal_Int32
nInitialFlags) SAL_OVERRIDE;
virtual AbstractFmInputRecordNoDialog * CreateFmInputRecordNoDialog(
vcl::Window* pParent ) SAL_OVERRIDE;
virtual AbstractSvxNewDictionaryDialog* CreateSvxNewDictionaryDialog(
vcl::Window* pParent,
- ::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XSpellChecker1 > &xSpl ) SAL_OVERRIDE;
+ css::uno::Reference<
css::linguistic2::XSpellChecker1 > &xSpl ) SAL_OVERRIDE;
virtual VclAbstractDialog * CreateSvxEditDictionaryDialog(
vcl::Window* pParent,
const OUString& rName,
- ::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XSpellChecker1> &xSpl,
+ css::uno::Reference<
css::linguistic2::XSpellChecker1> &xSpl,
sal_uInt32 nResId) SAL_OVERRIDE;
virtual AbstractSvxNameDialog * CreateSvxNameDialog( vcl::Window*
pParent,
const OUString& rName, const
OUString& rDesc ) SAL_OVERRIDE;
@@ -644,7 +644,7 @@ public:
CreateScriptSelectorDialog(
vcl::Window* pParent,
bool bShowSlots,
- const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XFrame >& _rxFrame
+ const css::uno::Reference< css::frame::XFrame >& _rxFrame
) SAL_OVERRIDE;
virtual VclAbstractDialog* CreateScriptErrorDialog(
@@ -652,9 +652,9 @@ public:
virtual VclAbstractDialog* CreateSvxMacroAssignDlg(
vcl::Window* _pParent,
- const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XFrame >& _rxDocumentFrame,
+ const css::uno::Reference< css::frame::XFrame >&
_rxDocumentFrame,
const bool _bUnoDialogMode,
- const ::com::sun::star::uno::Reference<
::com::sun::star::container::XNameReplace >& _rxEvents,
+ const css::uno::Reference< css::container::XNameReplace >&
_rxEvents,
const sal_uInt16 _nInitiallySelectedEvent
) SAL_OVERRIDE;
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index 0d927e4..c2f0d59 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -82,14 +82,14 @@ public:
void SetAttrib( const TextAttrib& rAttr, sal_uLong nPara,
sal_uInt16 nStart, sal_uInt16 nEnd );
void SetText( const OUString& rStr ) SAL_OVERRIDE;
- bool MarkNextError( bool bIgnoreCurrentError,
com::sun::star::uno::Reference<com::sun::star::linguistic2::XSpellChecker1> );
+ bool MarkNextError( bool bIgnoreCurrentError,
css::uno::Reference<css::linguistic2::XSpellChecker1> );
void ChangeMarkedWord(const OUString& rNewWord, LanguageType
eLanguage);
void MoveErrorMarkTo(sal_uInt16 nErrorStart, sal_uInt16
nErrorEnd, bool bGrammar);
OUString GetErrorText() const;
void RestoreCurrentError();
void SetAlternatives(
-
com::sun::star::uno::Reference<com::sun::star::linguistic2::XSpellAlternatives>
);
+
css::uno::Reference<css::linguistic2::XSpellAlternatives> );
const SpellErrorDescription* GetAlternatives();
@@ -168,8 +168,8 @@ private:
svx::SpellPortions m_aSavedSentence;
SpellDialog_Impl* pImpl;
- ::com::sun::star::uno::Reference<
- ::com::sun::star::linguistic2::XSpellChecker1 > xSpell;
+ css::uno::Reference<
+ css::linguistic2::XSpellChecker1 > xSpell;
DECL_LINK(ChangeHdl, void *);
DECL_LINK(ChangeAllHdl, void *);
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index 70584ba..b2d9246 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -57,7 +57,7 @@ typedef std::vector< SvxConfigEntry* > SvxEntries;
class SvxConfigDialog : public SfxTabDialog
{
private:
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >
m_xFrame;
+ css::uno::Reference< css::frame::XFrame > m_xFrame;
sal_uInt16 m_nMenusPageId;
sal_uInt16 m_nKeyboardPageId;
sal_uInt16 m_nToolbarsPageId;
@@ -67,7 +67,7 @@ public:
SvxConfigDialog( vcl::Window*, const SfxItemSet* );
virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage
) SAL_OVERRIDE;
- void SetFrame(const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XFrame >& xFrame);
+ void SetFrame(const css::uno::Reference< css::frame::XFrame >& xFrame);
};
class SaveInData
@@ -79,36 +79,33 @@ private:
bool bDocConfig;
bool bReadOnly;
- ::com::sun::star::uno::Reference
- < com::sun::star::ui::XUIConfigurationManager > m_xCfgMgr;
+ css::uno::Reference
+ < css::ui::XUIConfigurationManager > m_xCfgMgr;
- ::com::sun::star::uno::Reference
- < com::sun::star::ui::XUIConfigurationManager > m_xParentCfgMgr;
+ css::uno::Reference
+ < css::ui::XUIConfigurationManager > m_xParentCfgMgr;
- ::com::sun::star::uno::Reference
- < com::sun::star::ui::XImageManager > m_xImgMgr;
+ css::uno::Reference
+ < css::ui::XImageManager > m_xImgMgr;
- ::com::sun::star::uno::Reference
- < com::sun::star::ui::XImageManager > m_xParentImgMgr;
+ css::uno::Reference
+ < css::ui::XImageManager > m_xParentImgMgr;
- static ::com::sun::star::uno::Reference
- < com::sun::star::ui::XImageManager >* xDefaultImgMgr;
+ static css::uno::Reference
+ < css::ui::XImageManager >* xDefaultImgMgr;
public:
SaveInData(
- const ::com::sun::star::uno::Reference <
- ::com::sun::star::ui::XUIConfigurationManager >& xCfgMgr,
- const ::com::sun::star::uno::Reference <
- ::com::sun::star::ui::XUIConfigurationManager >& xParentCfgMgr,
+ const css::uno::Reference < css::ui::XUIConfigurationManager >&
xCfgMgr,
+ const css::uno::Reference < css::ui::XUIConfigurationManager >&
xParentCfgMgr,
const OUString& aModuleId,
bool docConfig );
virtual ~SaveInData() {}
bool PersistChanges(
- const com::sun::star::uno::Reference
- < com::sun::star::uno::XInterface >& xManager );
+ const css::uno::Reference< css::uno::XInterface >& xManager );
void SetModified( bool bValue = true ) { bModified = bValue; }
bool IsModified( ) { return bModified; }
@@ -116,27 +113,27 @@ public:
bool IsReadOnly( ) { return bReadOnly; }
bool IsDocConfig( ) { return bDocConfig; }
- ::com::sun::star::uno::Reference
- < ::com::sun::star::ui::XUIConfigurationManager >
+ css::uno::Reference
+ < css::ui::XUIConfigurationManager >
GetConfigManager() { return m_xCfgMgr; };
- ::com::sun::star::uno::Reference
- < ::com::sun::star::ui::XUIConfigurationManager >
+ css::uno::Reference
+ < css::ui::XUIConfigurationManager >
GetParentConfigManager() { return m_xParentCfgMgr; };
- ::com::sun::star::uno::Reference
- < ::com::sun::star::ui::XImageManager >
+ css::uno::Reference
+ < css::ui::XImageManager >
GetImageManager() { return m_xImgMgr; };
- ::com::sun::star::uno::Reference
- < ::com::sun::star::ui::XImageManager >
+ css::uno::Reference
+ < css::ui::XImageManager >
GetParentImageManager() { return m_xParentImgMgr; };
- ::com::sun::star::uno::Reference
- < com::sun::star::container::XNameAccess > m_xCommandToLabelMap;
+ css::uno::Reference
+ < css::container::XNameAccess > m_xCommandToLabelMap;
- com::sun::star::uno::Sequence
- < com::sun::star::beans::PropertyValue > m_aSeparatorSeq;
+ css::uno::Sequence
+ < css::beans::PropertyValue > m_aSeparatorSeq;
Image GetImage( const OUString& rCommandURL );
@@ -155,8 +152,8 @@ private:
OUString m_aMenuResourceURL;
OUString m_aDescriptorContainer;
- ::com::sun::star::uno::Reference
- < com::sun::star::container::XIndexAccess > m_xMenuSettings;
+ css::uno::Reference
+ < css::container::XIndexAccess > m_xMenuSettings;
SvxConfigEntry* pRootEntry;
@@ -168,31 +165,24 @@ private:
void Apply(
SvxConfigEntry* pRootEntry,
- com::sun::star::uno::Reference<
- com::sun::star::container::XIndexContainer >& rNewMenuBar,
- com::sun::star::uno::Reference<
- com::sun::star::lang::XSingleComponentFactory >& rFactory,
+ css::uno::Reference< css::container::XIndexContainer >& rNewMenuBar,
+ css::uno::Reference< css::lang::XSingleComponentFactory >& rFactory,
SvTreeListEntry *pParent = NULL );
void ApplyMenu(
- com::sun::star::uno::Reference<
- com::sun::star::container::XIndexContainer >& rNewMenuBar,
- com::sun::star::uno::Reference<
- com::sun::star::lang::XSingleComponentFactory >& rFactory,
+ css::uno::Reference< css::container::XIndexContainer >& rNewMenuBar,
+ css::uno::Reference< css::lang::XSingleComponentFactory >& rFactory,
SvxConfigEntry *pMenuData = NULL );
bool LoadSubMenus(
- const ::com::sun::star::uno::Reference<
- com::sun::star::container::XIndexAccess >& xMenuBarSettings,
+ const css::uno::Reference< css::container::XIndexAccess >&
xMenuBarSettings,
const OUString& rBaseTitle, SvxConfigEntry* pParentData );
public:
MenuSaveInData(
- const ::com::sun::star::uno::Reference <
- ::com::sun::star::ui::XUIConfigurationManager >&,
- const ::com::sun::star::uno::Reference <
- ::com::sun::star::ui::XUIConfigurationManager >&,
+ const css::uno::Reference< css::ui::XUIConfigurationManager >&,
+ const css::uno::Reference< css::ui::XUIConfigurationManager >&,
const OUString& aModuleId,
bool docConfig );
@@ -227,8 +217,8 @@ private:
bool bIsVisible;
sal_Int32 nStyle;
- ::com::sun::star::uno::Reference<
- ::com::sun::star::graphic::XGraphic > xBackupGraphic;
+ css::uno::Reference<
+ css::graphic::XGraphic > xBackupGraphic;
SvxEntries *mpEntries;
@@ -286,14 +276,10 @@ public:
void SetVisible( bool b ) { bIsVisible = b; }
bool IsVisible() const { return bIsVisible; }
- void SetBackupGraphic(
- ::com::sun::star::uno::Reference<
- ::com::sun::star::graphic::XGraphic > graphic )
+ void SetBackupGraphic( css::uno::Reference< css::graphic::XGraphic >
graphic )
{ xBackupGraphic = graphic; }
- ::com::sun::star::uno::Reference<
- ::com::sun::star::graphic::XGraphic >
- GetBackupGraphic()
+ css::uno::Reference< css::graphic::XGraphic > GetBackupGraphic()
{ return xBackupGraphic; }
bool IsIconModified() { return xBackupGraphic.is(); }
@@ -373,20 +359,17 @@ protected:
VclPtr<SvxScriptSelectorDialog> m_pSelectorDlg;
/// the ResourceURL to select when opening the dialog
- OUString m_aURLToSelect;
+ OUString m_aURLToSelect;
- ::com::sun::star::uno::Reference
- < ::com::sun::star::frame::XFrame > m_xFrame;
+ css::uno::Reference< css::frame::XFrame > m_xFrame;
SvxConfigPage( vcl::Window*, const SfxItemSet& );
DECL_LINK( MoveHdl, Button * );
virtual SaveInData* CreateSaveInData(
- const ::com::sun::star::uno::Reference <
- ::com::sun::star::ui::XUIConfigurationManager >&,
- const ::com::sun::star::uno::Reference <
- ::com::sun::star::ui::XUIConfigurationManager >&,
+ const css::uno::Reference< css::ui::XUIConfigurationManager >&,
+ const css::uno::Reference< css::ui::XUIConfigurationManager >&,
const OUString& aModuleId,
bool docConfig ) = 0;
@@ -450,7 +433,7 @@ public:
the ModuleManager is asked for the module ID of the component in the
frame.
*/
static OUString
- GetFrameWithDefaultAndIdentify( ::com::sun::star::uno::Reference<
::com::sun::star::frame::XFrame >& _inout_rxFrame );
+ GetFrameWithDefaultAndIdentify( css::uno::Reference<
css::frame::XFrame >& _inout_rxFrame );
};
class SvxMenuConfigPage : public SvxConfigPage
@@ -477,10 +460,10 @@ public:
virtual void dispose() SAL_OVERRIDE;
SaveInData* CreateSaveInData(
- const ::com::sun::star::uno::Reference <
- ::com::sun::star::ui::XUIConfigurationManager >&,
- const ::com::sun::star::uno::Reference <
- ::com::sun::star::ui::XUIConfigurationManager >&,
+ const css::uno::Reference <
+ css::ui::XUIConfigurationManager >&,
+ const css::uno::Reference <
+ css::ui::XUIConfigurationManager >&,
const OUString& aModuleId,
bool docConfig ) SAL_OVERRIDE;
};
@@ -576,10 +559,10 @@ public:
void MoveEntry( bool bMoveUp ) SAL_OVERRIDE;
SaveInData* CreateSaveInData(
- const ::com::sun::star::uno::Reference <
- ::com::sun::star::ui::XUIConfigurationManager >&,
- const ::com::sun::star::uno::Reference <
- ::com::sun::star::ui::XUIConfigurationManager >&,
+ const css::uno::Reference <
+ css::ui::XUIConfigurationManager >&,
+ const css::uno::Reference <
+ css::ui::XUIConfigurationManager >&,
const OUString& aModuleId,
bool docConfig ) SAL_OVERRIDE;
};
@@ -591,28 +574,23 @@ private:
SvxConfigEntry* pRootEntry;
OUString m_aDescriptorContainer;
- ::com::sun::star::uno::Reference
- < com::sun::star::container::XNameAccess > m_xPersistentWindowState;
+ css::uno::Reference
+ < css::container::XNameAccess > m_xPersistentWindowState;
bool LoadToolbar(
- const ::com::sun::star::uno::Reference<
- com::sun::star::container::XIndexAccess >& xToolBarSettings,
+ const css::uno::Reference< css::container::XIndexAccess >&
xToolBarSettings,
SvxConfigEntry* pParentData );
void ApplyToolbar(
- com::sun::star::uno::Reference<
- com::sun::star::container::XIndexContainer >& rNewToolbarBar,
- com::sun::star::uno::Reference<
- com::sun::star::lang::XSingleComponentFactory >& rFactory,
+ css::uno::Reference< css::container::XIndexContainer >& rNewToolbarBar,
+ css::uno::Reference< css::lang::XSingleComponentFactory >& rFactory,
SvxConfigEntry *pToolbar = NULL );
public:
ToolbarSaveInData(
- const ::com::sun::star::uno::Reference <
- ::com::sun::star::ui::XUIConfigurationManager >&,
- const ::com::sun::star::uno::Reference <
- ::com::sun::star::ui::XUIConfigurationManager >&,
+ const css::uno::Reference< css::ui::XUIConfigurationManager >&,
+ const css::uno::Reference< css::ui::XUIConfigurationManager >&,
const OUString& aModuleId,
bool docConfig );
@@ -623,16 +601,14 @@ public:
void RemoveToolbar( SvxConfigEntry* pToolbar );
void ApplyToolbar( SvxConfigEntry* pToolbar );
- OUString GetSystemUIName( const OUString& rResourceURL );
+ OUString GetSystemUIName( const OUString& rResourceURL );
sal_Int32 GetSystemStyle( const OUString& rResourceURL );
- void SetSystemStyle(
- const OUString& rResourceURL, sal_Int32 nStyle );
+ void SetSystemStyle( const OUString& rResourceURL, sal_Int32
nStyle );
void SetSystemStyle(
- ::com::sun::star::uno::Reference
- < ::com::sun::star::frame::XFrame > xFrame,
+ css::uno::Reference< css::frame::XFrame > xFrame,
const OUString& rResourceURL, sal_Int32 nStyle );
SvxEntries* GetEntries() SAL_OVERRIDE;
@@ -683,39 +659,36 @@ private:
sal_Int32 m_nExpectedSize;
- ::com::sun::star::uno::Reference<
- ::com::sun::star::ui::XImageManager > m_xImageManager;
+ css::uno::Reference<
+ css::ui::XImageManager > m_xImageManager;
- ::com::sun::star::uno::Reference<
- ::com::sun::star::ui::XImageManager > m_xParentImageManager;
+ css::uno::Reference<
+ css::ui::XImageManager > m_xParentImageManager;
- ::com::sun::star::uno::Reference<
- ::com::sun::star::ui::XImageManager > m_xImportedImageManager;
+ css::uno::Reference<
+ css::ui::XImageManager > m_xImportedImageManager;
- ::com::sun::star::uno::Reference<
- ::com::sun::star::graphic::XGraphicProvider > m_xGraphProvider;
+ css::uno::Reference<
+ css::graphic::XGraphicProvider > m_xGraphProvider;
bool ReplaceGraphicItem( const OUString& aURL );
bool ImportGraphic( const OUString& aURL );
- void ImportGraphics(
- const com::sun::star::uno::Sequence< OUString >& aURLs );
+ void ImportGraphics( const css::uno::Sequence< OUString >& aURLs );
public:
SvxIconSelectorDialog(
vcl::Window *pWindow,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::ui::XImageManager >& rXImageManager,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::ui::XImageManager >& rXParentImageManager
+ const css::uno::Reference< css::ui::XImageManager >& rXImageManager,
+ const css::uno::Reference< css::ui::XImageManager >&
rXParentImageManager
);
virtual ~SvxIconSelectorDialog();
virtual void dispose() SAL_OVERRIDE;
- ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >
+ css::uno::Reference< css::graphic::XGraphic >
GetSelectedIcon();
DECL_LINK_TYPED( SelectHdl, ToolBox *, void );
diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx
index a84277f..d7118fa 100644
--- a/cui/source/inc/cfgutil.hxx
+++ b/cui/source/inc/cfgutil.hxx
@@ -56,14 +56,14 @@ struct SfxStyleInfo_Impl
struct SfxStylesInfo_Impl
{
- private:
+private:
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >
m_xDoc;
+ css::uno::Reference< css::frame::XModel > m_xDoc;
- public:
+public:
SfxStylesInfo_Impl();
- void setModel(const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XModel >& xModel);
+ void setModel(const css::uno::Reference< css::frame::XModel >& xModel);
static bool parseStyleCommand(SfxStyleInfo_Impl& aStyle);
void getLabel4Style(SfxStyleInfo_Impl& aStyle);
@@ -134,13 +134,13 @@ class SfxConfigGroupListBox : public SvTreeListBox
css::uno::Reference< css::container::XNameAccess > m_xUICmdDescription;
Image GetImage(
- ::com::sun::star::uno::Reference<
::com::sun::star::script::browse::XBrowseNode > node,
- ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext > xCtx,
+ css::uno::Reference< css::script::browse::XBrowseNode > node,
+ css::uno::Reference< css::uno::XComponentContext > xCtx,
bool bIsRootNode
);
- static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface
> getDocumentModel(
- ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext >& xCtx,
+ static css::uno::Reference< css::uno::XInterface > getDocumentModel(
+ css::uno::Reference< css::uno::XComponentContext >& xCtx,
OUString& docName
);
diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx
index 8d32d5e..e9840c6 100644
--- a/cui/source/inc/cuifmsearch.hxx
+++ b/cui/source/inc/cuifmsearch.hxx
@@ -137,7 +137,7 @@ protected:
void Init(const OUString& strVisibleFields, const OUString&
strInitialText);
// only to be used out of the constructors
- void OnFound(const ::com::sun::star::uno::Any& aCursorPos, sal_Int16
nFieldPos);
+ void OnFound(const css::uno::Any& aCursorPos, sal_Int16 nFieldPos);
/** When searching in an own thread I naturally want to disable the UI for
starting the search and for setting search
parameters. If bEnable == sal_False, for all affected controls
painting is turned off and shortly after turned on
again using m_aDelayedPaint. If there is a demand with bEnable ==
sal_True inbetween, the timer is stopped and
@@ -175,7 +175,7 @@ private:
DECL_LINK_TYPED( OnDelayedPaint, Timer*, void ); ///< see EnableSearchUI
- void initCommon( const ::com::sun::star::uno::Reference<
::com::sun::star::sdbc::XResultSet >& _rxCursor );
+ void initCommon( const css::uno::Reference< css::sdbc::XResultSet >&
_rxCursor );
};
inline void FmSearchDialog::SetActiveField(const OUString& strField)
diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index ee9697d..f4078f4 100644
--- a/cui/source/inc/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -262,14 +262,14 @@ class TPGalleryThemeProperties : public SfxTabPage
INetURLObject aURL;
sal_uInt16 nCurFilterPos;
sal_uInt16 nFirstExtFilterPos;
- bool bEntriesFound;
- bool bInputAllowed;
- bool bTakeAll;
- bool bSearchRecursive;
+ bool bEntriesFound;
+ bool bInputAllowed;
+ bool bTakeAll;
+ bool bSearchRecursive;
- ::com::sun::star::uno::Reference< ::svt::DialogClosedListener >
xDialogListener;
- ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer >
xMediaPlayer;
- ::com::sun::star::uno::Reference<
::com::sun::star::ui::dialogs::XFolderPicker2 > xFolderPicker;
+ css::uno::Reference< ::svt::DialogClosedListener > xDialogListener;
+ css::uno::Reference< css::media::XPlayer > xMediaPlayer;
+ css::uno::Reference< css::ui::dialogs::XFolderPicker2 > xFolderPicker;
virtual void Reset( const SfxItemSet* /*rSet*/ ) SAL_OVERRIDE {}
virtual bool FillItemSet( SfxItemSet* /*rSet*/ ) SAL_OVERRIDE {
return true; }
@@ -290,7 +290,7 @@ class TPGalleryThemeProperties : public SfxTabPage
DECL_LINK( DClickFoundHdl, void* );
DECL_LINK_TYPED( PreviewTimerHdl, Timer*, void );
DECL_LINK(EndSearchProgressHdl, void *);
- DECL_LINK( DialogClosedHdl,
::com::sun::star::ui::dialogs::DialogClosedEvent* );
+ DECL_LINK( DialogClosedHdl,
css::ui::dialogs::DialogClosedEvent* );
public:
TPGalleryThemeProperties( vcl::Window* pWindow, const
SfxItemSet& rSet );
diff --git a/cui/source/inc/hangulhanjadlg.hxx
b/cui/source/inc/hangulhanjadlg.hxx
index 692e889..79ad87e 100644
--- a/cui/source/inc/hangulhanjadlg.hxx
+++ b/cui/source/inc/hangulhanjadlg.hxx
@@ -154,7 +154,7 @@ namespace svx
OUString GetCurrentString( ) const;
void SetCurrentString(
const OUString& _rNewString,
- const ::com::sun::star::uno::Sequence< OUString >&
_rSuggestions,
+ const css::uno::Sequence< OUString >& _rSuggestions,
bool _bOriginatesFromDocument = true
);
@@ -188,11 +188,11 @@ namespace svx
DECL_LINK( ClickByCharacterHdl, CheckBox* );
/// fill the suggestion list box with suggestions for the actual input
- void FillSuggestions( const ::com::sun::star::uno::Sequence< OUString
>& _rSuggestions );
+ void FillSuggestions( const css::uno::Sequence< OUString >&
_rSuggestions );
};
- typedef ::std::vector< ::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XConversionDictionary > > HHDictList;
+ typedef ::std::vector< css::uno::Reference<
css::linguistic2::XConversionDictionary > > HHDictList;
class HangulHanjaOptionsDialog : public ModalDialog
{
@@ -209,7 +209,7 @@ namespace svx
SvLBoxButtonData* m_pCheckButtonData;
HHDictList m_aDictList;
- ::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XConversionDictionaryList >
m_xConversionDictionaryList;
+ css::uno::Reference< css::linguistic2::XConversionDictionaryList >
m_xConversionDictionaryList;
DECL_LINK( OkHdl, void* );
DECL_LINK( OnNew, void* );
@@ -312,7 +312,7 @@ namespace svx
void SetEditText( Edit& _rEdit, sal_uInt16 _nEntryNum );
void EditModify( Edit* _pEdit, sal_uInt8 _nEntryOffset );
- bool DeleteEntryFromDictionary( const OUString& rEntry,
const ::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XConversionDictionary >& xDict );
+ bool DeleteEntryFromDictionary( const OUString& rEntry,
const css::uno::Reference< css::linguistic2::XConversionDictionary >& xDict );
public:
HangulHanjaEditDictDialog( vcl::Window* _pParent,
HHDictList& _rDictList, sal_uInt32 _nSelDict );
diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx
index ad1a3f7..65b010c 100644
--- a/cui/source/inc/hlmarkwn.hxx
+++ b/cui/source/inc/hlmarkwn.hxx
@@ -82,7 +82,7 @@ protected:
SvTreeListEntry* FindEntry(const OUString& aStrName);
void ClearTree();
- int FillTree( ::com::sun::star::uno::Reference<
::com::sun::star::container::XNameAccess > xLinks, SvTreeListEntry*
pParentEntry =NULL );
+ int FillTree( css::uno::Reference< css::container::XNameAccess > xLinks,
SvTreeListEntry* pParentEntry =NULL );
virtual void Move () SAL_OVERRIDE;
diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx
index fa5ddb9..9933d6c 100644
--- a/cui/source/inc/hltpbase.hxx
+++ b/cui/source/inc/hltpbase.hxx
@@ -73,10 +73,10 @@ private:
VclPtr<Edit> mpEdText;
VclPtr<PushButton> mpBtScript;
- bool mbIsCloseDisabled;
+ bool mbIsCloseDisabled;
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >
- mxDocumentFrame;
+ css::uno::Reference< css::frame::XFrame >
+ mxDocumentFrame;
protected:
VclPtr<vcl::Window> mpDialog;
@@ -121,7 +121,7 @@ public:
virtual void dispose() SAL_OVERRIDE;
void SetDocumentFrame(
- const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XFrame >& rxDocumentFrame )
+ const css::uno::Reference< css::frame::XFrame >& rxDocumentFrame )
{
mxDocumentFrame = rxDocumentFrame;
}
diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx
index 9d08cc5..aa42ba5 100644
--- a/cui/source/inc/insdlg.hxx
+++ b/cui/source/inc/insdlg.hxx
@@ -40,17 +40,17 @@ class INetURLObject;
class InsertObjectDialog_Impl : public ModalDialog
{
protected:
- com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >
m_xObj;
- const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >
m_xStorage;
+ css::uno::Reference < css::embed::XEmbeddedObject > m_xObj;
+ const css::uno::Reference < css::embed::XStorage > m_xStorage;
comphelper::EmbeddedObjectContainer aCnt;
InsertObjectDialog_Impl(vcl::Window * pParent, const OUString& rID,
const OUString& rUIXMLDescription,
- const com::sun::star::uno::Reference < com::sun::star::embed::XStorage
>& xStorage);
+ const css::uno::Reference < css::embed::XStorage >& xStorage);
public:
- com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >
GetObject()
+ css::uno::Reference < css::embed::XEmbeddedObject > GetObject()
{ return m_xObj; }
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::io::XInputStream > GetIconIfIconified( OUString*
pGraphicMediaType );
+ virtual css::uno::Reference< css::io::XInputStream > GetIconIfIconified(
OUString* pGraphicMediaType );
virtual bool IsCreateNew() const;
};
@@ -66,7 +66,7 @@ class SvInsertOleDlg : public InsertObjectDialog_Impl
VclPtr<CheckBox> m_pCbFilelink;
const SvObjectServerList* m_pServers;
- ::com::sun::star::uno::Sequence< sal_Int8 > m_aIconMetaFile;
+ css::uno::Sequence< sal_Int8 > m_aIconMetaFile;
OUString m_aIconMediaType;
DECL_LINK(DoubleClickHdl, void*);
@@ -84,14 +84,14 @@ class SvInsertOleDlg : public InsertObjectDialog_Impl
public:
SvInsertOleDlg( vcl::Window* pParent,
- const com::sun::star::uno::Reference < com::sun::star::embed::XStorage
>& xStorage,
+ const css::uno::Reference < css::embed::XStorage >& xStorage,
const SvObjectServerList* pServers = NULL );
virtual ~SvInsertOleDlg();
virtual void dispose() SAL_OVERRIDE;
virtual short Execute() SAL_OVERRIDE;
/// get replacement for the iconified embedded object and the mediatype of
the replacement
- ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
GetIconIfIconified( OUString* pGraphicMediaType ) SAL_OVERRIDE;
+ css::uno::Reference< css::io::XInputStream > GetIconIfIconified( OUString*
pGraphicMediaType ) SAL_OVERRIDE;
};
class SvInsertPlugInDialog : public InsertObjectDialog_Impl
@@ -109,7 +109,7 @@ private:
public:
SvInsertPlugInDialog(vcl::Window* pParent,
- const com::sun::star::uno::Reference < com::sun::star::embed::XStorage
>& xStorage);
+ const css::uno::Reference < css::embed::XStorage >& xStorage);
virtual ~SvInsertPlugInDialog();
virtual void dispose() SAL_OVERRIDE;
virtual short Execute() SAL_OVERRIDE;
@@ -143,9 +143,9 @@ private:
public:
SfxInsertFloatingFrameDialog(vcl::Window *pParent,
- const com::sun::star::uno::Reference < com::sun::star::embed::XStorage
>& xStorage );
+ const css::uno::Reference < css::embed::XStorage >& xStorage );
SfxInsertFloatingFrameDialog( vcl::Window* pParent,
- const com::sun::star::uno::Reference <
com::sun::star::embed::XEmbeddedObject >& xObj );
+ const css::uno::Reference < css::embed::XEmbeddedObject >& xObj );
virtual ~SfxInsertFloatingFrameDialog();
virtual void dispose() SAL_OVERRIDE;
virtual short Execute() SAL_OVERRIDE;
diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx
index eb54a55..38a8e64 100644
--- a/cui/source/inc/macroass.hxx
+++ b/cui/source/inc/macroass.hxx
@@ -79,7 +79,7 @@ class SfxMacroTabPage : public _SfxMacroTabPage
public:
SfxMacroTabPage(
vcl::Window* pParent,
- const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XFrame >& rxDocumentFrame,
+ const css::uno::Reference< css::frame::XFrame >& rxDocumentFrame,
const SfxItemSet& rSet
);
@@ -92,7 +92,7 @@ class SfxMacroAssignDlg : public SfxSingleTabDialog
public:
SfxMacroAssignDlg(
vcl::Window* pParent,
- const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XFrame >& rxDocumentFrame,
+ const css::uno::Reference< css::frame::XFrame >& rxDocumentFrame,
const SfxItemSet& rSet );
};
diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx
index b9bea10..ab7492f 100644
--- a/cui/source/inc/macropg.hxx
+++ b/cui/source/inc/macropg.hxx
@@ -65,9 +65,9 @@ class _SvxMacroTabPage : public SfxTabPage
protected:
_SvxMacroTabPage_Impl* mpImpl;
- ::com::sun::star::uno::Reference<
::com::sun::star::container::XNameReplace > m_xAppEvents;
- ::com::sun::star::uno::Reference<
::com::sun::star::container::XNameReplace > m_xDocEvents;
- ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifiable >
m_xModifiable;
+ css::uno::Reference< css::container::XNameReplace > m_xAppEvents;
+ css::uno::Reference< css::container::XNameReplace > m_xDocEvents;
+ css::uno::Reference< css::util::XModifiable > m_xModifiable;
EventsHash m_appEventsHash;
EventsHash m_docEventsHash;
bool bReadOnly, bDocModified, bAppEvents, bInitialized;
@@ -76,8 +76,8 @@ protected:
_SvxMacroTabPage( vcl::Window* pParent, const OString& rID, const
OUString& rUIXMLDescription, const SfxItemSet& rItemSet );
void EnableButtons();
- static ::com::sun::star::uno::Any GetPropsByName( const OUString&
eventName, EventsHash& eventsHash );
- static ::std::pair< OUString, OUString > GetPairFromAny(
::com::sun::star::uno::Any aAny );
+ static css::uno::Any GetPropsByName( const OUString& eventName,
EventsHash& eventsHash );
+ static ::std::pair< OUString, OUString > GetPairFromAny( css::uno::Any
aAny );
public:
@@ -85,7 +85,7 @@ public:
virtual void dispose() SAL_OVERRIDE;
void InitResources();
- void InitAndSetHandler(
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace >
xAppEvents, ::com::sun::star::uno::Reference<
::com::sun::star::container::XNameReplace > xDocEvents,
::com::sun::star::uno::Reference< ::com::sun::star::util::XModifiable >
xModifiable );
+ void InitAndSetHandler( css::uno::Reference<
css::container::XNameReplace > xAppEvents, css::uno::Reference<
css::container::XNameReplace > xDocEvents, css::uno::Reference<
css::util::XModifiable > xModifiable );
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE;
@@ -100,9 +100,9 @@ class SvxMacroTabPage : public _SvxMacroTabPage
public:
SvxMacroTabPage(
vcl::Window* pParent,
- const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XFrame >& _rxDocumentFrame,
+ const css::uno::Reference< css::frame::XFrame >& _rxDocumentFrame,
const SfxItemSet& rSet,
- ::com::sun::star::uno::Reference<
::com::sun::star::container::XNameReplace > xNameReplace,
+ css::uno::Reference< css::container::XNameReplace > xNameReplace,
sal_uInt16 nSelectedIndex
);
};
@@ -126,9 +126,9 @@ class SvxMacroAssignDlg : public
SvxMacroAssignSingleTabDialog
public:
SvxMacroAssignDlg(
vcl::Window* pParent,
- const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XFrame >& _rxDocumentFrame,
+ const css::uno::Reference< css::frame::XFrame >& _rxDocumentFrame,
const SfxItemSet& rSet,
- const ::com::sun::star::uno::Reference<
::com::sun::star::container::XNameReplace >& xNameReplace,
+ const css::uno::Reference< css::container::XNameReplace >&
xNameReplace,
sal_uInt16 nSelectedIndex
);
};
diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx
index ce0940f..7efb70d 100644
--- a/cui/source/inc/optdict.hxx
+++ b/cui/source/inc/optdict.hxx
@@ -54,23 +54,23 @@ private:
VclPtr<SvxLanguageBox> pLanguageLB;
VclPtr<CheckBox> pExceptBtn;
VclPtr<OKButton> pOKBtn;
- ::com::sun::star::uno::Reference<
- ::com::sun::star::linguistic2::XSpellChecker1 > xSpell;
- ::com::sun::star::uno::Reference<
- ::com::sun::star::linguistic2::XDictionary > xNewDic;
+ css::uno::Reference<
+ css::linguistic2::XSpellChecker1 > xSpell;
+ css::uno::Reference<
+ css::linguistic2::XDictionary > xNewDic;
DECL_LINK(OKHdl_Impl, void *);
DECL_LINK(ModifyHdl_Impl, void *);
public:
SvxNewDictionaryDialog( vcl::Window* pParent,
- ::com::sun::star::uno::Reference<
- ::com::sun::star::linguistic2::XSpellChecker1 > &xSpl );
+ css::uno::Reference<
+ css::linguistic2::XSpellChecker1 > &xSpl );
virtual ~SvxNewDictionaryDialog();
virtual void dispose() SAL_OVERRIDE;
- ::com::sun::star::uno::Reference<
- ::com::sun::star::linguistic2::XDictionary >
+ css::uno::Reference<
+ css::linguistic2::XDictionary >
GetNewDictionary() { return xNewDic; }
};
@@ -117,11 +117,11 @@ private:
OUString sNew;
DecorationView aDecoView;
- ::com::sun::star::uno::Sequence<
- ::com::sun::star::uno::Reference<
- ::com::sun::star::linguistic2::XDictionary > > aDics; //!
snapshot copy to work on
- ::com::sun::star::uno::Reference<
- ::com::sun::star::linguistic2::XSpellChecker1 > xSpell;
+ css::uno::Sequence<
+ css::uno::Reference<
+ css::linguistic2::XDictionary > > aDics; //! snapshot copy to
work on
+ css::uno::Reference<
+ css::linguistic2::XSpellChecker1 > xSpell;
short nOld;
long nWidth;
@@ -137,10 +137,10 @@ private:
void ShowWords_Impl( sal_uInt16 nId );
- void SetLanguage_Impl( ::com::sun::star::util::Language
nLanguage );
+ void SetLanguage_Impl( css::util::Language nLanguage );
bool IsDicReadonly_Impl() const { return bDicIsReadonly; }
- void SetDicReadonly_Impl( ::com::sun::star::uno::Reference<
- ::com::sun::star::linguistic2::XDictionary >
&xDic );
+ void SetDicReadonly_Impl( css::uno::Reference<
+ css::linguistic2::XDictionary > &xDic );
void RemoveDictEntry(SvTreeListEntry* pEntry);
sal_uLong GetLBInsertPos(const OUString &rDicWord);
@@ -148,8 +148,8 @@ private:
public:
SvxEditDictionaryDialog( vcl::Window* pParent,
const OUString& rName,
- ::com::sun::star::uno::Reference<
- ::com::sun::star::linguistic2::XSpellChecker1> &xSpl );
+ css::uno::Reference<
+ css::linguistic2::XSpellChecker1> &xSpl );
virtual ~SvxEditDictionaryDialog();
virtual void dispose() SAL_OVERRIDE;
};
diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx
index 96a0238..ac75f14 100644
--- a/cui/source/inc/optlingu.hxx
+++ b/cui/source/inc/optlingu.hxx
@@ -118,14 +118,14 @@ private:
OUString sHyphAuto;
OUString sHyphSpecial;
- com::sun::star::uno::Reference<
- com::sun::star::linguistic2::XLinguProperties > xProp;
+ css::uno::Reference<
+ css::linguistic2::XLinguProperties > xProp;
- com::sun::star::uno::Reference<
- com::sun::star::linguistic2::XDictionaryList > xDicList;
- com::sun::star::uno::Sequence<
- com::sun::star::uno::Reference<
- com::sun::star::linguistic2::XDictionary > > aDics;
+ css::uno::Reference<
+ css::linguistic2::XDictionaryList > xDicList;
+ css::uno::Sequence<
+ css::uno::Reference<
+ css::linguistic2::XDictionary > > aDics;
SvLBoxButtonData* pCheckButtonData;
@@ -134,8 +134,8 @@ private:
SvxLinguTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet );
SvTreeListEntry* CreateEntry(OUString& rTxt, sal_uInt16 nCol);
- void AddDicBoxEntry( const com::sun::star::uno::Reference<
com::sun::star::linguistic2::XDictionary > &rxDic, sal_uInt16 nIdx );
- static sal_uLong GetDicUserData( const com::sun::star::uno::Reference<
com::sun::star::linguistic2::XDictionary > &rxDic, sal_uInt16 nIdx );
+ void AddDicBoxEntry( const css::uno::Reference<
css::linguistic2::XDictionary > &rxDic, sal_uInt16 nIdx );
+ static sal_uLong GetDicUserData( const css::uno::Reference<
css::linguistic2::XDictionary > &rxDic, sal_uInt16 nIdx );
DECL_LINK( SelectHdl_Impl, SvxCheckListBox * );
DECL_LINK( ClickHdl_Impl, PushButton * );
diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx
index 4158d02..1282693 100644
--- a/cui/source/inc/optpath.hxx
+++ b/cui/source/inc/optpath.hxx
@@ -48,8 +48,8 @@ private:
VclPtr<svx::OptHeaderTabListBox> pPathBox;
OptPath_Impl* pImpl;
- ::com::sun::star::uno::Reference< ::svt::DialogClosedListener >
xDialogListener;
- ::com::sun::star::uno::Reference<
::com::sun::star::ui::dialogs::XFolderPicker2 > xFolderPicker;
+ css::uno::Reference< ::svt::DialogClosedListener > xDialogListener;
+ css::uno::Reference< css::ui::dialogs::XFolderPicker2 > xFolderPicker;
void ChangeCurrentEntry( const OUString& _rFolder );
@@ -60,7 +60,7 @@ private:
DECL_LINK( HeaderSelect_Impl, HeaderBar * );
DECL_LINK( HeaderEndDrag_Impl, HeaderBar * );
- DECL_LINK( DialogClosedHdl,
::com::sun::star::ui::dialogs::DialogClosedEvent* );
+ DECL_LINK( DialogClosedHdl, css::ui::dialogs::DialogClosedEvent* );
void GetPathList( sal_uInt16 _nPathHandle, OUString& _rInternalPath,
OUString& _rUserPath, OUString& _rWritablePath,
bool& _rReadOnly );
diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx
index 9a6354d..b7db84a 100644
--- a/cui/source/inc/scriptdlg.hxx
+++ b/cui/source/inc/scriptdlg.hxx
@@ -55,11 +55,11 @@ private:
OUString m_sMyMacros;
OUString m_sProdMacros;
- static ::com::sun::star::uno::Reference<
::com::sun::star::script::browse::XBrowseNode >
- getLangNodeFromRootNode( ::com::sun::star::uno::Reference<
::com::sun::star::script::browse::XBrowseNode >& root, OUString& language );
+ static css::uno::Reference< css::script::browse::XBrowseNode >
+ getLangNodeFromRootNode( css::uno::Reference<
css::script::browse::XBrowseNode >& root, OUString& language );
static void delUserData( SvTreeListEntry* pEntry );
- static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface
> getDocumentModel( ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext >& xCtx, OUString& docName );
+ static css::uno::Reference< css::uno::XInterface > getDocumentModel(
css::uno::Reference< css::uno::XComponentContext >& xCtx, OUString& docName );
protected:
virtual void RequestingChildren( SvTreeListEntry* pParent )
SAL_OVERRIDE;
@@ -68,8 +68,8 @@ protected:
public:
void Init( const OUString& language );
void RequestSubEntries( SvTreeListEntry* pRootEntry,
- ::com::sun::star::uno::Reference<
::com::sun::star::script::browse::XBrowseNode >& node,
- ::com::sun::star::uno::Reference<
com::sun::star::frame::XModel>& model );
+ css::uno::Reference<
css::script::browse::XBrowseNode >& node,
+ css::uno::Reference< css::frame::XModel>&
model );
SFTreeListBox(vcl::Window* pParent);
virtual ~SFTreeListBox();
virtual void dispose() SAL_OVERRIDE;
@@ -115,18 +115,18 @@ class SFEntry
private:
sal_uInt8 nType;
bool loaded;
- ::com::sun::star::uno::Reference<
::com::sun::star::script::browse::XBrowseNode > nodes;
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >
model;
+ css::uno::Reference< css::script::browse::XBrowseNode > nodes;
+ css::uno::Reference< css::frame::XModel > model;
SFEntry(){}
public:
SFEntry( sal_uInt8 nT ) { nType = nT;
loaded=false; }
SFEntry( sal_uInt8 nT,
- const ::com::sun::star::uno::Reference<
::com::sun::star::script::browse::XBrowseNode >& entryNodes ,
- const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XModel >& entryModel) { nType = nT; nodes =
entryNodes; loaded=false; model = entryModel; }
+ const css::uno::Reference<
css::script::browse::XBrowseNode >& entryNodes ,
+ const css::uno::Reference< css::frame::XModel >&
entryModel) { nType = nT; nodes = entryNodes; loaded=false; model = entryModel;
}
SFEntry( const SFEntry& r ) { nType = r.nType; nodes =
r.nodes; loaded = r.loaded; }
virtual ~SFEntry() {}
- ::com::sun::star::uno::Reference<
::com::sun::star::script::browse::XBrowseNode > GetNode() { return nodes ;}
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >
GetModel() { return model ;};
+ css::uno::Reference< css::script::browse::XBrowseNode > GetNode() { return
nodes ;}
+ css::uno::Reference< css::frame::XModel > GetModel() { return model ;};
bool isLoaded() const { return loaded; }
void setLoaded() { loaded=true; }
};
@@ -159,17 +159,17 @@ protected:
DECL_LINK( MacroSelectHdl, SvTreeListBox * );
DECL_LINK( ScriptSelectHdl, SvTreeListBox * );
DECL_LINK( ButtonHdl, Button * );
- static bool getBoolProperty( ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet >& xProps, OUString& propName );
- void CheckButtons( ::com::sun::star::uno::Reference<
::com::sun::star::script::browse::XBrowseNode >& node );
+ static bool getBoolProperty( css::uno::Reference<
css::beans::XPropertySet >& xProps, OUString& propName );
+ void CheckButtons( css::uno::Reference<
css::script::browse::XBrowseNode >& node );
void createEntry( SvTreeListEntry* pEntry );
void renameEntry( SvTreeListEntry* pEntry );
void deleteEntry( SvTreeListEntry* pEntry );
- static ::com::sun::star::uno::Reference<
::com::sun::star::script::browse::XBrowseNode >
+ static css::uno::Reference< css::script::browse::XBrowseNode >
getBrowseNode( SvTreeListEntry* pEntry );
- static ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >
getModel( SvTreeListEntry* pEntry );
- OUString getListOfChildren( ::com::sun::star::uno::Reference<
com::sun::star::script::browse::XBrowseNode > node, int depth );
+ static css::uno::Reference< css::frame::XModel > getModel(
SvTreeListEntry* pEntry );
+ OUString getListOfChildren( css::uno::Reference<
css::script::browse::XBrowseNode > node, int depth );
void StoreCurrentSelection();
void RestorePreviousSelection();
@@ -194,8 +194,7 @@ private:
public:
- SvxScriptErrorDialog(
- vcl::Window* parent, ::com::sun::star::uno::Any aException );
+ SvxScriptErrorDialog( vcl::Window* parent, css::uno::Any aException );
virtual ~SvxScriptErrorDialog();
diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx
index f8bd35c..7748514 100644
--- a/cui/source/inc/selector.hxx
+++ b/cui/source/inc/selector.hxx
@@ -43,11 +43,11 @@ struct SvxGroupInfo_Impl
{
sal_uInt16 nKind;
sal_uInt16 nOrd;
- ::com::sun::star::uno::Reference<
::com::sun::star::script::browse::XBrowseNode >
- xBrowseNode;
- OUString sURL;
- OUString sHelpText;
- bool bWasOpened;
+ css::uno::Reference< css::script::browse::XBrowseNode >
+ xBrowseNode;
+ OUString sURL;
+ OUString sHelpText;
+ bool bWasOpened;
SvxGroupInfo_Impl( sal_uInt16 n, sal_uInt16 nr )
:nKind( n )
@@ -59,7 +59,7 @@ struct SvxGroupInfo_Impl
{
}
- SvxGroupInfo_Impl( sal_uInt16 n, sal_uInt16 nr, const
::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode
>& _rxNode )
+ SvxGroupInfo_Impl( sal_uInt16 n, sal_uInt16 nr, const css::uno::Reference<
css::script::browse::XBrowseNode >& _rxNode )
:nKind( n )
,nOrd( nr )
,xBrowseNode( _rxNode )
@@ -120,11 +120,11 @@ class SvxConfigGroupListBox : public SvTreeListBox
VclPtr<SvxConfigFunctionListBox> pFunctionListBox;
SaveInData* m_pImageProvider;
- ::com::sun::star::uno::Reference
- < ::com::sun::star::frame::XFrame > m_xFrame;
+ css::uno::Reference
+ < css::frame::XFrame > m_xFrame;
- ::com::sun::star::uno::Reference
- < ::com::sun::star::container::XNameAccess > m_xModuleCommands;
+ css::uno::Reference
+ < css::container::XNameAccess > m_xModuleCommands;
Image m_hdImage;
Image m_libImage;
@@ -133,19 +133,19 @@ class SvxConfigGroupListBox : public SvTreeListBox
OUString m_sMyMacros;
OUString m_sProdMacros;
Image GetImage(
- ::com::sun::star::uno::Reference<
::com::sun::star::script::browse::XBrowseNode > node,
- ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext > xCtx,
+ css::uno::Reference< css::script::browse::XBrowseNode > node,
+ css::uno::Reference< css::uno::XComponentContext > xCtx,
bool bIsRootNode
);
- static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface
> getDocumentModel(
- ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext >& xCtx,
+ static css::uno::Reference< css::uno::XInterface > getDocumentModel(
+ css::uno::Reference< css::uno::XComponentContext >& xCtx,
OUString& docName
);
private:
void fillScriptList(
- const ::com::sun::star::uno::Reference<
::com::sun::star::script::browse::XBrowseNode >& _rxRootNode,
+ const css::uno::Reference< css::script::browse::XBrowseNode >&
_rxRootNode,
SvTreeListEntry* _pParentEntry,
bool _bCheapChildrenOnDemand
);
@@ -159,8 +159,8 @@ public:
virtual ~SvxConfigGroupListBox();
virtual void dispose() SAL_OVERRIDE;
- void Init(bool bShowSlots, const ::com::sun::star::uno::Reference
- < ::com::sun::star::frame::XFrame >& xFrame);
+ void Init(bool bShowSlots, const css::uno::Reference
+ < css::frame::XFrame >& xFrame);
void ClearAll();
void GroupSelected();
@@ -195,8 +195,7 @@ public:
SvxScriptSelectorDialog (
vcl::Window* pParent = NULL,
bool bShowSlots = false,
- const ::com::sun::star::uno::Reference
- < ::com::sun::star::frame::XFrame >& xFrame = 0
+ const css::uno::Reference< css::frame::XFrame >& xFrame = 0
);
virtual ~SvxScriptSelectorDialog();
virtual void dispose() SAL_OVERRIDE;
diff --git a/cui/source/inc/showcols.hxx b/cui/source/inc/showcols.hxx
index d7494d7..96c7022 100644
--- a/cui/source/inc/showcols.hxx
+++ b/cui/source/inc/showcols.hxx
@@ -38,14 +38,14 @@ class FmShowColsDialog : public ModalDialog
VclPtr<ListBox> m_pList;
VclPtr<OKButton> m_pOK;
- ::com::sun::star::uno::Reference<
::com::sun::star::container::XIndexAccess > m_xColumns;
+ css::uno::Reference< css::container::XIndexAccess > m_xColumns;
public:
FmShowColsDialog(vcl::Window* pParent);
virtual ~FmShowColsDialog();
virtual void dispose() SAL_OVERRIDE;
- void SetColumns(const ::com::sun::star::uno::Reference<
::com::sun::star::container::XIndexContainer>& xCols);
+ void SetColumns(const css::uno::Reference<
css::container::XIndexContainer>& xCols);
protected:
DECL_LINK(OnClickedOk, void *);
diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx
index 0ec5697..e88b3e2 100644
--- a/cui/source/inc/treeopt.hxx
+++ b/cui/source/inc/treeopt.hxx
@@ -151,20 +151,20 @@ private:
VclPtr<SvTreeListBox> pTreeLB;
VclPtr<VclBox> pTabBox;
- OUString sTitle;
- OUString sNotLoadedError;
+ OUString sTitle;
+ OUString sNotLoadedError;
// for the ColorTabPage
- SfxItemSet* pColorPageItemSet;
+ SfxItemSet* pColorPageItemSet;
VclPtr<SvxColorTabPage> mpColorPage;
- bool bForgetSelection;
- bool bIsFromExtensionManager;
+ bool bForgetSelection;
+ bool bIsFromExtensionManager;
// check "for the current document only" and set focus to "Western"
languages box
- bool bIsForSetDocumentLanguage;
+ bool bIsForSetDocumentLanguage;
- com::sun::star::uno::Reference <
com::sun::star::awt::XContainerWindowProvider >
+ css::uno::Reference < css::awt::XContainerWindowProvider >
m_xContainerWinProvider;
static LastPageSaver* pLastPageSaver;
@@ -172,12 +172,12 @@ private:
SfxItemSet* CreateItemSet( sal_uInt16 nId );
static void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet );
void InitTreeAndHandler();
- void Initialize( const com::sun::star::uno::Reference<
com::sun::star::frame::XFrame >& _xFrame );
+ void Initialize( const css::uno::Reference< css::frame::XFrame
>& _xFrame );
void InitWidgets();
void LoadExtensionOptions( const OUString& rExtensionId );
- static OUString GetModuleIdentifier( const com::sun::star::uno::Reference<
- com::sun::star::frame::XFrame >&
xFrame );
+ static OUString GetModuleIdentifier( const css::uno::Reference<
+ css::frame::XFrame >& xFrame );
static Module* LoadModule( const OUString& rModuleIdentifier );
static VectorOfNodes LoadNodes( Module* pModule, const OUString&
rExtensionId );
void InsertNodes( const VectorOfNodes& rNodeList );
@@ -195,7 +195,7 @@ protected:
public:
OfaTreeOptionsDialog( vcl::Window* pParent,
- const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >&
_xFrame,
+ const css::uno::Reference< css::frame::XFrame >& _xFrame,
bool bActivateLastSelection = true );
OfaTreeOptionsDialog( vcl::Window* pParent, const OUString& rExtensionId );
virtual ~OfaTreeOptionsDialog();
@@ -257,24 +257,24 @@ class ExtensionsTabPage : public TabPage
{
private:
OUString m_sPageURL;
- com::sun::star::uno::Reference< com::sun::star::awt::XWindow >
+ css::uno::Reference< css::awt::XWindow >
m_xPage;
OUString m_sEventHdl;
- com::sun::star::uno::Reference<
com::sun::star::awt::XContainerWindowEventHandler >
+ css::uno::Reference< css::awt::XContainerWindowEventHandler >
m_xEventHdl;
- com::sun::star::uno::Reference<
com::sun::star::awt::XContainerWindowProvider >
+ css::uno::Reference< css::awt::XContainerWindowProvider >
m_xWinProvider;
bool m_bIsWindowHidden;
void CreateDialogWithHandler();
- bool DispatchAction( const OUString& rAction );
+ bool DispatchAction( const OUString& rAction );
public:
ExtensionsTabPage(
vcl::Window* pParent, WinBits nStyle,
const OUString& rPageURL, const OUString& rEvtHdl,
- const com::sun::star::uno::Reference<
- com::sun::star::awt::XContainerWindowProvider >& rProvider );
+ const css::uno::Reference<
+ css::awt::XContainerWindowProvider >& rProvider );
virtual ~ExtensionsTabPage();
virtual void dispose() SAL_OVERRIDE;
diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx
index 0e21077..12e6b5d 100644
--- a/cui/source/options/cfgchart.cxx
+++ b/cui/source/options/cfgchart.cxx
@@ -267,7 +267,7 @@ void SvxChartOptions::ImplCommit()
PutProperties( aNames, aValues );
}
-void SvxChartOptions::Notify( const com::sun::star::uno::Sequence< OUString >&
)
+void SvxChartOptions::Notify( const css::uno::Sequence< OUString >& )
{
}
diff --git a/cui/source/options/cfgchart.hxx b/cui/source/options/cfgchart.hxx
index f7e34fb..5f9a6c8 100644
--- a/cui/source/options/cfgchart.hxx
+++ b/cui/source/options/cfgchart.hxx
@@ -63,12 +63,12 @@ class SvxChartOptions : public ::utl::ConfigItem
{
private:
SvxChartColorTable maDefColors;
- bool mbIsInitialized;
+ bool mbIsInitialized;
- ::com::sun::star::uno::Sequence< OUString >
- maPropertyNames;
+ css::uno::Sequence< OUString >
+ maPropertyNames;
- inline ::com::sun::star::uno::Sequence< OUString > GetPropertyNames() const
+ inline css::uno::Sequence< OUString > GetPropertyNames() const
{ return maPropertyNames; }
bool RetrieveOptions();
@@ -81,7 +81,7 @@ public:
const SvxChartColorTable& GetDefaultColors();
void SetDefaultColors( const SvxChartColorTable&
aCol );
- virtual void Notify( const com::sun::star::uno::Sequence< OUString >&
_rPropertyNames) SAL_OVERRIDE;
+ virtual void Notify( const css::uno::Sequence< OUString >&
_rPropertyNames) SAL_OVERRIDE;
};
diff --git a/cui/source/options/optaboutconfig.cxx
b/cui/source/options/optaboutconfig.cxx
index 165e9e9..37496e3 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -325,28 +325,28 @@ void CuiAboutConfigTabPage::FillItems(const Reference<
XNameAccess >& xNameAcces
{
switch( aNode.getValueType().getTypeClass() )
{
- case ::com::sun::star::uno::TypeClass_VOID:
+ case css::uno::TypeClass_VOID:
break;
- case ::com::sun::star::uno::TypeClass_BOOLEAN:
+ case css::uno::TypeClass_BOOLEAN:
sValue = OUString::boolean( aNode.get<bool>() );
break;
- case ::com::sun::star::uno::TypeClass_SHORT:
- case ::com::sun::star::uno::TypeClass_LONG:
- case ::com::sun::star::uno::TypeClass_HYPER:
+ case css::uno::TypeClass_SHORT:
+ case css::uno::TypeClass_LONG:
+ case css::uno::TypeClass_HYPER:
sValue = OUString::number( aNode.get<sal_Int64>() );
break;
- case ::com::sun::star::uno::TypeClass_DOUBLE:
+ case css::uno::TypeClass_DOUBLE:
sValue = OUString::number( aNode.get<double>() );
break;
- case ::com::sun::star::uno::TypeClass_STRING:
+ case css::uno::TypeClass_STRING:
sValue = aNode.get<OUString>();
break;
- case ::com::sun::star::uno::TypeClass_SEQUENCE:
+ case css::uno::TypeClass_SEQUENCE:
if( sType == "[]boolean" )
{
uno::Sequence<sal_Bool> seq = aNode.get<
uno::Sequence<sal_Bool> >();
@@ -487,7 +487,7 @@ Reference< XNameAccess >
CuiAboutConfigTabPage::getConfigAccess( const OUString&
uno::Reference< uno::XComponentContext > xContext(
::comphelper::getProcessComponentContext() );
uno::Reference< lang::XMultiServiceFactory > xConfigProvider(
- com::sun::star::configuration::theDefaultProvider::get(
xContext ) );
+ css::configuration::theDefaultProvider::get( xContext ) );
beans::NamedValue aProperty;
aProperty.Name = "nodepath";
diff --git a/cui/source/options/optaboutconfig.hxx
b/cui/source/options/optaboutconfig.hxx
index 8fbb310..0938dc8 100644
--- a/cui/source/options/optaboutconfig.hxx
+++ b/cui/source/options/optaboutconfig.hxx
@@ -54,7 +54,7 @@ private:
VclPtr< SvSimpleTable > m_pPrefBox;
//for search
- ::com::sun::star::util::SearchOptions m_options;
+ css::util::SearchOptions m_options;
SvTreeListEntries m_prefBoxEntries;
void AddToModifiedVector( const boost::shared_ptr< Prop_Impl >& rProp );
@@ -73,9 +73,9 @@ public:
void InsertEntry(const OUString &rPropertyPath, const OUString& rProp,
const OUString& rStatus, const OUString& rType, const OUString& rValue,
SvTreeListEntry *pParentEntry = nullptr, bool
bInsertToPrefBox = true);
void Reset();
- void FillItems(const
com::sun::star::uno::Reference<com::sun::star::container::XNameAccess>&
xNameAccess,
+ void FillItems(const css::uno::Reference<css::container::XNameAccess>&
xNameAccess,
SvTreeListEntry *pParentEntry = nullptr, int lineage =
0, bool bLoadAll = false);
- static com::sun::star::uno::Reference<
com::sun::star::container::XNameAccess > getConfigAccess( const OUString&
sNodePath, bool bUpdate );
+ static css::uno::Reference< css::container::XNameAccess > getConfigAccess(
const OUString& sNodePath, bool bUpdate );
bool FillItemSet();
};
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index c57641a..42bb257 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -494,7 +494,7 @@ CanvasSettings::CanvasSettings() :
try
{
Reference<XMultiServiceFactory> xConfigProvider(
- com::sun::star::configuration::theDefaultProvider::get(
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
