[Libreoffice-commits] core.git: 7 commits - connectivity/source forms/source include/connectivity include/svx include/xmloff sfx2/source svx/source sw/inc sw/source toolkit/source

Michael Stahl mstahl at redhat.com
Wed Jun 25 06:10:54 PDT 2014


 connectivity/source/parse/sqlbison.y     |    2 +-
 forms/source/misc/InterfaceContainer.cxx |    2 +-
 include/connectivity/sqlnode.hxx         |    4 ++--
 include/svx/gridctrl.hxx                 |    4 ++--
 include/xmloff/xmlexp.hxx                |    2 +-
 sfx2/source/control/dispatch.cxx         |    2 +-
 sfx2/source/doc/objmisc.cxx              |    1 -
 svx/source/form/fmshell.cxx              |    2 +-
 svx/source/form/navigatortree.cxx        |    2 +-
 svx/source/inc/fmexpl.hxx                |    6 +++---
 svx/source/inc/gridcell.hxx              |    2 +-
 svx/source/unodraw/unopage.cxx           |    2 +-
 sw/inc/doc.hxx                           |   14 +++++++-------
 sw/inc/swmodule.hxx                      |    4 ++--
 sw/inc/viewsh.hxx                        |    4 ++--
 sw/source/filter/html/swhtml.hxx         |   14 +++++++-------
 sw/source/filter/html/wrthtml.hxx        |    4 ++--
 sw/source/uibase/inc/cption.hxx          |    2 +-
 toolkit/source/helper/unowrapper.cxx     |    2 +-
 19 files changed, 37 insertions(+), 38 deletions(-)

New commits:
commit 17dc7f1153b20a2b7b757c78237ade22e0e9fad3
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Jun 25 14:54:33 2014 +0200

    remove spurious com::sun::star::util prefix
    
    Change-Id: I002a14fe0cb0cbdb4d5da51db8da6c8208cf604e

diff --git a/include/xmloff/xmlexp.hxx b/include/xmloff/xmlexp.hxx
index 0e5060d..62a68be 100644
--- a/include/xmloff/xmlexp.hxx
+++ b/include/xmloff/xmlexp.hxx
@@ -404,7 +404,7 @@ public:
         return mxExtHandler;
     }
 
