Kaydet (Commit) 1d241f44 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

loplugin:staticcall

Change-Id: Iacd3efa9e5d6103ad92e15884e8aa010d7b2ae93
üst c6eb2084
...@@ -657,7 +657,7 @@ void DrawXmlOptimizer::visit( PageElement& elem, const std::list< Element* >::co ...@@ -657,7 +657,7 @@ void DrawXmlOptimizer::visit( PageElement& elem, const std::list< Element* >::co
++ next_page_element; ++ next_page_element;
} }
Element* pCurEle = *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" ); OSL_ENSURE( !pText || pCurEle == pText || pCurEle == pLink, "paragraph child list in disorder" );
if( pText || pDraw ) if( pText || pDraw )
pCurPara->updateGeometryWith( pCurEle ); pCurPara->updateGeometryWith( pCurEle );
......
...@@ -634,7 +634,7 @@ void WriterXmlOptimizer::visit( PageElement& elem, const std::list< Element* >:: ...@@ -634,7 +634,7 @@ void WriterXmlOptimizer::visit( PageElement& elem, const std::list< Element* >::
++ next_page_element; ++ next_page_element;
} }
Element* pCurEle = *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" ); OSL_ENSURE( !pText || pCurEle == pText || pCurEle == pLink, "paragraph child list in disorder" );
if( pText || pDraw ) if( pText || pDraw )
pCurPara->updateGeometryWith( pCurEle ); pCurPara->updateGeometryWith( pCurEle );
......
...@@ -682,7 +682,7 @@ void PresenterScreen::ProcessLayout ( ...@@ -682,7 +682,7 @@ void PresenterScreen::ProcessLayout (
// Read the parent layout first, if one is referenced. // Read the parent layout first, if one is referenced.
OUString sParentLayout; OUString sParentLayout;
rConfiguration.GetConfigurationNode( PresenterConfigurationAccess::GetConfigurationNode(
xLayoutNode, xLayoutNode,
OUString("ParentLayout")) >>= sParentLayout; OUString("ParentLayout")) >>= sParentLayout;
if (!sParentLayout.isEmpty()) if (!sParentLayout.isEmpty())
...@@ -694,7 +694,7 @@ void PresenterScreen::ProcessLayout ( ...@@ -694,7 +694,7 @@ void PresenterScreen::ProcessLayout (
// Process the actual layout list. // Process the actual layout list.
Reference<container::XNameAccess> xList ( Reference<container::XNameAccess> xList (
rConfiguration.GetConfigurationNode( PresenterConfigurationAccess::GetConfigurationNode(
xLayoutNode, xLayoutNode,
OUString("Layout")), OUString("Layout")),
UNO_QUERY_THROW); UNO_QUERY_THROW);
......
...@@ -892,7 +892,7 @@ void PaneStyleContainer::ProcessPaneStyle( ...@@ -892,7 +892,7 @@ void PaneStyleContainer::ProcessPaneStyle(
} }
Reference<container::XHierarchicalNameAccess> xFontNode (rValues[2], UNO_QUERY); Reference<container::XHierarchicalNameAccess> xFontNode (rValues[2], UNO_QUERY);
pStyle->mpFont = rReadContext.ReadFont( pStyle->mpFont = ReadContext::ReadFont(
xFontNode, "", PresenterTheme::SharedFontDescriptor()); xFontNode, "", PresenterTheme::SharedFontDescriptor());
Reference<container::XNameAccess> xInnerBorderSizeNode (rValues[3], UNO_QUERY); Reference<container::XNameAccess> xInnerBorderSizeNode (rValues[3], UNO_QUERY);
...@@ -1023,7 +1023,7 @@ void ViewStyleContainer::ProcessViewStyle( ...@@ -1023,7 +1023,7 @@ void ViewStyleContainer::ProcessViewStyle(
Reference<container::XHierarchicalNameAccess> xFontNode ( Reference<container::XHierarchicalNameAccess> xFontNode (
PresenterConfigurationAccess::GetProperty(rxProperties, "Font"), UNO_QUERY); PresenterConfigurationAccess::GetProperty(rxProperties, "Font"), UNO_QUERY);
PresenterTheme::SharedFontDescriptor pFont ( PresenterTheme::SharedFontDescriptor pFont (
rReadContext.ReadFont(xFontNode, sPathToFont, PresenterTheme::SharedFontDescriptor())); ReadContext::ReadFont(xFontNode, sPathToFont, PresenterTheme::SharedFontDescriptor()));
if (pFont.get() != NULL) if (pFont.get() != NULL)
pStyle->mpFont = pFont; pStyle->mpFont = pFont;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment