This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push: new 8b7f65d Fixed typos, removed whitespace 8b7f65d is described below commit 8b7f65dd6db2479b7ae7529f8b484f6095fe9ada Author: mseidel <msei...@apache.org> AuthorDate: Sun Aug 15 20:32:14 2021 +0200 Fixed typos, removed whitespace --- main/chart2/source/tools/ReferenceSizeProvider.cxx | 18 ++-- main/connectivity/source/inc/adabas/BCatalog.hxx | 17 ++-- main/filter/source/flash/swfwriter.hxx | 24 ++--- main/framework/inc/classes/checkediterator.hxx | 22 ++--- main/framework/source/dispatch/closedispatcher.cxx | 36 ++++---- .../inc/resourcemodel/TableManager.hxx | 102 ++++++++++----------- 6 files changed, 110 insertions(+), 109 deletions(-) diff --git a/main/chart2/source/tools/ReferenceSizeProvider.cxx b/main/chart2/source/tools/ReferenceSizeProvider.cxx index b04914b..c0239c0 100644 --- a/main/chart2/source/tools/ReferenceSizeProvider.cxx +++ b/main/chart2/source/tools/ReferenceSizeProvider.cxx @@ -1,5 +1,5 @@ /************************************************************** - * + * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -7,16 +7,16 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * *************************************************************/ @@ -140,7 +140,7 @@ void ReferenceSizeProvider::setValuesAtAllDataSeries() ASSERT_EXCEPTION( ex ); } - //it is important to correct the datapoint properties first as they do reference the series properties + // it is important to correct the datapoint properties first as they do reference the series properties setValuesAtPropertySet( xSeriesProp ); } } @@ -154,7 +154,7 @@ void ReferenceSizeProvider::setValuesAtPropertySet( return; static const OUString aRefSizeName( RTL_CONSTASCII_USTRINGPARAM("ReferencePageSize")); - + try { awt::Size aRefSize( getPageSize() ); @@ -206,7 +206,7 @@ void ReferenceSizeProvider::getAutoResizeFromPropSet( } } - // curent state unknown => nothing changes. Otherwise if current state + // current state unknown => nothing changes. Otherwise if current state // differs from state so far, we have an ambiguity if( rInOutState == AUTO_RESIZE_UNKNOWN ) { @@ -232,11 +232,11 @@ void ReferenceSizeProvider::impl_getAutoResizeFromTitled( } /** Retrieves the state auto-resize from all objects that support this - feature. If all objects return the same state, AUTO_RESIZE_YES or + feature. If all objects return the same state, AUTO_RESIZE_YES or AUTO_RESIZE_NO is returned. If no object supporting the feature is found, AUTO_RESIZE_UNKNOWN is - returned. If there are multiple objects, some with state YES and some + returned. If there are multiple objects, some with state YES and some with state NO, AUTO_RESIZE_AMBIGUOUS is returned. */ ReferenceSizeProvider::AutoResizeState ReferenceSizeProvider::getAutoResizeState( diff --git a/main/connectivity/source/inc/adabas/BCatalog.hxx b/main/connectivity/source/inc/adabas/BCatalog.hxx index 7101d08..e2d657d 100644 --- a/main/connectivity/source/inc/adabas/BCatalog.hxx +++ b/main/connectivity/source/inc/adabas/BCatalog.hxx @@ -1,5 +1,5 @@ /************************************************************** - * + * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -7,19 +7,20 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * *************************************************************/ + #ifndef _CONNECTIVITY_ADABAS_CATALOG_HXX_ #define _CONNECTIVITY_ADABAS_CATALOG_HXX_ @@ -32,20 +33,20 @@ namespace connectivity namespace adabas { // please don't name the class the same name as in an other namespaces - // some compilers have problems with this task as I noticed on windows - class OAdabasConnection; + // some compilers have problems with this task as I noticed on Windows + class OAdabasConnection; class OAdabasCatalog : public connectivity::sdbcx::OCatalog { OAdabasConnection* m_pConnection; // used to get the metadata SQLHANDLE m_aConnectionHdl; // used for odbc specific stuff - void fillVector(const ::rtl::OUString& _sQuery,TStringVector& _rVector); + void fillVector(const ::rtl::OUString& _sQuery,TStringVector& _rVector); protected: /** builds the name which should be used to access the object later on in the collection. Will only be called in fillNames. @param _xRow - The cuurent row from a call of XDatabaseMetaData::getTables. + The current row from a call of XDatabaseMetaData::getTables. */ virtual ::rtl::OUString buildName( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow >& _xRow); public: diff --git a/main/filter/source/flash/swfwriter.hxx b/main/filter/source/flash/swfwriter.hxx index b5ba42e..03aa44b 100644 --- a/main/filter/source/flash/swfwriter.hxx +++ b/main/filter/source/flash/swfwriter.hxx @@ -1,5 +1,5 @@ /************************************************************** - * + * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -7,16 +7,16 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * *************************************************************/ @@ -63,7 +63,7 @@ inline sal_uInt16 _uInt16( sal_Int32 nValue ) { OSL_ENSURE( (nValue >= 0) && ((sal_uInt32)nValue <= 0xffff), "overflow while converting sal_Int32 to sal_uInt16" ); return (sal_uInt16)nValue; -} +} inline sal_Int16 _Int16( sal_Int32 nValue ) { @@ -307,7 +307,7 @@ public: /** defines a bitmap and returns its flash id. */ - sal_uInt16 defineBitmap( const BitmapEx& bmpSource, sal_Int32 nJPEGQualityLevel ); + sal_uInt16 defineBitmap( const BitmapEx& bmpSource, sal_Int32 nJPEGQualityLevel ); // control tags @@ -329,7 +329,7 @@ public: Only one sprite can be edited at one time */ sal_uInt16 startSprite(); - /** ends editing of the curent sprites and adds it to the movie stream */ + /** ends editing of the current sprites and adds it to the movie stream */ void endSprite(); /** inserts a doaction tag with an ActionStop */ @@ -343,9 +343,9 @@ public: void gotoFrame( sal_uInt16 nFrame ); #ifdef AUGUSTUS - /** stream out a sound. Should make it more intelligent so it interleaves with other items.*/ + /** stream out a sound. Should make it more intelligent so it interleaves with other items.*/ sal_Bool streamSound( const char * filename ); -#endif +#endif private: Point map( const Point& rPoint ) const; @@ -360,8 +360,8 @@ private: void Impl_writeBmp( sal_uInt16 nBitmapId, sal_uInt32 width, sal_uInt32 height, sal_uInt8 *pCompressed, sal_uInt32 compressed_size ); void Impl_writeImage( const BitmapEx& rBmpEx, const Point& rPt, const Size& rSz, const Point& rSrcPt, const Size& rSrcSz, const Rectangle& rClipRect, bool bMap ); void Impl_writeJPEG(sal_uInt16 nBitmapId, const sal_uInt8* pJpgData, sal_uInt32 nJpgDataLength, sal_uInt8 *pCompressed, sal_uInt32 compressed_size ); - void Impl_handleLineInfoPolyPolygons(const LineInfo& rInfo, const basegfx::B2DPolygon& rLinePolygon); - void Impl_writeActions( const GDIMetaFile& rMtf ); + void Impl_handleLineInfoPolyPolygons(const LineInfo& rInfo, const basegfx::B2DPolygon& rLinePolygon); + void Impl_writeActions( const GDIMetaFile& rMtf ); void Impl_writePolygon( const Polygon& rPoly, sal_Bool bFilled ); void Impl_writePolygon( const Polygon& rPoly, sal_Bool bFilled, const Color& rFillColor, const Color& rLineColor ); void Impl_writePolyPolygon( const PolyPolygon& rPolyPoly, sal_Bool bFilled, sal_uInt8 nTransparence = 0); @@ -378,7 +378,7 @@ private: FlashFont& Impl_getFont( const Font& rFont ); static void Impl_addPolygon( BitStream& rBits, const Polygon& rPoly, sal_Bool bFilled ); - + static void Impl_addShapeRecordChange( BitStream& rBits, sal_Int16 dx, sal_Int16 dy, sal_Bool bFilled ); static void Impl_addStraightEdgeRecord( BitStream& rBits, sal_Int16 dx, sal_Int16 dy ); static void Impl_addCurvedEdgeRecord( BitStream& rBits, sal_Int16 control_dx, sal_Int16 control_dy, sal_Int16 anchor_dx, sal_Int16 anchor_dy ); diff --git a/main/framework/inc/classes/checkediterator.hxx b/main/framework/inc/classes/checkediterator.hxx index 7d3d7fd..89a3b91 100644 --- a/main/framework/inc/classes/checkediterator.hxx +++ b/main/framework/inc/classes/checkediterator.hxx @@ -1,5 +1,5 @@ /************************************************************** - * + * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -7,16 +7,16 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * *************************************************************/ @@ -58,7 +58,7 @@ namespace framework{ //_________________________________________________________________________________________________________________ /*-************************************************************************************************************//** - @short implement a iterator which support 2 end states! + @short implement a iterator which support 2 end states! @descr For our search methods we need a "walking" iterator object with special functionality! We must check for 3 different states of an iterator - normal position, exact end, after end. It's necessary to detect if we have not found a entry and must return our default or @@ -215,7 +215,7 @@ class CheckedIterator inline CheckedIterator& operator++() { - // Warn programmer if he forget to initailize object! + // Warn programmer if he forget to initialize object! LOG_ASSERT2( m_pContainer==NULL, "CheckedIterator::operator++()", "Object not initialized!" ) // Step to next element if any exist or set our end states. switch( m_eEndState ) @@ -245,7 +245,7 @@ class CheckedIterator @seealso class FilterCache @param - - @return True if internalk state E_UNKNOWN - false otherwise. + @return True if internal state E_UNKNOWN - false otherwise. @onerror - *//*-*****************************************************************************************************/ @@ -309,11 +309,11 @@ class CheckedIterator inline typename TContainer::const_iterator getEntry() { // Warn programmer if he forget to initialize these object ... - LOG_ASSERT2( m_pContainer==NULL, "CheckedIterator::getEntry()", "Object not initialized!" ) + LOG_ASSERT2( m_pContainer==NULL, "CheckedIterator::getEntry()", "Object not initialized!" ) // or try to read a non existing element! - LOG_ASSERT2( m_eEndState!=E_BEFOREEND, "CheckedIterator::getEntry()", "Wrong using of class detected!" ) + LOG_ASSERT2( m_eEndState!=E_BEFOREEND, "CheckedIterator::getEntry()", "Wrong using of class detected!" ) - return m_pPosition; + return m_pPosition; } //------------------------------------------------------------------------------------------------------------- @@ -322,7 +322,7 @@ class CheckedIterator private: - // These enum defines our four states for an iterator position in curent container. + // These enum defines our four states for an iterator position in current container. enum EEndState { E_UNKNOWN , diff --git a/main/framework/source/dispatch/closedispatcher.cxx b/main/framework/source/dispatch/closedispatcher.cxx index 673e62f..bcfb041 100644 --- a/main/framework/source/dispatch/closedispatcher.cxx +++ b/main/framework/source/dispatch/closedispatcher.cxx @@ -1,5 +1,5 @@ /************************************************************** - * + * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -7,16 +7,16 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * *************************************************************/ @@ -129,7 +129,7 @@ css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL CloseDispatcher:: { if (nCommandGroup == css::frame::CommandGroup::VIEW) { - /* Attention: Dont add .uno:CloseFrame here. Because its not really + /* Attention: Don't add .uno:CloseFrame here. Because it's not really a configurable feature ... and further it does not have a valid UIName entry inside the GenericCommands.xcu ... */ css::uno::Sequence< css::frame::DispatchInformation > lViewInfos(1); @@ -218,9 +218,9 @@ void SAL_CALL CloseDispatcher::dispatchWithNotification(const css::util::URL& // But we can't execute synchronously :-) // May we are called from a generic key-input handler, // which isn't aware that this call kill its own environment ... - // Do it asynchronous everytimes! + // Do it asynchronous every time! - // But dont forget to hold usself alive. + // But don't forget to hold usself alive. // We are called back from an environment, which doesn't know an uno reference. // They call us back by using our c++ interface. @@ -258,7 +258,7 @@ void SAL_CALL CloseDispatcher::dispatchWithNotification(const css::util::URL& document inside the frame. May the document shows a dialog and the user ignore it. Then the state of the office can be changed during we try to close frame and document. - - check the environment (menas count open frames - exlcuding our + - check the environment (means count open frames - excluding our current one) - decide then, if we must close this frame only, establish the backing mode or shutdown the whole application. @@ -268,7 +268,7 @@ IMPL_LINK( CloseDispatcher, impl_asyncCallback, void*, EMPTYARG ) try { - // Allow calling of XController->suspend() everytimes. + // Allow calling of XController->suspend() every time. // Dispatch is an UI functionality. We implement such dispatch object here. // And further XController->suspend() was designed to bring an UI ... sal_Bool bAllowSuspend = sal_True; @@ -305,7 +305,7 @@ IMPL_LINK( CloseDispatcher, impl_asyncCallback, void*, EMPTYARG ) css::uno::Reference< css::frame::XFramesSupplier > xDesktop(xSMGR->createInstance(SERVICENAME_DESKTOP), css::uno::UNO_QUERY_THROW); FrameListAnalyzer aCheck1(xDesktop, xCloseFrame, FrameListAnalyzer::E_HELP | FrameListAnalyzer::E_BACKINGCOMPONENT); - // a) If the curent frame (where the close dispatch was requested for) does not have + // a) If the current frame (where the close dispatch was requested for) does not have // any parent frame ... it will close this frame only. Such frame isn't part of the // global desktop tree ... and such frames are used as "implementation details" only. // E.g. the live previews of our wizards doing such things. And then the owner of the frame @@ -361,7 +361,7 @@ IMPL_LINK( CloseDispatcher, impl_asyncCallback, void*, EMPTYARG ) else // c3) there is no other (visible) frame open ... - // The help module will be ignored everytimes! + // The help module will be ignored every time! // But we have to decide if we must terminate the // application or establish the backing mode now. // And that depends from the dispatched URL ... @@ -435,7 +435,7 @@ IMPL_LINK( CloseDispatcher, impl_asyncCallback, void*, EMPTYARG ) // This method was called asynchronous from our main thread by using a pointer. // We reached this method only, by using a reference to ourself :-) // Further this member is used to detect still running and not yet finished - // ansynchronous operations. So its time now to release this reference. + // asynchronous operations. So its time now to release this reference. // But hold it temp alive. Otherwise we die before we can finish this method really :-)) css::uno::Reference< css::uno::XInterface > xTempHold = m_xSelfHold; m_xSelfHold.clear(); @@ -464,14 +464,14 @@ sal_Bool CloseDispatcher::implts_prepareFrameForClosing(const css::uno::Referenc return sal_True; // Close all views to the same document ... if forced to do so. - // But dont touch our own frame here! + // But don't touch our own frame here! // We must do so ... because the may be following controller->suspend() // will show the "save/discard/cancel" dialog for the last view only! if (bCloseAllOtherViewsToo) { // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); - css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = m_xSMGR; + css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = m_xSMGR; aReadLock.unlock(); // <- SAFE ---------------------------------- @@ -492,7 +492,7 @@ sal_Bool CloseDispatcher::implts_prepareFrameForClosing(const css::uno::Referenc if (bAllowSuspend) { css::uno::Reference< css::frame::XController > xController = xFrame->getController(); - if (xController.is()) // some views dont uses a controller .-( (e.g. the help window) + if (xController.is()) // some views don't uses a controller .-( (e.g. the help window) { bControllerSuspended = xController->suspend(sal_True); if (! bControllerSuspended) @@ -500,7 +500,7 @@ sal_Bool CloseDispatcher::implts_prepareFrameForClosing(const css::uno::Referenc } } - // dont remove the component really by e.g. calling setComponent(null, null). + // don't remove the component really by e.g. calling setComponent(null, null). // It's enough to suspend the controller. // If we close the frame later this controller doesn't show the same dialog again. return sal_True; @@ -539,7 +539,7 @@ sal_Bool CloseDispatcher::implts_establishBackingMode() { // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); - css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = m_xSMGR; + css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = m_xSMGR; css::uno::Reference< css::frame::XFrame > xFrame (m_xCloseFrame.get(), css::uno::UNO_QUERY); aReadLock.unlock(); // <- SAFE ---------------------------------- @@ -611,7 +611,7 @@ css::uno::Reference< css::frame::XFrame > CloseDispatcher::static_impl_searchRig css::uno::Reference< css::frame::XFrame > xTarget = xFrame; while(sal_True) { - // a) top frames wil be closed + // a) top frames will be closed if (xTarget->isTop()) return xTarget; diff --git a/main/writerfilter/inc/resourcemodel/TableManager.hxx b/main/writerfilter/inc/resourcemodel/TableManager.hxx index 5289539..cf92f18 100644 --- a/main/writerfilter/inc/resourcemodel/TableManager.hxx +++ b/main/writerfilter/inc/resourcemodel/TableManager.hxx @@ -1,5 +1,5 @@ /************************************************************** - * + * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -7,16 +7,16 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * *************************************************************/ @@ -112,7 +112,7 @@ class TableManager { #ifdef DEBUG_TABLE TagLogger::Pointer_t mpTableLogger; -#endif +#endif class TableManagerState { @@ -120,37 +120,37 @@ class TableManager properties at the current point in document */ PropertiesPointer mpProps; - + /** properties of the current cell */ PropertiesPointer mpCellProps; - + /** properties of the current row */ PropertiesPointer mpRowProps; - + /** properties of the current table */ stack<PropertiesPointer> mTableProps; - + /** true if at the end of a row */ bool mbRowEnd; - + /** true when in a cell */ bool mbInCell; - + /** true when at the end of a cell */ - bool mbCellEnd; - + bool mbCellEnd; + public: /** Constructor @@ -159,17 +159,17 @@ class TableManager : mbRowEnd(false), mbInCell(false), mbCellEnd(false) { } - + virtual ~TableManagerState() { } - + void startLevel() { PropertiesPointer pProps; mTableProps.push(pProps); } - + void endLevel() { mTableProps.pop(); @@ -245,10 +245,10 @@ class TableManager PropertiesPointer getTableProps() { PropertiesPointer pResult; - + if (mTableProps.size() > 0) pResult = mTableProps.top(); - + return pResult; } @@ -452,18 +452,18 @@ private: Resolve the current table to the TableDataHandler. */ void resolveCurrentTable(); - + /** Open a cell at current level. */ - + void openCell(const T & handle, PropertiesPointer pProps); - + /** Close a cell at current level. */ void closeCell(const T & handle); - + /** Ensure a cell is open at the current level. */ @@ -533,7 +533,7 @@ public: virtual void endParagraphGroup(); /** - Handle an SPRM at curent handle. + Handle an SPRM at current handle. @param rSprm the SPRM */ @@ -542,7 +542,7 @@ public: /** Handle properties at current handle. - @param pProps the properites + @param pProps the properties */ virtual void props(PropertiesPointer pProps); @@ -604,7 +604,7 @@ public: */ virtual bool isIgnore() const; - + #ifdef DEBUG_TABLE void setTagLogger(TagLogger::Pointer_t _tagLogger) { @@ -701,17 +701,17 @@ void TableManager<T, PropertiesPointer>::startLevel() if (mpTableLogger.get() != NULL) { typename TableData<T, PropertiesPointer>::Pointer_t pTableData; - + if (mTableDataStack.size() > 0) pTableData = mTableDataStack.top(); - + mpTableLogger->startElement("tablemanager.startLevel"); mpTableLogger->attribute("level", mTableDataStack.size()); - + if (pTableData.get() != NULL) - mpTableLogger->attribute("openCell", + mpTableLogger->attribute("openCell", pTableData->isCellOpen() ? "yes" : "no"); - + mpTableLogger->endElement("tablemanager.startLevel"); } #endif @@ -731,12 +731,12 @@ void TableManager<T, PropertiesPointer>::endLevel() mState.endLevel(); mTableDataStack.pop(); - + #ifdef DEBUG_TABLE if (mpTableLogger.get() != NULL) { typename TableData<T, PropertiesPointer>::Pointer_t pTableData; - + if (mTableDataStack.size() > 0) pTableData = mTableDataStack.top(); @@ -744,9 +744,9 @@ void TableManager<T, PropertiesPointer>::endLevel() mpTableLogger->attribute("level", mTableDataStack.size()); if (pTableData.get() != NULL) - mpTableLogger->attribute("openCell", + mpTableLogger->attribute("openCell", pTableData->isCellOpen() ? "yes" : "no"); - + mpTableLogger->endElement("tablemanager.endLevel"); } #endif @@ -765,7 +765,7 @@ void TableManager<T, PropertiesPointer>::endParagraphGroup() sal_Int32 nTableDepthDifference = mnTableDepthNew - mnTableDepth; PropertiesPointer pEmptyProps; - + while (nTableDepthDifference > 0) { ensureOpenCell(pEmptyProps); @@ -894,7 +894,7 @@ void TableManager<T, PropertiesPointer>::cellProps(PropertiesPointer pProps) if (mpTableLogger.get() != NULL) mpTableLogger->startElement("tablemanager.cellProps"); #endif - + if(getCellProps().get()) getCellProps()->insert( pProps ); else @@ -1021,12 +1021,12 @@ void TableManager<T, PropertiesPointer>::endOfRowAction() template <typename T, typename PropertiesPointer> bool TableManager<T, PropertiesPointer>::isIgnore() const { - return isRowEnd(); + return isRowEnd(); } template <typename T, typename PropertiesPointer> -void TableManager<T, PropertiesPointer>::openCell -(const T & rHandle, PropertiesPointer pProps) +void TableManager<T, PropertiesPointer>::openCell +(const T & rHandle, PropertiesPointer pProps) { #ifdef DEBUG_TABLE mpTableLogger->startElement("tablemanager.openCell"); @@ -1038,32 +1038,32 @@ void TableManager<T, PropertiesPointer>::openCell { typename TableData<T, PropertiesPointer>::Pointer_t pTableData = mTableDataStack.top(); - + pTableData->addCell(rHandle, pProps); } } template <typename T, typename PropertiesPointer> -void TableManager<T, PropertiesPointer>::closeCell -(const T & rHandle) +void TableManager<T, PropertiesPointer>::closeCell +(const T & rHandle) { #ifdef DEBUG_TABLE mpTableLogger->startElement("tablemanager.closeCell"); mpTableLogger->chars(toString(rHandle)); mpTableLogger->endElement("tablemanager.closeCell"); #endif - + if (mTableDataStack.size() > 0) { - typename TableData<T, PropertiesPointer>::Pointer_t + typename TableData<T, PropertiesPointer>::Pointer_t pTableData = mTableDataStack.top(); - + pTableData->endCell(rHandle); } } template <typename T, typename PropertiesPointer> -void TableManager<T, PropertiesPointer>::ensureOpenCell(PropertiesPointer pProps) +void TableManager<T, PropertiesPointer>::ensureOpenCell(PropertiesPointer pProps) { #ifdef DEBUG_TABLE mpTableLogger->startElement("tablemanager.ensureOpenCell"); @@ -1071,22 +1071,22 @@ void TableManager<T, PropertiesPointer>::ensureOpenCell(PropertiesPointer pProp if (mTableDataStack.size() > 0) { - typename TableData<T, PropertiesPointer>::Pointer_t + typename TableData<T, PropertiesPointer>::Pointer_t pTableData = mTableDataStack.top(); - + if (pTableData.get() != NULL) { if (!pTableData->isCellOpen()) openCell(getHandle(), pProps); - else + else pTableData->insertCellProperties(pProps); } } #ifdef DEBUG_TABLE - mpTableLogger->endElement("tablemanager.ensureOpenCell"); + mpTableLogger->endElement("tablemanager.ensureOpenCell"); #endif } - + } #endif // INCLUDED_TABLE_MANAGER_HXX