-    // Get original ::com::sun::star::util::URL.
+    // Get original URL.
     const OUString& GetOrigFileName() const { return msOrigFileName; }
 
     // Get (const) namespace map.
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 2b0a58e..f296e98 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -910,7 +910,6 @@ OUString SfxObjectShell::GetTitle
     }
     else
     {
-        // ::com::sun::star::util::URL-Versions
         if ( nMaxLength >= SFX_TITLE_MAXLEN )
         {
             OUString aComplete( aURL.GetMainURL( INetURLObject::NO_DECODE ) );
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index b9ce38f..6948b7e 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -277,7 +277,7 @@ class SW_DLLPUBLIC SwDoc :
     Timer       maStatsUpdateTimer;      //< Timer for asynchronous stats calculation
     SwDBData    maDBData;                //< database descriptor
     ::com::sun::star::uno::Sequence <sal_Int8 > maRedlinePasswd;
-    OUString    msTOIAutoMarkURL;        //< ::com::sun::star::util::URL of table of index AutoMark file
+    OUString    msTOIAutoMarkURL;        //< URL of table of index AutoMark file
     boost::ptr_vector< boost::nullable<OUString> > maPatternNms;          // Array for names of document-templates
     com::sun::star::uno::Reference<com::sun::star::container::XNameContainer>
         mxXForms;                        //< container with XForms models
@@ -1638,7 +1638,7 @@ public:
 
     void SetCalcFieldValueHdl(Outliner* pOutliner);
 
-    // Query if ::com::sun::star::util::URL was visited.
+    // Query if URL was visited.
     // Query via Doc, if only a Bookmark has been given.
     // In this case the document name has to be set in front.
     bool IsVisitedURL( const OUString& rURL ) const;
commit ca18092a78b04ceccfae259cd89f1b361914760e
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Jun 25 14:36:15 2014 +0200

    remove spurious com::sun::star::text prefix
    
    Change-Id: I98d2fc7de3c2d3f95fb96192da83761ac1146172

diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx
index 0170cb2..8b73b5f 100644
--- a/include/svx/gridctrl.hxx
+++ b/include/svx/gridctrl.hxx
@@ -63,7 +63,7 @@ enum GridRowStatus
 
 class DbGridRow : public SvRefBase
 {
-    ::com::sun::star::uno::Any  m_aBookmark;        // ::com::sun::star::text::Bookmark of the row, can be set
+    ::com::sun::star::uno::Any  m_aBookmark;        // Bookmark of the row, can be set
     DbDataColumns               m_aVariants;
     GridRowStatus               m_eStatus;
     bool                        m_bIsNew;
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 2dc0415..b9ce38f 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1270,7 +1270,7 @@ public:
     bool SortText(const SwPaM&, const SwSortOptions&);
 
     // Correct the SwPosition-Objects that are registered with the document
-    // e. g. ::com::sun::star::text::Bookmarks or tables/indices.
+    // e. g. Bookmarks or tables/indices.
     // If bMoveCrsr is set move Crsr too.
 
     // Set everything in rOldNode on rNewPos + Offset.
@@ -1639,7 +1639,7 @@ public:
     void SetCalcFieldValueHdl(Outliner* pOutliner);
 
     // Query if ::com::sun::star::util::URL was visited.
-    // Query via Doc, if only a ::com::sun::star::text::Bookmark has been given.
+    // Query via Doc, if only a Bookmark has been given.
     // In this case the document name has to be set in front.
     bool IsVisitedURL( const OUString& rURL ) const;
 
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index 4c0c077..2f17b75 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -722,19 +722,19 @@ private:
     // <BODY>-Tag auswerten: Hintergrund-Grafiken und -Farben setzen (htmlgrin.cxx)
     void InsertBodyOptions();
 
-    // Einfuegen von Links und ::com::sun::star::text::Bookmarks (htmlgrin.cxx)
+    // Einfuegen von Links und Bookmarks (htmlgrin.cxx)
 
-    // <A>-Tag auswerten: einen Link bzw. eine ::com::sun::star::text::Bookmark einfuegen
+    // <A>-Tag auswerten: einen Link bzw. eine Bookmark einfuegen
     void NewAnchor();
     void EndAnchor();
 
-    // eine ::com::sun::star::text::Bookmark einfuegen
+    // eine Bookmark einfuegen
     void InsertBookmark( const OUString& rName );
 
     void InsertCommentText( const sal_Char *pTag = 0 );
     void InsertComment( const OUString& rName, const sal_Char *pTag = 0 );
 
-    // sind im aktuellen Absatz ::com::sun::star::text::Bookmarks vorhanden?
+    // sind im aktuellen Absatz Bookmarks vorhanden?
     bool HasCurrentParaBookmarks( bool bIgnoreStack=false ) const;
 
     // Einfuegen von Script/Basic-Elementen
diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx
index 64951ce..9953307 100644
--- a/sw/source/filter/html/wrthtml.hxx
+++ b/sw/source/filter/html/wrthtml.hxx
@@ -407,7 +407,7 @@ public:
 
     void Out_SwDoc( SwPaM* );       // schreibe den makierten Bereich
 
-    // gebe alle an in aktuellen Ansatz stehenden ::com::sun::star::text::Bookmarks aus
+    // gebe alle an in aktuellen Ansatz stehenden Bookmarks aus
     void OutAnchor( const OUString& rName );
     void OutBookmarks();
     void OutPointFieldmarks( const SwPosition& rPos );
commit c9d53bbe6efe7d2963a46fc5ac843f79672baf1f
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Jun 25 14:34:56 2014 +0200

    remove spurious com::sun::star::forms prefix
    
    Change-Id: I5c7c1d888cda7f01685bce46a6092a2c30b856f9

diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index 8521e01..4c0c077 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -766,7 +766,7 @@ private:
                             SvxCSS1PropertyInfo &rPropInfo,
                             const OUString *pLang=0, const OUString *pDir=0 );
 
-    // Inserting Controls and ::com::sun::star::form::Forms (htmlform.cxx)
+    // Inserting Controls and Forms (htmlform.cxx)
 
     // Insert draw object into document
     void InsertDrawObject( SdrObject* pNewDrawObj, const Size& rSpace,
diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx
index 70b6f4a..64951ce 100644
--- a/sw/source/filter/html/wrthtml.hxx
+++ b/sw/source/filter/html/wrthtml.hxx
@@ -295,7 +295,7 @@ public:
     std::set<OUString> aScriptTextStyles;// script dependent text styles
     std::vector<OUString> aOutlineMarks;
     std::vector<sal_uInt32> aOutlineMarkPoss;
-    HTMLControls aHTMLControls;     // die zu schreibenden ::com::sun::star::form::Forms
+    HTMLControls aHTMLControls;     // die zu schreibenden Forms
     SwHTMLFmtInfos aChrFmtInfos;
     SwHTMLFmtInfos aTxtCollInfos;
     INetFmts aINetFmts;             // die "offenen" INet-Attribute
commit 1ba95042121983d0bf865e3dd449f8362d119c7c
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Jun 25 14:31:32 2014 +0200

    remove spurious com::sun::star::frame prefix
    
    Change-Id: Ica1291e8d115ae7a7f1e99e569c9889e2b852f8a

diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index cd97cad..8521e01 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -136,7 +136,7 @@ public:
 struct _HTMLAttrTable
 {
     _HTMLAttr
-                *pKeep,         // ::com::sun::star::frame::Frame-Attribure
+                *pKeep,         // Frame-Attribute
                 *pBox,
                 *pBrush,
                 *pBreak,
@@ -440,7 +440,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
     bool bSetCrsr : 1;          // Crsr wieder auf den Anfang setzen
     bool bSetModEnabled : 1;
 
-    bool bInFloatingFrame : 1;  // Wir sind in einen Floating ::com::sun::star::frame::Frame
+    bool bInFloatingFrame : 1;  // Wir sind in einen Floating Frame
     bool bInField : 1;
     bool bKeepUnknown : 1;      // unbekannte/nicht unterstuetze Tokens beh.
     // 8
commit 4f1b0e0e32f21485ba1a5358214e206cd836e4e2
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Jun 25 14:30:16 2014 +0200

    remove spurious com::sun::star::script prefix
    
    Change-Id: I66fc14d1f26da0c91a455b0f63bde31210566c2c

diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index 04548d5..14b7982 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -441,7 +441,7 @@ public:
     inline SfxViewShell   *GetSfxViewShell() { return mpSfxViewShell; }
     inline void           SetSfxViewShell(SfxViewShell *pNew) { mpSfxViewShell = pNew; }
 
-    // Selection of  Draw ::com::sun::star::script::Engine has been changed.
+    // Selection of  Draw Engine has been changed.
     virtual void DrawSelChanged();
 
     SwPagePreviewLayout* PagePreviewLayout();
commit 426b940a9420f3ee48e546168d55cb39237ada0c
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Jun 25 14:19:44 2014 +0200

    remove spurious ::com::sun::star::sdbcx namespace prefix
    
    Change-Id: I37220af64c15259ab5bcf61b324d2a73ed8f5348

diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx
index 39a273b..0170cb2 100644
--- a/include/svx/gridctrl.hxx
+++ b/include/svx/gridctrl.hxx
@@ -404,7 +404,7 @@ public:
     bool HasHandle() const {return m_bHandle;}
     void InsertHandleColumn();
 
-    // which position does the column with the id in the ::com::sun::star::sdbcx::View have, the handle column doesn't count
+    // which position does the column with the id in the View have, the handle column doesn't count
     sal_uInt16 GetViewColumnPos( sal_uInt16 nId ) const { sal_uInt16 nPos = GetColumnPos(nId); return (nPos==BROWSER_INVALIDID) ? GRID_COLUMN_NOT_FOUND : nPos-1; }
 
     // which position does the column with the id in m_aColumns have, that means the ::com::sun::star::sdbcx::Container
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index 987e729..a87fae4 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -653,7 +653,7 @@ void FmFormShell::Execute(SfxRequest &rReq)
         }   break;
         case SID_FM_SHOW_FMEXPLORER:
         {
-            if (!m_pFormView)   // setzen der ::com::sun::star::sdbcx::View Forcieren
+            if (!m_pFormView)   // setzen der View Forcieren
                 GetViewShell()->GetViewFrame()->GetDispatcher()->Execute(SID_CREATE_SW_DRAWVIEW);
 
             GetViewShell()->GetViewFrame()->ChildWindowExecute(rReq);
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index 7f51429..516ffe5 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -64,7 +64,7 @@ namespace svxform
         // das ist die Basis, mit der beide Angaben multipliziert werden (in ms)
 
     #define EXPLORER_SYNC_DELAY                 200
-        // dieser Betrag an Millisekunden wird gewartet, ehe der Explorer nach einem Select oder Deselect die ::com::sun::star::sdbcx::View synchronisiert
+        // dieser Betrag an Millisekunden wird gewartet, ehe der Explorer nach einem Select oder Deselect die View synchronisiert
 
     using namespace ::com::sun::star::uno;
     using namespace ::com::sun::star::lang;
diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx
index a1d7c03..ce7887c 100644
--- a/svx/source/inc/fmexpl.hxx
+++ b/svx/source/inc/fmexpl.hxx
@@ -481,13 +481,13 @@ namespace svxform
         void SynchronizeSelection(FmEntryDataArray& arredToSelect);
             // nach dem Aufruf dieser Methode sind genau die Eintraege selektiert, die in dem Array bezeichnet sind
         void SynchronizeSelection();
-            // macht das selbe, nimmt die MarkList der ::com::sun::star::sdbcx::View
+            // macht das selbe, nimmt die MarkList der View
         void SynchronizeMarkList();
-            // umgekehrte Richtung von SynchronizeMarkList : markiert in der ::com::sun::star::sdbcx::View alle der aktuellen Selektion entsprechenden Controls
+            // umgekehrte Richtung von SynchronizeMarkList : markiert in der View alle der aktuellen Selektion entsprechenden Controls
 
         void CollectObjects(FmFormData* pFormData, bool bDeep, ::std::set< ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > >& _rObjects);
 
-        // im Select aktualisiere ich normalerweise die Marklist der zugehoerigen ::com::sun::star::sdbcx::View, mit folgenden Funktionen
+        // im Select aktualisiere ich normalerweise die Marklist der zugehoerigen View, mit folgenden Funktionen
         // kann ich das Locking dieses Verhaltens steuern
         void LockSelectionHandling() { ++m_nSelectLock; }
         void UnlockSelectionHandling() { --m_nSelectLock; }
diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx
index 6275c3f..908cb1c 100644
--- a/svx/source/inc/gridcell.hxx
+++ b/svx/source/inc/gridcell.hxx
@@ -143,7 +143,7 @@ public:
 
     ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >  GetCurrentFieldValue() const;
 
-    //      Zeichnen eines Feldes an einer Position, ist ein ::com::sun::star::sdbcx::View gesetzt
+    //      Zeichnen eines Feldes an einer Position, ist ein View gesetzt
     //      uebernimmt dieser das Zeichnen, z.B. fuer CheckBoxen
     void    Paint(OutputDevice& rDev,
                   const Rectangle& rRect,
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index 3dde9ef..f8d91c277 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -75,7 +75,7 @@ SvxDrawPage::SvxDrawPage( SdrPage* pInPage ) throw()
         StartListening( *mpModel );
 
 
-    // Erzeugen der (hidden) ::com::sun::star::sdbcx::View
+    // Erzeugen der (hidden) View
     mpView = new SdrView( mpModel );
     if( mpView )
         mpView->SetDesignMode(true);
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 8816c6f..2dc0415 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -421,7 +421,7 @@ private:
     bool mbInCallModified        : 1;    //< TRUE: in Set/Reset-Modified link.
     bool mbIsAutoFmtRedline      : 1;    //< TRUE: Redlines are recorded by Autoformat.
     bool mbOLEPrtNotifyPending   : 1;    /**< TRUE: Printer has changed. At creation of
-                                                ::com::sun::star::sdbcx::View
+                                                View
                                                 notification of OLE-Objects PrtOLENotify() is required. */
     bool mbAllOLENotify          : 1;    //< True: Notification of all objects is required.
     bool mbIsRedlineMove         : 1;    //< True: Redlines are moved into to / out of the section.
diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx
index 6b159b9..7f61e42 100644
--- a/sw/inc/swmodule.hxx
+++ b/sw/inc/swmodule.hxx
@@ -57,7 +57,7 @@ struct SwDBData;
 #define VIEWOPT_DEST_VIEW       0
 #define VIEWOPT_DEST_TEXT       1
 #define VIEWOPT_DEST_WEB        2
-#define VIEWOPT_DEST_VIEW_ONLY  3 //ViewOptions are set only at ::com::sun::star::sdbcx::View, not at the appl.
+#define VIEWOPT_DEST_VIEW_ONLY  3 //ViewOptions are set only at View, not at the appl.
 
 namespace com{ namespace sun{ namespace star{ namespace scanner{
     class XScannerManager2;
@@ -260,7 +260,7 @@ inline void SwModule::SetLngSvcEvtListener(
     xLngSvcEvtListener = xLstnr;
 }
 
-//    Access to SwModule, the ::com::sun::star::sdbcx::View and the shell.
+//    Access to SwModule, the View and the shell.
 
 #define SW_MOD() ( *(SwModule**) GetAppData(SHL_WRITER))
 
diff --git a/sw/source/uibase/inc/cption.hxx b/sw/source/uibase/inc/cption.hxx
index 0c1787f..0cceb15 100644
--- a/sw/source/uibase/inc/cption.hxx
+++ b/sw/source/uibase/inc/cption.hxx
@@ -78,7 +78,7 @@ class SwCaptionDialog : public SvxStandardDialog
 
     OUString     m_sNone;
 
-    SwView       &rView; // search per active, avoid ::com::sun::star::sdbcx::View
+    SwView       &rView; // search per active, avoid View
     SwFldMgr     *pMgr;      // pointer to save the include
     SelectionType eType;
 
commit 0de1e3a015dfcf7a09f021b4a4310a5a8cc28471
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Jun 25 14:04:25 2014 +0200

    remove spurious com::sun::star::chaos
    
    Apparently some time before inital CVS import a global
    search-and-replace went horribly wrong and added spurious namespace
    prefixes everywhere.
    
    Change-Id: I4009bc3ab4b1d4c80412f75ad0e4628a382f99f0

diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y
index 97e1ae9..6a61b50 100644
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -4753,7 +4753,7 @@ sal_Int16 OSQLParser::buildComparsionRule(OSQLParseNode*& pAppend,OSQLParseNode*
 
 void OSQLParser::reduceLiteral(OSQLParseNode*& pLiteral, bool bAppendBlank)
 {
-	OSL_ENSURE(pLiteral->isRule(), "This is no ::com::sun::star::chaos::Rule");
+	OSL_ENSURE(pLiteral->isRule(), "This is no Rule");
 	OSL_ENSURE(pLiteral->count() == 2, "OSQLParser::ReduceLiteral() Invalid count");
 	OSQLParseNode* pTemp = pLiteral;
 	OUStringBuffer aValue(pLiteral->getChild(0)->getTokenValue());
diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx
index 2cac0ff..e6f0bfd 100644
--- a/forms/source/misc/InterfaceContainer.cxx
+++ b/forms/source/misc/InterfaceContainer.cxx
@@ -488,7 +488,7 @@ void SAL_CALL OInterfaceContainer::write( const Reference< XObjectOutputStream >
                 _rxOutStream->writeObject(xObj);
             else
             {
-                // ::com::sun::star::chaos::Error
+                // Error
             }
         }
 
diff --git a/include/connectivity/sqlnode.hxx b/include/connectivity/sqlnode.hxx
index 8b3f772..af0b606 100644
--- a/include/connectivity/sqlnode.hxx
+++ b/include/connectivity/sqlnode.hxx
@@ -120,9 +120,9 @@ namespace connectivity
                                                         // or OUString in case of
                                                         // OUString, INT, etc.
         SQLNodeType                     m_eNodeType;    // see above
-        sal_uInt32                      m_nNodeID;      // ::com::sun::star::chaos::Rule ID (if IsRule())
+        sal_uInt32                      m_nNodeID;      // Rule ID (if IsRule())
                                                         // or Token ID (if !IsRule())
-                                            // ::com::sun::star::chaos::Rule IDs and Token IDs can't
+                                            // Rule IDs and Token IDs can't
                                             // be distinguished by their values,
                                             // IsRule has to be used for that!
     public:
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index e8be74f..4f8bcca 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -496,7 +496,7 @@ void SfxDispatcher::Pop
     }
     else
     {
-        // Remember ::com::sun::star::chaos::Action
+        // Remember Action
         pImp->aToDoStack.push_front( SfxToDo_Impl(bPush, bDelete, bUntil, rShell) );
         if (pImp->bFlushed)
         {
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 217eddc..8816c6f 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -877,7 +877,7 @@ public:
 
     // From now on this interface has to be used for Flys.
     // pAnchorPos must be set, if they are not attached to pages AND
-    // ::com::sun::star::chaos::Anchor is not already set at valid CntntPos
+    // Anchor is not already set at valid CntntPos
     // in FlySet/FrmFmt.
     /* new parameter bCalledFromShell
 
@@ -1359,7 +1359,7 @@ public:
     sal_uInt16 FindNumRule( const OUString& rName ) const;
     SwNumRule* FindNumRulePtr( const OUString& rName ) const;
 
-    // Deletion only possible if ::com::sun::star::chaos::Rule is not used!
+    // Deletion only possible if Rule is not used!
     bool RenameNumRule(const OUString & aOldName, const OUString & aNewName,
                            bool bBroadcast = false);
     bool DelNumRule( const OUString& rName, bool bBroadCast = false );
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index 341346f..04548d5 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -189,7 +189,7 @@ protected:
     SwRect                  maVisArea;       ///< The modern version of VisArea.
     SwDoc                   *mpDoc;          ///< The document; never 0.
 
-    sal_uInt16 mnStartAction; ///< != 0 if at least one ::com::sun::star::chaos::Action is active.
+    sal_uInt16 mnStartAction; ///< != 0 if at least one Action is active.
     sal_uInt16 mnLockPaint;   ///< != 0 if Paint is locked.
     bool      mbSelectAll; ///< Special select all mode: whole document selected, even if doc starts with table.
 
diff --git a/toolkit/source/helper/unowrapper.cxx b/toolkit/source/helper/unowrapper.cxx
index 60cc8d1..efe55e5 100644
--- a/toolkit/source/helper/unowrapper.cxx
+++ b/toolkit/source/helper/unowrapper.cxx
@@ -234,7 +234,7 @@ void UnoWrapper::WindowDestroyed( Window* pWindow )
         pChild = pNextChild;
     }
 
-    // ::com::sun::star::chaos::System-Windows suchen...
+    // System-Windows suchen...
     Window* pOverlap = pWindow->GetWindow( WINDOW_OVERLAP );
     if ( pOverlap )
     {


More information about the Libreoffice-commits mailing list