summaryrefslogtreecommitdiff
path: root/sc/source/filter/xcl97
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/filter/xcl97')
-rw-r--r--sc/source/filter/xcl97/XclExpChangeTrack.cxx9
-rw-r--r--sc/source/filter/xcl97/XclImpChangeTrack.cxx2
-rw-r--r--sc/source/filter/xcl97/xcl97esc.cxx5
-rw-r--r--sc/source/filter/xcl97/xcl97rec.cxx6
4 files changed, 8 insertions, 14 deletions
diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
index f23dfe21fea5..9b0767aadfbb 100644
--- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
@@ -33,9 +33,6 @@
#include <oox/token/tokens.hxx>
#include <rtl/strbuf.hxx>
-using ::rtl::OUString;
-using ::rtl::OString;
-using ::rtl::OStringBuffer;
using namespace oox;
static OString lcl_GuidToOString( sal_uInt8 aGuid[ 16 ] )
@@ -141,9 +138,9 @@ XclExpUserBViewList::XclExpUserBViewList( const ScChangeTrack& rChangeTrack )
{
sal_uInt8 aGUID[ 16 ];
sal_Bool bValidGUID = false;
- const std::set<rtl::OUString>& rStrColl = rChangeTrack.GetUserCollection();
+ const std::set<OUString>& rStrColl = rChangeTrack.GetUserCollection();
aViews.reserve(rStrColl.size());
- std::set<rtl::OUString>::const_iterator it = rStrColl.begin(), itEnd = rStrColl.end();
+ std::set<OUString>::const_iterator it = rStrColl.begin(), itEnd = rStrColl.end();
for (; it != itEnd; ++it)
{
lcl_GenerateGUID( aGUID, bValidGUID );
@@ -1537,7 +1534,7 @@ ScChangeTrack* XclExpChangeTrack::CreateTempChangeTrack()
// adjust table count
SCTAB nOrigCount = GetDoc().GetTableCount();
- rtl::OUString sTabName;
+ OUString sTabName;
for( sal_Int32 nIndex = 0; nIndex < nOrigCount; nIndex++ )
{
pTempDoc->CreateValidTabName( sTabName );
diff --git a/sc/source/filter/xcl97/XclImpChangeTrack.cxx b/sc/source/filter/xcl97/XclImpChangeTrack.cxx
index 9ce4e2ab19c3..976c1f83d451 100644
--- a/sc/source/filter/xcl97/XclImpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclImpChangeTrack.cxx
@@ -158,7 +158,7 @@ sal_Bool XclImpChangeTrack::Read3DTabRefInfo( SCTAB& rFirstTab, SCTAB& rLastTab,
// external ref - read doc and tab name and find sc tab num
// - URL
String aEncUrl( pStrm->ReadUniString() );
- ::rtl::OUString aUrl;
+ OUString aUrl;
bool bSelf;
XclImpUrlHelper::DecodeUrl( aUrl, bSelf, GetRoot(), aEncUrl );
pStrm->Ignore( 1 );
diff --git a/sc/source/filter/xcl97/xcl97esc.cxx b/sc/source/filter/xcl97/xcl97esc.cxx
index 6ba28abbb1e1..6d7a15b41a45 100644
--- a/sc/source/filter/xcl97/xcl97esc.cxx
+++ b/sc/source/filter/xcl97/xcl97esc.cxx
@@ -51,7 +51,6 @@
#include "xechart.hxx"
#include "xcl97esc.hxx"
-using ::rtl::OUString;
using ::com::sun::star::uno::Any;
using ::com::sun::star::uno::Exception;
using ::com::sun::star::uno::Reference;
@@ -523,8 +522,8 @@ ShapeInteractionHelper::PopulateShapeInteractionInfo( XclExpObjectManager& rObjM
try
{
SvMemoryStream* pMemStrm = NULL;
- rtl::OUString sHyperLink;
- rtl::OUString sMacro;
+ OUString sHyperLink;
+ OUString sMacro;
if ( ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( ::GetSdrObjectFromXShape( xShape ) ) )
{
sHyperLink = pInfo->GetHlink();
diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx
index 60b169086391..dcd62b5b5ab5 100644
--- a/sc/source/filter/xcl97/xcl97rec.cxx
+++ b/sc/source/filter/xcl97/xcl97rec.cxx
@@ -76,8 +76,6 @@
#include <oox/export/utils.hxx>
#include <oox/export/vmlexport.hxx>
-using ::rtl::OString;
-using ::rtl::OUString;
using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
using ::oox::drawingml::DrawingML;
@@ -1122,7 +1120,7 @@ void ExcBundlesheet8::SaveXml( XclExpXmlStream& rStrm )
rStrm.GetCurrentStream()->singleElement( XML_sheet,
XML_name, XclXmlUtils::ToOString( sUnicodeName ).getStr(),
- XML_sheetId, rtl::OString::valueOf( (sal_Int32)( nTab+1 ) ).getStr(),
+ XML_sheetId, OString::valueOf( (sal_Int32)( nTab+1 ) ).getStr(),
XML_state, nGrbit == 0x0000 ? "visible" : "hidden",
FSNS( XML_r, XML_id ), XclXmlUtils::ToOString( sId ).getStr(),
FSEND );
@@ -1207,7 +1205,7 @@ ExcEScenario::ExcEScenario( const XclExpRoot& rRoot, SCTAB nTab )
{
String sTmpName;
String sTmpComm;
- rtl::OUString aTmp;
+ OUString aTmp;
Color aDummyCol;
sal_uInt16 nFlags;