diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-07-15 16:25:34 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-07-15 16:26:07 +0200 |
commit | 92474c05f858502414eabf20c932f72c7e9bda1b (patch) | |
tree | 029ec5bf418ca7a885d05466a5e4b70a30fa6bae | |
parent | 99f05d9947db2dd0676fafa66106d17e4d8eea6d (diff) |
sw: indentation fixes
Change-Id: I6cdc7cff7c45e58c9b684ff53a8dd84af7cf0c83
-rw-r--r-- | sfx2/source/view/classificationcontroller.cxx | 4 | ||||
-rw-r--r-- | sw/inc/ToxTabStopTokenHandler.hxx | 2 | ||||
-rw-r--r-- | sw/inc/fesh.hxx | 2 | ||||
-rw-r--r-- | sw/inc/swrect.hxx | 16 | ||||
-rw-r--r-- | sw/inc/unoframe.hxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8toolbar.cxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/docvw/PostItMgr.cxx | 30 |
7 files changed, 30 insertions, 30 deletions
diff --git a/sfx2/source/view/classificationcontroller.cxx b/sfx2/source/view/classificationcontroller.cxx index b905cd6499de..af9152310c08 100644 --- a/sfx2/source/view/classificationcontroller.cxx +++ b/sfx2/source/view/classificationcontroller.cxx @@ -233,9 +233,9 @@ void ClassificationCategoriesController::removeEntries() } } +// WB_NOLABEL means here that the control won't be replaced with a label +// when it wouldn't fit the available space. ClassificationControl::ClassificationControl(vcl::Window* pParent) - // WB_NOLABEL means here that the control won't be replaced with a label - // when it wouldn't fit the available space. : Window(pParent, WB_DIALOGCONTROL | WB_NOLABEL) { m_pLabels[SfxClassificationPolicyType::IntellectualProperty] = VclPtr<FixedText>::Create(this, WB_CENTER); diff --git a/sw/inc/ToxTabStopTokenHandler.hxx b/sw/inc/ToxTabStopTokenHandler.hxx index 60a2056e9428..184a60e0b242 100644 --- a/sw/inc/ToxTabStopTokenHandler.hxx +++ b/sw/inc/ToxTabStopTokenHandler.hxx @@ -56,7 +56,7 @@ public: enum TabStopReferencePolicy {TABSTOPS_RELATIVE_TO_INDENT, TABSTOPS_RELATIVE_TO_PAGE}; - /** + /** * @param indexOfSectionNode * The index of the section node. It is needed to determine whether a page description was given by a node * before the tox section. diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx index 543914ffe505..0e311d08a255 100644 --- a/sw/inc/fesh.hxx +++ b/sw/inc/fesh.hxx @@ -414,7 +414,7 @@ public: bool GotoPrevFly( GotoObjFlags eType = GotoObjFlags::FlyAny) { return GotoObj( false, eType); } - /// Iterate over flys - for Basic-collections. + /// Iterate over flys - for Basic-collections. size_t GetFlyCount( FlyCntType eType = FLYCNTTYPE_ALL, bool bIgnoreTextBoxes = false ) const; const SwFrameFormat* GetFlyNum(size_t nIdx, FlyCntType eType = FLYCNTTYPE_ALL, bool bIgnoreTextBoxes = false) const; diff --git a/sw/inc/swrect.hxx b/sw/inc/swrect.hxx index 99b6bfd4fd06..e2be41a10d6e 100644 --- a/sw/inc/swrect.hxx +++ b/sw/inc/swrect.hxx @@ -72,16 +72,16 @@ public: void Justify(); - SwRect &Union( const SwRect& rRect ); - SwRect &Intersection( const SwRect& rRect ); + SwRect &Union( const SwRect& rRect ); + SwRect &Intersection( const SwRect& rRect ); - // Same as Intersection, only assume that Rects are overlapping! - SwRect &Intersection_( const SwRect &rRect ); + // Same as Intersection, only assume that Rects are overlapping! + SwRect &Intersection_( const SwRect &rRect ); - bool IsInside( const Point& rPOINT ) const; - bool IsNear(const Point& rPoint, long nTolerance ) const; - bool IsInside( const SwRect& rRect ) const; - bool IsOver( const SwRect& rRect ) const; + bool IsInside( const Point& rPOINT ) const; + bool IsNear(const Point& rPoint, long nTolerance ) const; + bool IsInside( const SwRect& rRect ) const; + bool IsOver( const SwRect& rRect ) const; inline bool HasArea() const; inline bool IsEmpty() const; inline void Clear(); diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx index fe492a569e05..56df9dfee0e6 100644 --- a/sw/inc/unoframe.hxx +++ b/sw/inc/unoframe.hxx @@ -114,7 +114,7 @@ public: virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - //XShape + //XShape virtual css::awt::Point SAL_CALL getPosition( ) throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) throw(css::uno::RuntimeException, std::exception) override; virtual css::awt::Size SAL_CALL getSize( ) throw(css::uno::RuntimeException, std::exception) override; diff --git a/sw/source/filter/ww8/ww8toolbar.cxx b/sw/source/filter/ww8/ww8toolbar.cxx index 2377f21d0317..af32be2e83d0 100644 --- a/sw/source/filter/ww8/ww8toolbar.cxx +++ b/sw/source/filter/ww8/ww8toolbar.cxx @@ -53,9 +53,9 @@ MSOWordCommandConvertor::MSOWordCommandConvertor() msoToOOcmd[ 0x20b ] = ".uno:CloseDoc"; msoToOOcmd[ 0x50 ] = ".uno:Open"; - // mso tcid to ooo command string + // mso tcid to ooo command string // #FIXME and *HUNDREDS* of id's to added here - tcidToOOcmd[ 0x9d9 ] = ".uno:Print"; + tcidToOOcmd[ 0x9d9 ] = ".uno:Print"; } OUString MSOWordCommandConvertor::MSOCommandToOOCommand( sal_Int16 key ) diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx index 66a2de122539..ee5a8ba9ed9f 100644 --- a/sw/source/uibase/docvw/PostItMgr.cxx +++ b/sw/source/uibase/docvw/PostItMgr.cxx @@ -1790,21 +1790,21 @@ bool SwPostItMgr::ScrollbarHit(const unsigned long aPage,const Point &aPoint) void SwPostItMgr::CorrectPositions() { - if ( mbWaitingForCalcRects || mbLayouting || mvPostItFields.empty() ) - return; - - // find first valid note - SwSidebarWin *pFirstPostIt = nullptr; - for(SwSidebarItem_iterator i = mvPostItFields.begin(); i != mvPostItFields.end() ; ++i) - { - pFirstPostIt = (*i)->pPostIt; - if (pFirstPostIt) - break; - } - - //if we have not found a valid note, forget about it and leave - if (!pFirstPostIt) - return; + if ( mbWaitingForCalcRects || mbLayouting || mvPostItFields.empty() ) + return; + + // find first valid note + SwSidebarWin *pFirstPostIt = nullptr; + for(SwSidebarItem_iterator i = mvPostItFields.begin(); i != mvPostItFields.end() ; ++i) + { + pFirstPostIt = (*i)->pPostIt; + if (pFirstPostIt) + break; + } + + //if we have not found a valid note, forget about it and leave + if (!pFirstPostIt) + return; // yeah, I know, if this is a left page it could be wrong, but finding the page and the note is probably not even faster than just doing it // check, if anchor overlay object exists. |