diff options
author | Michael Stahl <mstahl@redhat.com> | 2014-06-25 14:04:25 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2014-06-25 15:04:46 +0200 |
commit | 0de1e3a015dfcf7a09f021b4a4310a5a8cc28471 (patch) | |
tree | 82b3a9beef980521fe59283d6954ff76398c8bc8 | |
parent | 93011580b743078a0612ba4bfe0094804003a75b (diff) |
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
-rw-r--r-- | connectivity/source/parse/sqlbison.y | 2 | ||||
-rw-r--r-- | forms/source/misc/InterfaceContainer.cxx | 2 | ||||
-rw-r--r-- | include/connectivity/sqlnode.hxx | 4 | ||||
-rw-r--r-- | sfx2/source/control/dispatch.cxx | 2 | ||||
-rw-r--r-- | sw/inc/doc.hxx | 4 | ||||
-rw-r--r-- | sw/inc/viewsh.hxx | 2 | ||||
-rw-r--r-- | toolkit/source/helper/unowrapper.cxx | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y index 97e1ae97bcc6..6a61b50820b2 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 2cac0ffcc09b..e6f0bfd49b14 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 8b3f77265cf2..af0b606dce3e 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 e8be74f4834b..4f8bccae90dc 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 217eddcceccc..8816c6f11272 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 341346f3c739..04548d553554 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 60cc8d1658c3..efe55e5bbffc 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 ) { |