From 421d0e3c4019a435acdf35632524833465d90b1a Mon Sep 17 00:00:00 2001 From: Vishv Brahmbhatt Date: Fri, 2 Aug 2013 14:27:02 +0530 Subject: Getting vector from "SdDrawDocument" Deleting some of the unused methods.Also there is some "filter-test/unit-test" error associated with "drawdoc.cxx" methods. But the functionality is working as desired.This one for the quick reference.I am trying to remove those errors in next commit. Change-Id: I2d5507e1945c5d33f72df3b3ec14dc12ee420c16 --- sd/inc/drawdoc.hxx | 4 +-- sd/source/core/drawdoc.cxx | 7 +---- sd/source/core/sdpage.cxx | 69 +++------------------------------------------- 3 files changed, 7 insertions(+), 73 deletions(-) diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx index 58736028422c..ed892040aac4 100644 --- a/sd/inc/drawdoc.hxx +++ b/sd/inc/drawdoc.hxx @@ -189,7 +189,7 @@ private: DECL_LINK(OnlineSpellEventHdl, EditStatus*); std::vector< OUString > maAnnotationAuthors; - std::vector> layoutinfo; + std::vector> malayoutinfo; bool mbUseEmbedFonts; @@ -265,7 +265,7 @@ public: void SetExitAfterPresenting( bool bExitAfterPresenting ); void SetLayoutVector(); - std::vector> GetLayoutVector(); + inline std::vector>& GetLayoutVector(){ return malayoutinfo; } /** Insert pages into this document diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index 9f56101a14c6..7c0525b78746 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -1068,12 +1068,7 @@ void SdDrawDocument::SetLayoutVector() for(int index=0; index layoutnode = layoutlist->item(index); //get i'th layout element - layoutinfo.push_back(layoutnode); + malayoutinfo.push_back(layoutnode); } } - -std::vector> GetLayoutVector() -{ - return layoutinfo; -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 2450e9bf08f0..c73f13993971 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -1190,53 +1190,6 @@ static const LayoutDescriptor& GetLayoutDescriptor( AutoLayout eLayout ) return aLayouts[ eLayout - AUTOLAYOUT__START ]; } -#define EXPAND_PROTOCOL "vnd.sun.star.expand:" -//to get the root element of the xml file -Reference getRootElement() -{ - const Reference xContext(comphelper_getProcessComponentContext()); - Reference< XMultiServiceFactory > xServiceFactory(xContext->getServiceManager(), UNO_QUERY_THROW ); - Reference< util::XMacroExpander > xMacroExpander =util::theMacroExpander::get(xContext); - Reference< XMultiServiceFactory > xConfigProvider =configuration::theDefaultProvider::get( xContext ); - - Any propValue = uno::makeAny( - beans::PropertyValue( - "nodepath", -1, - uno::makeAny( OUString( "/org.openoffice.Office.Impress/Misc" )), - beans::PropertyState_DIRECT_VALUE ) ); - - Reference xNameAccess( - xConfigProvider->createInstanceWithArguments( - "com.sun.star.configuration.ConfigurationAccess", - Sequence( &propValue, 1 ) ), UNO_QUERY_THROW ); - Sequence< rtl::OUString > aFiles; - xNameAccess->getByName( "LayoutListFiles" ) >>= aFiles; - rtl::OUString aURL; - for( sal_Int32 i=0; iexpandMacros( aMacro ); - } - } - if( aURL.startsWith( "file://" ) ) - { - rtl::OUString aSysPath; - if( osl_getSystemPathFromFileURL( aURL.pData, &aSysPath.pData ) == osl_File_E_None ) - aURL = aSysPath; - } - const Reference xDocBuilder(css::xml::dom::DocumentBuilder::create(comphelper::getComponentContext(xServiceFactory))); - const Reference xDoc = xDocBuilder->parseURI(aURL); - const Reference xRoot = xDoc->getDocumentElement(); - return xRoot;//this loops seems to work only once,so temporary returning the root element -} - rtl::OUString enumtoString(AutoLayout aut) { rtl::OUString retstr; @@ -1283,19 +1236,6 @@ rtl::OUString enumtoString(AutoLayout aut) return retstr; } -void parseXml() -{ - int layoutlistsize; - const Reference root= getRootElement();//get the root element of my xml file - const Reference layoutlist = root->getElementsByTagName("layout"); - layoutlistsize=layoutlist->getLength(); - for(int index=0; index layoutnode = layoutlist->item(index); //get i'th layout element - layoutinfo.push_back(layoutnode); - } -} - static void CalcAutoLayoutRectangles( SdPage& rPage, int nLayout, Rectangle* rRectangle ,const rtl::OUString& autolayout) { Rectangle aTitleRect; @@ -1304,6 +1244,7 @@ static void CalcAutoLayoutRectangles( SdPage& rPage, int nLayout, Rectangle* rRe rtl::OUString sLayoutAttName; rtl::OUString sPresObjKindAttName; double propvalue[4]; + std::vector> malayoutinfo; if( rPage.GetPageKind() != PK_HANDOUT ) { @@ -1335,8 +1276,6 @@ static void CalcAutoLayoutRectangles( SdPage& rPage, int nLayout, Rectangle* rRe for(i=0; i< PRESOBJPROP; i++) propvalue[i]=0; - const Reference root= getRootElement();//get the root element of my xml file - Point aTitlePos( aTitleRect.TopLeft() ); Size aLayoutSize( aLayoutRect.GetSize() ); Point aLayoutPos( aLayoutRect.TopLeft() ); @@ -1346,10 +1285,10 @@ static void CalcAutoLayoutRectangles( SdPage& rPage, int nLayout, Rectangle* rRe aTempPnt = aLayoutPos; sal_Bool bRightToLeft = ( rPage.GetModel() && static_cast< SdDrawDocument* >( rPage.GetModel() )->GetDefaultWritingMode() == ::com::sun::star::text::WritingMode_RL_TB ); - parseXml(); //calling this for temporary reference,have to use it somewhere else. - for(size_t y=0; y < layoutinfo.size(); y++) //loop through vector of Xnodes + malayoutinfo = static_cast< SdDrawDocument* >( rPage.GetModel() )->GetLayoutVector(); //getting vector from "SdDrawDocument" + for(size_t y=0; y < malayoutinfo.size(); y++) //loop through vector of Xnodes { - Reference layoutnode = layoutinfo[y]; //get i'th layout element + Reference layoutnode = malayoutinfo[y]; //get i'th layout element Reference layoutattrlist =layoutnode->getAttributes(); Reference layoutattr = layoutattrlist->getNamedItem("type"); sLayoutAttName=layoutattr->getNodeValue(); //get the attribute value of layout(i.e it's type) -- cgit