diff options
author | Noel Grandin <noel@peralex.com> | 2015-10-28 12:01:32 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-10-29 09:50:19 +0200 |
commit | a2795356608c9de3679ccd3076c7df14cb549d8b (patch) | |
tree | 327bd5f473f476ef96843438898e506964d50f38 /sd/source/ui/view | |
parent | b0f7efe83096655348d32782636bf0f54d837834 (diff) |
com::sun::star->css in sd
Change-Id: Ic0cbc857a3a9c66241b94c30bf8c859435f5a4b4
Diffstat (limited to 'sd/source/ui/view')
-rw-r--r-- | sd/source/ui/view/DocumentRenderer.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/GraphicViewShellBase.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/ImpressViewShellBase.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/Outliner.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/PresentationViewShellBase.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/ViewShellBase.cxx | 10 | ||||
-rw-r--r-- | sd/source/ui/view/ViewTabBar.cxx | 26 | ||||
-rw-r--r-- | sd/source/ui/view/drtxtob.cxx | 8 | ||||
-rw-r--r-- | sd/source/ui/view/drtxtob1.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/drviews1.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/drviews2.cxx | 8 | ||||
-rw-r--r-- | sd/source/ui/view/drviews3.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/view/drviews5.cxx | 20 | ||||
-rw-r--r-- | sd/source/ui/view/drviews8.cxx | 10 | ||||
-rw-r--r-- | sd/source/ui/view/drviews9.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/view/frmview.cxx | 6 | ||||
-rw-r--r-- | sd/source/ui/view/outlnvsh.cxx | 16 | ||||
-rw-r--r-- | sd/source/ui/view/sdview.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/sdview2.cxx | 12 | ||||
-rw-r--r-- | sd/source/ui/view/sdview3.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/sdwindow.cxx | 5 | ||||
-rw-r--r-- | sd/source/ui/view/viewshel.cxx | 8 |
22 files changed, 73 insertions, 82 deletions
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index a92c3dfd4b91..fdd578d15971 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -938,7 +938,7 @@ namespace { { SdPage& rHandoutPage (*rDocument.GetSdPage(0, PK_HANDOUT)); - Reference< com::sun::star::beans::XPropertySet > xHandoutPage( rHandoutPage.getUnoPage(), UNO_QUERY ); + Reference< css::beans::XPropertySet > xHandoutPage( rHandoutPage.getUnoPage(), UNO_QUERY ); const OUString sPageNumber( "Number" ); // Collect the page objects of the handout master. diff --git a/sd/source/ui/view/GraphicViewShellBase.cxx b/sd/source/ui/view/GraphicViewShellBase.cxx index 02dee459801b..6a4b8b50c8f2 100644 --- a/sd/source/ui/view/GraphicViewShellBase.cxx +++ b/sd/source/ui/view/GraphicViewShellBase.cxx @@ -95,7 +95,7 @@ void GraphicViewShellBase::Execute (SfxRequest& rRequest) void GraphicViewShellBase::InitializeFramework() { - com::sun::star::uno::Reference<com::sun::star::frame::XController> + css::uno::Reference<css::frame::XController> xController (GetController()); sd::framework::DrawModule::Initialize(xController); } diff --git a/sd/source/ui/view/ImpressViewShellBase.cxx b/sd/source/ui/view/ImpressViewShellBase.cxx index 531a0c8b8e9c..5b10a9206277 100644 --- a/sd/source/ui/view/ImpressViewShellBase.cxx +++ b/sd/source/ui/view/ImpressViewShellBase.cxx @@ -88,7 +88,7 @@ void ImpressViewShellBase::Execute (SfxRequest& rRequest) void ImpressViewShellBase::InitializeFramework() { - ::com::sun::star::uno::Reference<com::sun::star::frame::XController> + css::uno::Reference<css::frame::XController> xController (GetController()); sd::framework::ImpressModule::Initialize(xController); } diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index 71656bb98d91..c7f315a54bbb 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -1032,7 +1032,7 @@ void Outliner::ProvideNextTextObject() { mpView->SdrEndTextEdit(); } - catch (const ::com::sun::star::uno::Exception&) + catch (const css::uno::Exception&) { DBG_UNHANDLED_EXCEPTION(); } diff --git a/sd/source/ui/view/PresentationViewShellBase.cxx b/sd/source/ui/view/PresentationViewShellBase.cxx index a5173da3a559..ab051722cad3 100644 --- a/sd/source/ui/view/PresentationViewShellBase.cxx +++ b/sd/source/ui/view/PresentationViewShellBase.cxx @@ -86,7 +86,7 @@ PresentationViewShellBase::~PresentationViewShellBase() void PresentationViewShellBase::InitializeFramework() { - com::sun::star::uno::Reference<com::sun::star::frame::XController> + css::uno::Reference<css::frame::XController> xController (GetController()); sd::framework::PresentationModule::Initialize(xController); } diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 7fc8354905f1..58d75681656e 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -664,8 +664,7 @@ void ViewShellBase::GetState (SfxItemSet& rSet) } void ViewShellBase::WriteUserDataSequence ( - ::com::sun::star::uno::Sequence < - ::com::sun::star::beans::PropertyValue >& rSequence, + css::uno::Sequence< css::beans::PropertyValue >& rSequence, bool bBrowse) { // Forward call to main sub shell. @@ -675,8 +674,7 @@ void ViewShellBase::WriteUserDataSequence ( } void ViewShellBase::ReadUserDataSequence ( - const ::com::sun::star::uno::Sequence < - ::com::sun::star::beans::PropertyValue >& rSequence, + const css::uno::Sequence< css::beans::PropertyValue >& rSequence, bool bBrowse) { // Forward call to main sub shell. @@ -866,7 +864,7 @@ OUString ViewShellBase::GetInitialViewShellType() break; sal_Int32 nView = 0; - ::com::sun::star::uno::Any aAny = xViewData->getByIndex(nView); + css::uno::Any aAny = xViewData->getByIndex(nView); Sequence<beans::PropertyValue> aProperties; if ( ! (aAny >>= aProperties)) break; @@ -977,7 +975,7 @@ OUString ImplRetrieveLabelFromCommand( const Reference< XFrame >& xFrame, const { Reference< XNameAccess > const xNameAccess( frame::theUICommandDescription::get(xContext) ); - Reference< ::com::sun::star::container::XNameAccess > m_xUICommandLabels( xNameAccess->getByName( aModuleIdentifier ), UNO_QUERY_THROW ); + Reference< css::container::XNameAccess > m_xUICommandLabels( xNameAccess->getByName( aModuleIdentifier ), UNO_QUERY_THROW ); Sequence< PropertyValue > aPropSeq; if( m_xUICommandLabels->getByName( aCmdURL ) >>= aPropSeq ) { diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx index bb9ea50d6381..8e3b344de97a 100644 --- a/sd/source/ui/view/ViewTabBar.cxx +++ b/sd/source/ui/view/ViewTabBar.cxx @@ -265,35 +265,35 @@ void SAL_CALL ViewTabBar::disposing( void SAL_CALL ViewTabBar::addTabBarButtonAfter ( const TabBarButton& rButton, const TabBarButton& rAnchor) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; AddTabBarButton(rButton, rAnchor); } void SAL_CALL ViewTabBar::appendTabBarButton (const TabBarButton& rButton) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; AddTabBarButton(rButton); } void SAL_CALL ViewTabBar::removeTabBarButton (const TabBarButton& rButton) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; RemoveTabBarButton(rButton); } sal_Bool SAL_CALL ViewTabBar::hasTabBarButton (const TabBarButton& rButton) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; return HasTabBarButton(rButton); } Sequence<TabBarButton> SAL_CALL ViewTabBar::getTabBarButtons() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; return GetTabBarButtons(); @@ -414,8 +414,8 @@ int ViewTabBar::GetHeight() } void ViewTabBar::AddTabBarButton ( - const ::com::sun::star::drawing::framework::TabBarButton& rButton, - const ::com::sun::star::drawing::framework::TabBarButton& rAnchor) + const css::drawing::framework::TabBarButton& rButton, + const css::drawing::framework::TabBarButton& rAnchor) { sal_uInt32 nIndex; @@ -441,13 +441,13 @@ void ViewTabBar::AddTabBarButton ( } void ViewTabBar::AddTabBarButton ( - const ::com::sun::star::drawing::framework::TabBarButton& rButton) + const css::drawing::framework::TabBarButton& rButton) { AddTabBarButton(rButton, maTabBarButtons.size()); } void ViewTabBar::AddTabBarButton ( - const ::com::sun::star::drawing::framework::TabBarButton& rButton, + const css::drawing::framework::TabBarButton& rButton, sal_Int32 nPosition) { if (nPosition>=0 @@ -463,7 +463,7 @@ void ViewTabBar::AddTabBarButton ( } void ViewTabBar::RemoveTabBarButton ( - const ::com::sun::star::drawing::framework::TabBarButton& rButton) + const css::drawing::framework::TabBarButton& rButton) { sal_uInt16 nIndex; for (nIndex=0; nIndex<maTabBarButtons.size(); ++nIndex) @@ -479,7 +479,7 @@ void ViewTabBar::RemoveTabBarButton ( } bool ViewTabBar::HasTabBarButton ( - const ::com::sun::star::drawing::framework::TabBarButton& rButton) + const css::drawing::framework::TabBarButton& rButton) { bool bResult (false); @@ -495,11 +495,11 @@ bool ViewTabBar::HasTabBarButton ( return bResult; } -::com::sun::star::uno::Sequence<com::sun::star::drawing::framework::TabBarButton> +css::uno::Sequence<css::drawing::framework::TabBarButton> ViewTabBar::GetTabBarButtons() { sal_uInt32 nCount (maTabBarButtons.size()); - ::com::sun::star::uno::Sequence<com::sun::star::drawing::framework::TabBarButton> + css::uno::Sequence<css::drawing::framework::TabBarButton> aList (nCount); for (sal_uInt32 nIndex=0; nIndex<nCount; ++nIndex) diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx index 1fa225f8aa51..c786f6251054 100644 --- a/sd/source/ui/view/drtxtob.cxx +++ b/sd/source/ui/view/drtxtob.cxx @@ -375,7 +375,7 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) bLeftToRight = false; } else - bLeftToRight = static_cast<const SvxWritingModeItem&>( aAttrSet.Get( SDRATTR_TEXTDIRECTION ) ).GetValue() == com::sun::star::text::WritingMode_LR_TB; + bLeftToRight = static_cast<const SvxWritingModeItem&>( aAttrSet.Get( SDRATTR_TEXTDIRECTION ) ).GetValue() == css::text::WritingMode_LR_TB; rSet.Put( SfxBoolItem( SID_TEXTDIRECTION_LEFT_TO_RIGHT, bLeftToRight ) ); rSet.Put( SfxBoolItem( SID_TEXTDIRECTION_TOP_TO_BOTTOM, !bLeftToRight ) ); @@ -537,11 +537,11 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) case FRMDIR_ENVIRONMENT: { SdDrawDocument& rDoc = mpView->GetDoc(); - ::com::sun::star::text::WritingMode eMode = rDoc.GetDefaultWritingMode(); + css::text::WritingMode eMode = rDoc.GetDefaultWritingMode(); bool bIsLeftToRight(false); - if(::com::sun::star::text::WritingMode_LR_TB == eMode - || ::com::sun::star::text::WritingMode_TB_RL == eMode) + if(css::text::WritingMode_LR_TB == eMode + || css::text::WritingMode_TB_RL == eMode) { bIsLeftToRight = true; } diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx index a34745db6d32..a163d36fefd2 100644 --- a/sd/source/ui/view/drtxtob1.cxx +++ b/sd/source/ui/view/drtxtob1.cxx @@ -310,7 +310,7 @@ void TextObjectBar::Execute( SfxRequest &rReq ) SfxItemSet aAttr( mpView->GetDoc().GetPool(), SDRATTR_TEXTDIRECTION, SDRATTR_TEXTDIRECTION, 0 ); aAttr.Put( SvxWritingModeItem( nSlot == SID_TEXTDIRECTION_LEFT_TO_RIGHT ? - com::sun::star::text::WritingMode_LR_TB : com::sun::star::text::WritingMode_TB_RL, + css::text::WritingMode_LR_TB : css::text::WritingMode_TB_RL, SDRATTR_TEXTDIRECTION ) ); rReq.Done( aAttr ); mpView->SetAttributes( aAttr ); diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index 77f3df741c54..e7b2bed58960 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -241,7 +241,7 @@ void DrawViewShell::SelectionHasChanged() } } } - catch( ::com::sun::star::uno::Exception& ) + catch( css::uno::Exception& ) { OSL_FAIL( OString(OString("sd::DrawViewShell::SelectionHasChanged(), " diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index ed339232a135..0542f0c928aa 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -1290,12 +1290,12 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) { try { - const ::com::sun::star::uno::Sequence< ::com::sun::star::scanner::ScannerContext > + const css::uno::Sequence< css::scanner::ScannerContext > aContexts( mxScannerManager->getAvailableScanners() ); if( aContexts.getLength() ) { - ::com::sun::star::scanner::ScannerContext aContext( aContexts.getConstArray()[ 0 ] ); + css::scanner::ScannerContext aContext( aContexts.getConstArray()[ 0 ] ); mxScannerManager->configureScannerAndScan( aContext, mxScannerListener ); } } @@ -1317,7 +1317,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) { try { - const ::com::sun::star::uno::Sequence< ::com::sun::star::scanner::ScannerContext > aContexts( mxScannerManager->getAvailableScanners() ); + const css::uno::Sequence< css::scanner::ScannerContext > aContexts( mxScannerManager->getAvailableScanners() ); if( aContexts.getLength() ) { @@ -2038,7 +2038,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) css::uno::Reference < css::ui::dialogs::XExecutableDialog > xDialog = css::ui::dialogs::XSLTFilterDialog::create( ::comphelper::getProcessComponentContext() ); xDialog->execute(); } - catch( ::com::sun::star::uno::RuntimeException& ) + catch( css::uno::RuntimeException& ) { DBG_UNHANDLED_EXCEPTION(); } diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx index 9203b5f19f05..3446b8a57b2d 100644 --- a/sd/source/ui/view/drviews3.cxx +++ b/sd/source/ui/view/drviews3.cxx @@ -896,7 +896,7 @@ void DrawViewShell::GetRulerState(SfxItemSet& rSet) maMarkRect = mpDrawView->GetAllMarkedRect(); - const bool bRTL = GetDoc() && GetDoc()->GetDefaultWritingMode() == ::com::sun::star::text::WritingMode_RL_TB; + const bool bRTL = GetDoc() && GetDoc()->GetDefaultWritingMode() == css::text::WritingMode_RL_TB; rSet.Put(SfxBoolItem(SID_RULER_TEXT_RIGHT_TO_LEFT, bRTL)); if( mpDrawView->AreObjectsMarked() ) @@ -970,7 +970,7 @@ void DrawViewShell::GetRulerState(SfxItemSet& rSet) if( aEditAttr.GetItemState( EE_PARA_WRITINGDIR ) >= SfxItemState::DEFAULT ) { const SvxFrameDirectionItem& rItem = static_cast<const SvxFrameDirectionItem&>( aEditAttr.Get( EE_PARA_WRITINGDIR ) ); - rSet.Put(SfxBoolItem(SID_RULER_TEXT_RIGHT_TO_LEFT, rItem.GetValue() == ::com::sun::star::text::WritingMode_RL_TB)); + rSet.Put(SfxBoolItem(SID_RULER_TEXT_RIGHT_TO_LEFT, rItem.GetValue() == css::text::WritingMode_RL_TB)); } } } diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx index a4174b406224..a789e8e751ef 100644 --- a/sd/source/ui/view/drviews5.cxx +++ b/sd/source/ui/view/drviews5.cxx @@ -440,7 +440,7 @@ void DrawViewShell::HidePage() pFormShell->PrepareClose(false); } -void DrawViewShell::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rSequence, bool bBrowse ) +void DrawViewShell::WriteUserDataSequence ( css::uno::Sequence < css::beans::PropertyValue >& rSequence, bool bBrowse ) { WriteFrameViewData(); @@ -452,14 +452,14 @@ void DrawViewShell::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < :: rSequence[nIndex].Value <<= mbZoomOnPage; } -void DrawViewShell::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rSequence, bool bBrowse ) +void DrawViewShell::ReadUserDataSequence ( const css::uno::Sequence < css::beans::PropertyValue >& rSequence, bool bBrowse ) { WriteFrameViewData(); ViewShell::ReadUserDataSequence( rSequence, bBrowse ); const sal_Int32 nLength = rSequence.getLength(); - const com::sun::star::beans::PropertyValue *pValue = rSequence.getConstArray(); + const css::beans::PropertyValue *pValue = rSequence.getConstArray(); for (sal_Int32 i = 0 ; i < nLength; i++, pValue++ ) { if ( pValue->Name == sUNO_View_ZoomOnPage ) @@ -535,8 +535,7 @@ void DrawViewShell::VisAreaChanged(const Rectangle& rRect) <type>AccessibleDrawDocumentView</type>. Otherwise return an empty reference. */ -::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> +css::uno::Reference<css::accessibility::XAccessible> DrawViewShell::CreateAccessibleDocumentView (::sd::Window* pWindow) { if (GetViewShellBase().GetController() != NULL) @@ -548,14 +547,13 @@ void DrawViewShell::VisAreaChanged(const Rectangle& rRect) GetViewShellBase().GetController(), pWindow->GetAccessibleParentWindow()->GetAccessible()); pDocumentView->Init(); - return ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> - (static_cast< ::com::sun::star::uno::XWeak*>(pDocumentView), - ::com::sun::star::uno::UNO_QUERY); + return css::uno::Reference<css::accessibility::XAccessible> + (static_cast< css::uno::XWeak*>(pDocumentView), + css::uno::UNO_QUERY); } OSL_TRACE ("DrawViewShell::CreateAccessibleDocumentView: no controller"); - return ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>(); + return css::uno::Reference< css::accessibility::XAccessible>(); } int DrawViewShell::GetActiveTabLayerIndex() const @@ -582,7 +580,7 @@ void DrawViewShell::SetActiveTabLayerIndex (int nIndex) css::uno::Reference<SdUnoDrawView> pUnoDrawView(new SdUnoDrawView ( *this, *GetView())); - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer> rLayer = pUnoDrawView->getActiveLayer(); + css::uno::Reference< css::drawing::XLayer> rLayer = pUnoDrawView->getActiveLayer(); GetViewShellBase().GetDrawController().fireChangeLayer( &rLayer ); } } diff --git a/sd/source/ui/view/drviews8.cxx b/sd/source/ui/view/drviews8.cxx index c1d409e6727b..75c1a1c40baf 100644 --- a/sd/source/ui/view/drviews8.cxx +++ b/sd/source/ui/view/drviews8.cxx @@ -45,16 +45,16 @@ namespace sd { -void DrawViewShell::ScannerEvent( const ::com::sun::star::lang::EventObject& ) +void DrawViewShell::ScannerEvent( const css::lang::EventObject& ) { if( mxScannerManager.is() ) { - const ::com::sun::star::scanner::ScannerContext aContext( mxScannerManager->getAvailableScanners().getConstArray()[ 0 ] ); - const ::com::sun::star::scanner::ScanError eError = mxScannerManager->getError( aContext ); + const css::scanner::ScannerContext aContext( mxScannerManager->getAvailableScanners().getConstArray()[ 0 ] ); + const css::scanner::ScanError eError = mxScannerManager->getError( aContext ); - if( ::com::sun::star::scanner::ScanError_ScanErrorNone == eError ) + if( css::scanner::ScanError_ScanErrorNone == eError ) { - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap > xBitmap( mxScannerManager->getBitmap( aContext ) ); + const css::uno::Reference< css::awt::XBitmap > xBitmap( mxScannerManager->getBitmap( aContext ) ); if( xBitmap.is() ) { diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx index 8ea4492db6e2..77af9534bf18 100644 --- a/sd/source/ui/view/drviews9.cxx +++ b/sd/source/ui/view/drviews9.cxx @@ -82,7 +82,7 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq) sal_Int8 nType( pGalleryItem->GetType() ); // insert graphic - if (nType == com::sun::star::gallery::GalleryItemType::GRAPHIC) + if (nType == css::gallery::GalleryItemType::GRAPHIC) { Graphic aGraphic( pGalleryItem->GetGraphic() ); @@ -174,7 +174,7 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq) } } // insert sound - else if( nType == com::sun::star::gallery::GalleryItemType::MEDIA ) + else if( nType == css::gallery::GalleryItemType::MEDIA ) { const SfxStringItem aMediaURLItem( SID_INSERT_AVMEDIA, pGalleryItem->GetURL() ); GetViewFrame()->GetDispatcher()->Execute( SID_INSERT_AVMEDIA, SfxCallMode::SYNCHRON, &aMediaURLItem, 0L ); diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx index c1f65c78b39f..46f460d101bc 100644 --- a/sd/source/ui/view/frmview.cxx +++ b/sd/source/ui/view/frmview.cxx @@ -396,7 +396,7 @@ static OUString createHelpLinesString( const SdrHelpLineList& rHelpLines ) } #define addValue( n, v ) push_back( std::pair< OUString, Any >( OUString( n ), v ) ) -void FrameView::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rValues, bool ) +void FrameView::WriteUserDataSequence ( css::uno::Sequence < css::beans::PropertyValue >& rValues, bool ) { std::vector< std::pair< OUString, Any > > aUserData; @@ -546,7 +546,7 @@ static void createHelpLinesFromString( const OUString& rLines, SdrHelpLineList& } } -void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rSequence, bool ) +void FrameView::ReadUserDataSequence ( const css::uno::Sequence < css::beans::PropertyValue >& rSequence, bool ) { const sal_Int32 nLength = rSequence.getLength(); if (nLength) @@ -565,7 +565,7 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < : sal_Int32 aSnapGridWidthYNum = GetSnapGridWidthY().GetNumerator(); sal_Int32 aSnapGridWidthYDom = GetSnapGridWidthY().GetDenominator(); - const com::sun::star::beans::PropertyValue *pValue = rSequence.getConstArray(); + const css::beans::PropertyValue *pValue = rSequence.getConstArray(); for (sal_Int32 i = 0 ; i < nLength; i++, pValue++ ) { if ( pValue->Name == sUNO_View_ViewId ) diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index feedfac3d24a..88d743db6671 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -1821,14 +1821,14 @@ sal_uLong OutlineViewShell::Read(SvStream& rInput, const OUString& rBaseURL, sal return bRet; } -void OutlineViewShell::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rSequence, bool bBrowse ) +void OutlineViewShell::WriteUserDataSequence ( css::uno::Sequence < css::beans::PropertyValue >& rSequence, bool bBrowse ) { WriteFrameViewData(); ViewShell::WriteUserDataSequence( rSequence, bBrowse ); } -void OutlineViewShell::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rSequence, bool bBrowse ) +void OutlineViewShell::ReadUserDataSequence ( const css::uno::Sequence < css::beans::PropertyValue >& rSequence, bool bBrowse ) { WriteFrameViewData(); @@ -1848,8 +1848,7 @@ void OutlineViewShell::VisAreaChanged(const Rectangle& rRect) <type>AccessibleDrawDocumentView</type>. Otherwise return an empty reference. */ -::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> +css::uno::Reference<css::accessibility::XAccessible> OutlineViewShell::CreateAccessibleDocumentView (::sd::Window* pWindow) { OSL_ASSERT (GetViewShell()!=NULL); @@ -1862,14 +1861,13 @@ void OutlineViewShell::VisAreaChanged(const Rectangle& rRect) GetViewShell()->GetController(), pWindow->GetAccessibleParentWindow()->GetAccessible()); pDocumentView->Init(); - return ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> - (static_cast< ::com::sun::star::uno::XWeak*>(pDocumentView), - ::com::sun::star::uno::UNO_QUERY); + return css::uno::Reference<css::accessibility::XAccessible> + (static_cast< css::uno::XWeak*>(pDocumentView), + css::uno::UNO_QUERY); } OSL_TRACE ("OutlineViewShell::CreateAccessibleDocumentView: no controller"); - return ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >(); + return css::uno::Reference< css::accessibility::XAccessible >(); } void OutlineViewShell::GetState (SfxItemSet& rSet) diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index d5db95d33189..789e405c780f 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -425,7 +425,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewRedirector::createRedirectedP const ::std::vector< double > aDXArray{}; // create locale; this may need some more information in the future - const ::com::sun::star::lang::Locale aLocale; + const css::lang::Locale aLocale; // create primitive and add const drawinglayer::primitive2d::Primitive2DReference xRef( diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index d6c72e006d38..917e2ae2d336 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -94,12 +94,12 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent {} }; -::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > View::CreateClipboardDataObject( View*, vcl::Window& ) +css::uno::Reference< css::datatransfer::XTransferable > View::CreateClipboardDataObject( View*, vcl::Window& ) { // since SdTransferable::CopyToClipboard is called, this // dynamically created object ist destroyed automatically SdTransferable* pTransferable = new SdTransferable( &mrDoc, NULL, false ); - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > xRet( pTransferable ); + css::uno::Reference< css::datatransfer::XTransferable > xRet( pTransferable ); SD_MOD()->pTransferClip = pTransferable; @@ -157,10 +157,10 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent return xRet; } -::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > View::CreateDragDataObject( View* pWorkView, vcl::Window& rWindow, const Point& rDragPos ) +css::uno::Reference< css::datatransfer::XTransferable > View::CreateDragDataObject( View* pWorkView, vcl::Window& rWindow, const Point& rDragPos ) { SdTransferable* pTransferable = new SdTransferable( &mrDoc, pWorkView, false ); - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > xRet( pTransferable ); + css::uno::Reference< css::datatransfer::XTransferable > xRet( pTransferable ); SD_MOD()->pTransferDrag = pTransferable; @@ -206,10 +206,10 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent return xRet; } -::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > View::CreateSelectionDataObject( View* pWorkView, vcl::Window& rWindow ) +css::uno::Reference< css::datatransfer::XTransferable > View::CreateSelectionDataObject( View* pWorkView, vcl::Window& rWindow ) { SdTransferable* pTransferable = new SdTransferable( &mrDoc, pWorkView, true ); - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > xRet( pTransferable ); + css::uno::Reference< css::datatransfer::XTransferable > xRet( pTransferable ); TransferableObjectDescriptor aObjDesc; const Rectangle aMarkRect( GetAllMarkedRect() ); OUString aDisplayName; diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index ad0d304cb660..4e32d934ca00 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -674,7 +674,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper, Reference< XComponent > xComponent( xShell->GetModel(), UNO_QUERY ); xStm->Seek( 0 ); - com::sun::star::uno::Reference< com::sun::star::io::XInputStream > xInputStream( new utl::OInputStreamWrapper( *xStm ) ); + css::uno::Reference< css::io::XInputStream > xInputStream( new utl::OInputStreamWrapper( *xStm ) ); bReturn = SvxDrawingLayerImport( pModel, xInputStream, xComponent, "com.sun.star.comp.Impress.XMLOasisImporter" ); if( pModel->GetPageCount() == 0 ) diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx index 2f5330726a4d..fe98667f2d39 100644 --- a/sd/source/ui/view/sdwindow.cxx +++ b/sd/source/ui/view/sdwindow.cxx @@ -948,8 +948,7 @@ void Window::DropScroll(const Point& rMousePos) } } -::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> +css::uno::Reference<css::accessibility::XAccessible> Window::CreateAccessible() { // If current viewshell is PresentationViewShell, just return empty because the correct ShowWin will be created later. @@ -957,7 +956,7 @@ void Window::DropScroll(const Point& rMousePos) { return vcl::Window::CreateAccessible (); } - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc = GetAccessible(false); + css::uno::Reference< css::accessibility::XAccessible > xAcc = GetAccessible(false); if (xAcc.get()) { return xAcc; diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 4f92351f2638..f293c001881b 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -1360,14 +1360,12 @@ void ViewShell::ExecReq( SfxRequest& rReq ) /** This default implementation returns only an empty reference. See derived classes for more interesting examples. */ -::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> +css::uno::Reference<css::accessibility::XAccessible> ViewShell::CreateAccessibleDocumentView (::sd::Window* ) { OSL_FAIL("ViewShell::CreateAccessibleDocumentView should not be called!, perhaps Meyers, 3rd edition, Item 9:\n"); - return ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> (); + return css::uno::Reference<css::accessibility::XAccessible> (); } ::sd::WindowUpdater* ViewShell::GetWindowUpdater() const @@ -1542,7 +1540,7 @@ bool ViewShell::RelocateToParentWindow (vcl::Window* pParentWindow) return true; } -void ViewShell::SwitchViewFireFocus(::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc ) +void ViewShell::SwitchViewFireFocus(css::uno::Reference< css::accessibility::XAccessible > xAcc ) { if (xAcc.get()) { |