oox/source/drawingml/table/tablebackgroundstylecontext.cxx | 1 - oox/source/drawingml/table/tablecell.cxx | 11 +++++------ oox/source/drawingml/table/tablecellcontext.cxx | 1 - oox/source/drawingml/table/tablecontext.cxx | 1 - oox/source/drawingml/table/tablepartstylecontext.cxx | 1 - oox/source/drawingml/table/tableproperties.cxx | 9 ++++----- oox/source/drawingml/table/tablerow.cxx | 1 - oox/source/drawingml/table/tablerowcontext.cxx | 1 - oox/source/drawingml/table/tablestylecellstylecontext.cxx | 1 - oox/source/drawingml/table/tablestylecontext.cxx | 1 - oox/source/drawingml/table/tablestylelistfragmenthandler.cxx | 3 --- oox/source/drawingml/table/tablestylepart.cxx | 1 - oox/source/drawingml/table/tablestyletextstylecontext.cxx | 1 - 13 files changed, 9 insertions(+), 24 deletions(-)
New commits: commit 74e858693e4c8e5b87730033706656a220f71cfc Author: José Guilherme Vanz <[email protected]> Date: Thu Dec 6 22:19:41 2012 -0200 ::rtl:: prefixes removal This commit removes some ::rtl:: prefixes on oox Change-Id: Iae9a89f8a869934b6273a1b97c0a9243b0504fb3 Signed-off-by: José Guilherme Vanz <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/1260 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/oox/source/drawingml/table/tablebackgroundstylecontext.cxx b/oox/source/drawingml/table/tablebackgroundstylecontext.cxx index e6e6307..52511ab 100644 --- a/oox/source/drawingml/table/tablebackgroundstylecontext.cxx +++ b/oox/source/drawingml/table/tablebackgroundstylecontext.cxx @@ -27,7 +27,6 @@ using namespace ::oox::core; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -using ::rtl::OUString; namespace oox { namespace drawingml { namespace table { diff --git a/oox/source/drawingml/table/tablecell.cxx b/oox/source/drawingml/table/tablecell.cxx index c89a4f9..7394acb 100644 --- a/oox/source/drawingml/table/tablecell.cxx +++ b/oox/source/drawingml/table/tablecell.cxx @@ -33,7 +33,6 @@ #include <com/sun/star/drawing/TextHorizontalAdjust.hpp> #include <com/sun/star/text/XText.hpp> -using rtl::OUString; using namespace ::oox::core; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -124,11 +123,11 @@ void applyTableStylePart( oox::drawingml::FillProperties& rFillProperties, void applyTableCellProperties( const Reference < ::com::sun::star::table::XCell >& rxCell, const TableCell& rTableCell ) { - static const rtl::OUString sTopBorder( RTL_CONSTASCII_USTRINGPARAM( "TextUpperDistance" ) ); - static const rtl::OUString sBottomBorder( RTL_CONSTASCII_USTRINGPARAM( "TextLowerDistance" ) ); - static const rtl::OUString sLeftBorder( RTL_CONSTASCII_USTRINGPARAM( "TextLeftDistance" ) ); - static const rtl::OUString sRightBorder( RTL_CONSTASCII_USTRINGPARAM( "TextRightDistance" ) ); - static const rtl::OUString sVerticalAdjust( RTL_CONSTASCII_USTRINGPARAM( "TextVerticalAdjust" ) ); + static const OUString sTopBorder( RTL_CONSTASCII_USTRINGPARAM( "TextUpperDistance" ) ); + static const OUString sBottomBorder( RTL_CONSTASCII_USTRINGPARAM( "TextLowerDistance" ) ); + static const OUString sLeftBorder( RTL_CONSTASCII_USTRINGPARAM( "TextLeftDistance" ) ); + static const OUString sRightBorder( RTL_CONSTASCII_USTRINGPARAM( "TextRightDistance" ) ); + static const OUString sVerticalAdjust( RTL_CONSTASCII_USTRINGPARAM( "TextVerticalAdjust" ) ); Reference< XPropertySet > xPropSet( rxCell, UNO_QUERY_THROW ); xPropSet->setPropertyValue( sTopBorder, Any( static_cast< sal_Int32 >( rTableCell.getTopMargin() / 360 ) ) ); diff --git a/oox/source/drawingml/table/tablecellcontext.cxx b/oox/source/drawingml/table/tablecellcontext.cxx index 0e972e3..0c9e9bb 100644 --- a/oox/source/drawingml/table/tablecellcontext.cxx +++ b/oox/source/drawingml/table/tablecellcontext.cxx @@ -27,7 +27,6 @@ using namespace ::oox::core; using namespace ::com::sun::star; -using ::rtl::OUString; namespace oox { namespace drawingml { namespace table { diff --git a/oox/source/drawingml/table/tablecontext.cxx b/oox/source/drawingml/table/tablecontext.cxx index 44a5b2f..15f9776 100644 --- a/oox/source/drawingml/table/tablecontext.cxx +++ b/oox/source/drawingml/table/tablecontext.cxx @@ -27,7 +27,6 @@ using namespace ::oox::core; using namespace ::com::sun::star; -using ::rtl::OUString; namespace oox { namespace drawingml { namespace table { diff --git a/oox/source/drawingml/table/tablepartstylecontext.cxx b/oox/source/drawingml/table/tablepartstylecontext.cxx index 6ba830e..9386fa1 100644 --- a/oox/source/drawingml/table/tablepartstylecontext.cxx +++ b/oox/source/drawingml/table/tablepartstylecontext.cxx @@ -27,7 +27,6 @@ using namespace ::oox::core; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -using ::rtl::OUString; namespace oox { namespace drawingml { namespace table { diff --git a/oox/source/drawingml/table/tableproperties.cxx b/oox/source/drawingml/table/tableproperties.cxx index e76108b..d480cc6 100644 --- a/oox/source/drawingml/table/tableproperties.cxx +++ b/oox/source/drawingml/table/tableproperties.cxx @@ -29,7 +29,6 @@ #include "oox/core/xmlfilterbase.hxx" #include "oox/helper/propertyset.hxx" -using rtl::OUString; using namespace ::oox::core; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -61,7 +60,7 @@ void CreateTableRows( uno::Reference< XTableRows > xTableRows, const std::vector uno::Reference< container::XIndexAccess > xIndexAccess( xTableRows, UNO_QUERY_THROW ); for ( sal_Int32 n = 0; n < xIndexAccess->getCount(); n++ ) { - static const rtl::OUString sHeight( RTL_CONSTASCII_USTRINGPARAM ( "Height" ) ); + static const OUString sHeight("Height"); Reference< XPropertySet > xPropSet( xIndexAccess->getByIndex( n ), UNO_QUERY_THROW ); xPropSet->setPropertyValue( sHeight, Any( static_cast< sal_Int32 >( aTableRowIter->getHeight() / 360 ) ) ); ++aTableRowIter; @@ -76,7 +75,7 @@ void CreateTableColumns( Reference< XTableColumns > xTableColumns, const std::ve uno::Reference< container::XIndexAccess > xIndexAccess( xTableColumns, UNO_QUERY_THROW ); for ( sal_Int32 n = 0; n < xIndexAccess->getCount(); n++ ) { - static const rtl::OUString sWidth( RTL_CONSTASCII_USTRINGPARAM ( "Width" ) ); + static const OUString sWidth("Width"); Reference< XPropertySet > xPropSet( xIndexAccess->getByIndex( n ), UNO_QUERY_THROW ); xPropSet->setPropertyValue( sWidth, Any( static_cast< sal_Int32 >( *aTableGridIter++ / 360 ) ) ); } @@ -110,7 +109,7 @@ const TableStyle& TableProperties::getUsedTableStyle( const ::oox::core::XmlFilt else if ( rBase.getTableStyles() ) { const std::vector< TableStyle >& rTableStyles( rBase.getTableStyles()->getTableStyles() ); - const rtl::OUString aStyleId( getStyleId().isEmpty() ? rBase.getTableStyles()->getDefaultStyleId() : getStyleId() ); + const OUString aStyleId( getStyleId().isEmpty() ? rBase.getTableStyles()->getDefaultStyleId() : getStyleId() ); std::vector< TableStyle >::const_iterator aIter( rTableStyles.begin() ); while( aIter != rTableStyles.end() ) { @@ -133,7 +132,7 @@ void TableProperties::pushToPropSet( const ::oox::core::XmlFilterBase& rFilterBa const Reference < XPropertySet >& xPropSet, TextListStylePtr pMasterTextListStyle ) { uno::Reference< XColumnRowRange > xColumnRowRange( - xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Model") ) ), uno::UNO_QUERY_THROW ); + xPropSet->getPropertyValue("Model"), uno::UNO_QUERY_THROW ); CreateTableColumns( xColumnRowRange->getColumns(), mvTableGrid ); CreateTableRows( xColumnRowRange->getRows(), mvTableRows ); diff --git a/oox/source/drawingml/table/tablerow.cxx b/oox/source/drawingml/table/tablerow.cxx index 0c60f19..9fd2a38 100644 --- a/oox/source/drawingml/table/tablerow.cxx +++ b/oox/source/drawingml/table/tablerow.cxx @@ -26,7 +26,6 @@ #include <com/sun/star/table/XMergeableCellRange.hpp> #include <com/sun/star/table/BorderLine2.hpp> -using rtl::OUString; using namespace ::oox::core; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/oox/source/drawingml/table/tablerowcontext.cxx b/oox/source/drawingml/table/tablerowcontext.cxx index b40448b..1f15d5e 100644 --- a/oox/source/drawingml/table/tablerowcontext.cxx +++ b/oox/source/drawingml/table/tablerowcontext.cxx @@ -25,7 +25,6 @@ using namespace ::oox::core; using namespace ::com::sun::star; -using ::rtl::OUString; namespace oox { namespace drawingml { namespace table { diff --git a/oox/source/drawingml/table/tablestylecellstylecontext.cxx b/oox/source/drawingml/table/tablestylecellstylecontext.cxx index 9237315..6304b61 100644 --- a/oox/source/drawingml/table/tablestylecellstylecontext.cxx +++ b/oox/source/drawingml/table/tablestylecellstylecontext.cxx @@ -28,7 +28,6 @@ using namespace ::oox::core; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -using ::rtl::OUString; namespace oox { namespace drawingml { namespace table { diff --git a/oox/source/drawingml/table/tablestylecontext.cxx b/oox/source/drawingml/table/tablestylecontext.cxx index b8552b4..cb9fdd7 100644 --- a/oox/source/drawingml/table/tablestylecontext.cxx +++ b/oox/source/drawingml/table/tablestylecontext.cxx @@ -27,7 +27,6 @@ using namespace ::oox::core; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -using ::rtl::OUString; namespace oox { namespace drawingml { namespace table { diff --git a/oox/source/drawingml/table/tablestylelistfragmenthandler.cxx b/oox/source/drawingml/table/tablestylelistfragmenthandler.cxx index 6359921..1829ba9 100644 --- a/oox/source/drawingml/table/tablestylelistfragmenthandler.cxx +++ b/oox/source/drawingml/table/tablestylelistfragmenthandler.cxx @@ -20,10 +20,7 @@ #include "oox/drawingml/table/tablestylelistfragmenthandler.hxx" #include "oox/drawingml/table/tablestylecontext.hxx" -using ::rtl::OUString; using namespace ::oox::core; - -using rtl::OUString; using namespace ::com::sun::star; using namespace ::oox::core; using namespace ::oox::drawingml; diff --git a/oox/source/drawingml/table/tablestylepart.cxx b/oox/source/drawingml/table/tablestylepart.cxx index cf74167..d5256e7 100644 --- a/oox/source/drawingml/table/tablestylepart.cxx +++ b/oox/source/drawingml/table/tablestylepart.cxx @@ -20,7 +20,6 @@ #include "oox/drawingml/table/tablestylepart.hxx" #include "oox/drawingml/drawingmltypes.hxx" -using rtl::OUString; using namespace ::oox::core; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/oox/source/drawingml/table/tablestyletextstylecontext.cxx b/oox/source/drawingml/table/tablestyletextstylecontext.cxx index 477fabe..51a9602 100644 --- a/oox/source/drawingml/table/tablestyletextstylecontext.cxx +++ b/oox/source/drawingml/table/tablestyletextstylecontext.cxx @@ -27,7 +27,6 @@ using namespace ::oox::core; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -using ::rtl::OUString; namespace oox { namespace drawingml { namespace table {
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
