diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-06-13 17:51:25 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-06-13 17:54:31 +0200 |
commit | 1d241f445a381c190c4b8c195964b96ce6bc4704 (patch) | |
tree | a98adc39dc47f88a8ebd708ecd9c15a583c999c2 /sdext | |
parent | c6eb208473109234886600ac299f0cc75ee94e9c (diff) |
loplugin:staticcall
Change-Id: Iacd3efa9e5d6103ad92e15884e8aa010d7b2ae93
Diffstat (limited to 'sdext')
-rw-r--r-- | sdext/source/pdfimport/tree/drawtreevisiting.cxx | 2 | ||||
-rw-r--r-- | sdext/source/pdfimport/tree/writertreevisiting.cxx | 2 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterScreen.cxx | 4 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterTheme.cxx | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.cxx b/sdext/source/pdfimport/tree/drawtreevisiting.cxx index 008711d6eaa9..80c3e0f543e5 100644 --- a/sdext/source/pdfimport/tree/drawtreevisiting.cxx +++ b/sdext/source/pdfimport/tree/drawtreevisiting.cxx @@ -657,7 +657,7 @@ void DrawXmlOptimizer::visit( PageElement& elem, const std::list< Element* >::co ++ next_page_element; } Element* pCurEle = *page_element; - pCurEle->setParent( page_element, pCurPara ); + Element::setParent( page_element, pCurPara ); OSL_ENSURE( !pText || pCurEle == pText || pCurEle == pLink, "paragraph child list in disorder" ); if( pText || pDraw ) pCurPara->updateGeometryWith( pCurEle ); diff --git a/sdext/source/pdfimport/tree/writertreevisiting.cxx b/sdext/source/pdfimport/tree/writertreevisiting.cxx index 76373cd58972..47120c719442 100644 --- a/sdext/source/pdfimport/tree/writertreevisiting.cxx +++ b/sdext/source/pdfimport/tree/writertreevisiting.cxx @@ -634,7 +634,7 @@ void WriterXmlOptimizer::visit( PageElement& elem, const std::list< Element* >:: ++ next_page_element; } Element* pCurEle = *page_element; - pCurEle->setParent( page_element, pCurPara ); + Element::setParent( page_element, pCurPara ); OSL_ENSURE( !pText || pCurEle == pText || pCurEle == pLink, "paragraph child list in disorder" ); if( pText || pDraw ) pCurPara->updateGeometryWith( pCurEle ); diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx index 899305926fde..37142c712e3d 100644 --- a/sdext/source/presenter/PresenterScreen.cxx +++ b/sdext/source/presenter/PresenterScreen.cxx @@ -682,7 +682,7 @@ void PresenterScreen::ProcessLayout ( // Read the parent layout first, if one is referenced. OUString sParentLayout; - rConfiguration.GetConfigurationNode( + PresenterConfigurationAccess::GetConfigurationNode( xLayoutNode, OUString("ParentLayout")) >>= sParentLayout; if (!sParentLayout.isEmpty()) @@ -694,7 +694,7 @@ void PresenterScreen::ProcessLayout ( // Process the actual layout list. Reference<container::XNameAccess> xList ( - rConfiguration.GetConfigurationNode( + PresenterConfigurationAccess::GetConfigurationNode( xLayoutNode, OUString("Layout")), UNO_QUERY_THROW); diff --git a/sdext/source/presenter/PresenterTheme.cxx b/sdext/source/presenter/PresenterTheme.cxx index 2116d491b359..a60209b08d50 100644 --- a/sdext/source/presenter/PresenterTheme.cxx +++ b/sdext/source/presenter/PresenterTheme.cxx @@ -892,7 +892,7 @@ void PaneStyleContainer::ProcessPaneStyle( } Reference<container::XHierarchicalNameAccess> xFontNode (rValues[2], UNO_QUERY); - pStyle->mpFont = rReadContext.ReadFont( + pStyle->mpFont = ReadContext::ReadFont( xFontNode, "", PresenterTheme::SharedFontDescriptor()); Reference<container::XNameAccess> xInnerBorderSizeNode (rValues[3], UNO_QUERY); @@ -1023,7 +1023,7 @@ void ViewStyleContainer::ProcessViewStyle( Reference<container::XHierarchicalNameAccess> xFontNode ( PresenterConfigurationAccess::GetProperty(rxProperties, "Font"), UNO_QUERY); PresenterTheme::SharedFontDescriptor pFont ( - rReadContext.ReadFont(xFontNode, sPathToFont, PresenterTheme::SharedFontDescriptor())); + ReadContext::ReadFont(xFontNode, sPathToFont, PresenterTheme::SharedFontDescriptor())); if (pFont.get() != NULL) pStyle->mpFont = pFont; |