Author: pfg
Date: Fri Jan 18 02:43:25 2013
New Revision: 1435010
URL: http://svn.apache.org/viewvc?rev=1435010&view=rev
Log:
Add namespace extension: may reduce some warnings.
Modified:
openoffice/trunk/main/forms/source/component/Columns.cxx
openoffice/trunk/main/forms/source/component/Grid.cxx
openoffice/trunk/main/forms/source/component/findpos.cxx
openoffice/trunk/main/forms/source/component/findpos.hxx
Modified: openoffice/trunk/main/forms/source/component/Columns.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/forms/source/component/Columns.cxx?rev=1435010&r1=1435009&r2=1435010&view=diff
==============================================================================
--- openoffice/trunk/main/forms/source/component/Columns.cxx (original)
+++ openoffice/trunk/main/forms/source/component/Columns.cxx Fri Jan 18
02:43:25 2013
@@ -116,7 +116,7 @@ sal_Int32 getColumnTypeByModelName(const
: aModelName.copy(aCompatibleModelPrefix.getLength());
const StringSequence& rColumnTypes = getColumnTypes();
- nTypeId = ::detail::findPos(aColumnType, rColumnTypes);
+ nTypeId = ::forms_detail::findPos(aColumnType, rColumnTypes);
}
return nTypeId;
}
Modified: openoffice/trunk/main/forms/source/component/Grid.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/forms/source/component/Grid.cxx?rev=1435010&r1=1435009&r2=1435010&view=diff
==============================================================================
--- openoffice/trunk/main/forms/source/component/Grid.cxx (original)
+++ openoffice/trunk/main/forms/source/component/Grid.cxx Fri Jan 18 02:43:25
2013
@@ -374,7 +374,7 @@ void OGridControlModel::removeSelectionC
Reference<XPropertySet> SAL_CALL OGridControlModel::createColumn(const
::rtl::OUString& ColumnType) throw ( ::
com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException)
{
const Sequence< ::rtl::OUString >& rColumnTypes = frm::getColumnTypes();
- return createColumn( detail::findPos( ColumnType, rColumnTypes ) );
+ return createColumn( forms_detail::findPos( ColumnType, rColumnTypes )
);
}
//------------------------------------------------------------------------------
Modified: openoffice/trunk/main/forms/source/component/findpos.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/forms/source/component/findpos.cxx?rev=1435010&r1=1435009&r2=1435010&view=diff
==============================================================================
--- openoffice/trunk/main/forms/source/component/findpos.cxx (original)
+++ openoffice/trunk/main/forms/source/component/findpos.cxx Fri Jan 18
02:43:25 2013
@@ -35,7 +35,7 @@
#include <algorithm>
-namespace detail {
+namespace forms_detail {
sal_Int32 findPos(
const ::rtl::OUString& aStr,
Modified: openoffice/trunk/main/forms/source/component/findpos.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/forms/source/component/findpos.hxx?rev=1435010&r1=1435009&r2=1435010&view=diff
==============================================================================
--- openoffice/trunk/main/forms/source/component/findpos.hxx (original)
+++ openoffice/trunk/main/forms/source/component/findpos.hxx Fri Jan 18
02:43:25 2013
@@ -30,7 +30,7 @@
namespace rtl { class OUString; }
-namespace detail {
+namespace forms_detail {
sal_Int32 findPos(
const ::rtl::OUString& aStr,
