[Libreoffice-commits] .: 6 commits - basegfx/inc basegfx/source basic/inc basic/source connectivity/source cui/source dbaccess/source desktop/source editeng/source filter/source fpicker/source framework/source lingucomponent/source sc/inc sc/source sd/source sfx2/inc sfx2/source sot/source svl/source svtools/source svx/inc svx/source sw/source tools/inc tools/source unotools/inc unotools/source unusedcode.easy vcl/inc vcl/source
Caolán McNamara
caolan at kemper.freedesktop.org
Tue Jan 10 02:10:24 PST 2012
basegfx/inc/basegfx/polygon/b2dpolygon.hxx | 17 ----
basegfx/inc/basegfx/tuple/b2dtuple.hxx | 2
basegfx/source/polygon/b2dpolygon.cxx | 40 ----------
basegfx/source/tuple/b2dtuple.cxx | 30 --------
basic/inc/basic/vbahelper.hxx | 15 ----
basic/source/basmgr/vbahelper.cxx | 7 -
connectivity/source/drivers/dbase/DIndex.cxx | 8 +-
cui/source/dialogs/cuicharmap.cxx | 20 -----
cui/source/inc/cuicharmap.hxx | 1
cui/source/options/optinet2.cxx | 12 +--
cui/source/tabpages/tpline.cxx | 6 +
dbaccess/source/ext/adabas/AdabasNewDb.cxx | 34 ++++-----
dbaccess/source/ext/adabas/AdabasNewDb.hxx | 6 -
dbaccess/source/ui/dlg/ConnectionHelper.cxx | 6 -
dbaccess/source/ui/dlg/dbfindex.cxx | 2
desktop/source/app/appinit.cxx | 2
editeng/source/items/flditem.cxx | 2
filter/source/msfilter/msdffimp.cxx | 2
filter/source/msfilter/msfiltertracer.cxx | 2
filter/source/pdf/pdfexport.cxx | 2
fpicker/source/office/iodlg.cxx | 4 -
framework/source/classes/droptargetlistener.cxx | 2
framework/source/services/substitutepathvars.cxx | 6 -
lingucomponent/source/languageguessing/guesslang.cxx | 8 +-
sc/inc/attarray.hxx | 2
sc/source/core/data/attarray.cxx | 71 -------------------
sc/source/core/data/globalx.cxx | 2
sc/source/filter/dif/difimp.cxx | 4 -
sc/source/ui/docshell/impex.cxx | 2
sd/source/filter/html/htmlex.cxx | 2
sd/source/filter/ppt/pptin.cxx | 4 -
sd/source/ui/dlg/navigatr.cxx | 2
sd/source/ui/view/sdview4.cxx | 2
sfx2/inc/sfx2/docfile.hxx | 6 -
sfx2/source/appl/appcfg.cxx | 14 +--
sfx2/source/appl/fileobj.cxx | 2
sfx2/source/appl/linkmgr2.cxx | 2
sfx2/source/doc/docfac.cxx | 2
sfx2/source/doc/docfile.cxx | 45 ++++++------
sfx2/source/doc/new.cxx | 2
sfx2/source/doc/objstor.cxx | 4 -
sfx2/source/doc/objxtor.cxx | 2
sfx2/source/view/viewfrm.cxx | 2
sot/source/sdstor/storage.cxx | 4 -
sot/source/sdstor/ucbstorage.cxx | 2
svl/source/misc/folderrestriction.cxx | 2
svl/source/misc/restrictedpaths.cxx | 2
svtools/source/contnr/templwin.cxx | 21 -----
svtools/source/contnr/templwin.hxx | 2
svtools/source/control/inettbc.cxx | 4 -
svtools/source/graphic/grfmgr.cxx | 2
svtools/source/misc/templatefoldercache.cxx | 2
svx/inc/svx/bmpmask.hxx | 1
svx/inc/svx/itemwin.hxx | 2
svx/inc/svx/unopage.hxx | 2
svx/source/dialog/_bmpmask.cxx | 7 -
svx/source/dialog/docrecovery.cxx | 2
svx/source/gallery2/galtheme.cxx | 4 -
svx/source/svdraw/svdotxln.cxx | 2
svx/source/tbxctrls/itemwin.cxx | 15 ----
svx/source/unodraw/unopage.cxx | 7 -
svx/source/unodraw/unoshap2.cxx | 2
sw/source/core/swg/SwXMLTextBlocks.cxx | 4 -
sw/source/filter/ww8/ww8par.cxx | 4 -
sw/source/ui/dbui/createaddresslistdialog.cxx | 10 +-
tools/inc/tools/stream.hxx | 2
tools/source/stream/stream.cxx | 4 -
unotools/inc/unotools/localfilehelper.hxx | 9 +-
unotools/source/config/defaultoptions.cxx | 4 -
unotools/source/config/pathoptions.cxx | 14 ++-
unotools/source/ucbhelper/localfilehelper.cxx | 30 ++------
unotools/source/ucbhelper/tempfile.cxx | 2
unusedcode.easy | 57 +--------------
vcl/inc/svids.hrc | 2
vcl/inc/vcl/bmpacc.hxx | 2
vcl/inc/vcl/msgbox.hxx | 1
vcl/inc/vcl/seleng.hxx | 20 -----
vcl/source/gdi/bmpacc3.cxx | 28 -------
vcl/source/src/stdtext.src | 5 -
vcl/source/window/msgbox.cxx | 9 --
vcl/source/window/seleng.cxx | 11 --
81 files changed, 160 insertions(+), 551 deletions(-)
New commits:
commit 629cd5caadc6dced0d0f6b48368c5b6e55ea757e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 10 09:35:58 2012 +0000
callcatcher: update list
diff --git a/basegfx/inc/basegfx/polygon/b2dpolygon.hxx b/basegfx/inc/basegfx/polygon/b2dpolygon.hxx
index da23bb4..707590d 100644
--- a/basegfx/inc/basegfx/polygon/b2dpolygon.hxx
+++ b/basegfx/inc/basegfx/polygon/b2dpolygon.hxx
@@ -101,7 +101,6 @@ namespace basegfx
/// ControlPoint resets
void resetPrevControlPoint(sal_uInt32 nIndex);
void resetNextControlPoint(sal_uInt32 nIndex);
- void resetControlPoints(sal_uInt32 nIndex);
void resetControlPoints();
/// Bezier segment append with control points. The current last polygon point is implicitly taken as start point.
@@ -113,22 +112,6 @@ namespace basegfx
bool isNextControlPointUsed(sal_uInt32 nIndex) const;
B2VectorContinuity getContinuityInPoint(sal_uInt32 nIndex) const;
- /** check edge for being a bezier segment
-
- This test the existance of control vectors, but do not apply
- testAndSolveTrivialBezier() to the bezier segment, so it is still useful
- to do so.
- Since it can use internal data representations, it is faster
- than using getBezierSegment() and applying isBezier() on it.
-
- @param nIndex
- Index of the addressed edge's start point
-
- @return
- true if edge exists and at least one control vector is used
- */
- bool isBezierSegment(sal_uInt32 nIndex) const;
-
/** bezier segment access
This method also works when it is no bezier segment at all and will fill
diff --git a/basegfx/inc/basegfx/tuple/b2dtuple.hxx b/basegfx/inc/basegfx/tuple/b2dtuple.hxx
index 4706cf9..19ec58d 100644
--- a/basegfx/inc/basegfx/tuple/b2dtuple.hxx
+++ b/basegfx/inc/basegfx/tuple/b2dtuple.hxx
@@ -238,8 +238,6 @@ namespace basegfx
return *this;
}
- BASEGFX_DLLPUBLIC void correctValues(const double fCompareValue = 0.0);
-
BASEGFX_DLLPUBLIC static const B2DTuple& getEmptyTuple();
};
diff --git a/basegfx/source/polygon/b2dpolygon.cxx b/basegfx/source/polygon/b2dpolygon.cxx
index 3bc0401..a774922 100644
--- a/basegfx/source/polygon/b2dpolygon.cxx
+++ b/basegfx/source/polygon/b2dpolygon.cxx
@@ -1378,17 +1378,6 @@ namespace basegfx
}
}
- void B2DPolygon::resetControlPoints(sal_uInt32 nIndex)
- {
- OSL_ENSURE(nIndex < mpPolygon->count(), "B2DPolygon access outside range (!)");
-
- if(mpPolygon->areControlPointsUsed() &&
- (!mpPolygon->getPrevControlVector(nIndex).equalZero() || !mpPolygon->getNextControlVector(nIndex).equalZero()))
- {
- mpPolygon->resetControlVectors(nIndex);
- }
- }
-
void B2DPolygon::resetControlPoints()
{
if(mpPolygon->areControlPointsUsed())
@@ -1451,35 +1440,6 @@ namespace basegfx
}
}
- bool B2DPolygon::isBezierSegment(sal_uInt32 nIndex) const
- {
- OSL_ENSURE(nIndex < mpPolygon->count(), "B2DPolygon access outside range (!)");
-
- if(mpPolygon->areControlPointsUsed())
- {
- // Check if the edge exists
- const bool bNextIndexValidWithoutClose(nIndex + 1 < mpPolygon->count());
-
- if(bNextIndexValidWithoutClose || mpPolygon->isClosed())
- {
- const sal_uInt32 nNextIndex(bNextIndexValidWithoutClose ? nIndex + 1 : 0);
- return (!mpPolygon->getPrevControlVector(nNextIndex).equalZero()
- || !mpPolygon->getNextControlVector(nIndex).equalZero());
- }
- else
- {
- // no valid edge -> no bezier segment, even when local next
- // vector may be used
- return false;
- }
- }
- else
- {
- // no control points -> no bezier segment
- return false;
- }
- }
-
void B2DPolygon::getBezierSegment(sal_uInt32 nIndex, B2DCubicBezier& rTarget) const
{
OSL_ENSURE(nIndex < mpPolygon->count(), "B2DPolygon access outside range (!)");
diff --git a/basegfx/source/tuple/b2dtuple.cxx b/basegfx/source/tuple/b2dtuple.cxx
index cb44b7d..04fd551 100644
--- a/basegfx/source/tuple/b2dtuple.cxx
+++ b/basegfx/source/tuple/b2dtuple.cxx
@@ -45,34 +45,6 @@ namespace basegfx
mfY( rTup.getY() )
{}
- void B2DTuple::correctValues(const double fCompareValue)
- {
- if(0.0 == fCompareValue)
- {
- if(::basegfx::fTools::equalZero(mfX))
- {
- mfX = 0.0;
- }
-
- if(::basegfx::fTools::equalZero(mfY))
- {
- mfY = 0.0;
- }
- }
- else
- {
- if(::basegfx::fTools::equal(mfX, fCompareValue))
- {
- mfX = fCompareValue;
- }
-
- if(::basegfx::fTools::equal(mfY, fCompareValue))
- {
- mfY = fCompareValue;
- }
- }
- }
-
B2ITuple fround(const B2DTuple& rTup)
{
return B2ITuple(fround(rTup.getX()), fround(rTup.getY()));
@@ -80,6 +52,4 @@ namespace basegfx
} // end of namespace basegfx
-// eof
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/inc/basic/vbahelper.hxx b/basic/inc/basic/vbahelper.hxx
index 26ec118..4655897 100644
--- a/basic/inc/basic/vbahelper.hxx
+++ b/basic/inc/basic/vbahelper.hxx
@@ -43,21 +43,6 @@ namespace vba {
// ============================================================================
-/** Creates and returns an enumeration of all open documents of the same type
- as the specified document.
-
- First, the global module manager (com.sun.star.frame.ModuleManager) is
- asked for the type of the passed model, and all open documents with the
- same type will be stored in an enumeration object.
-
- @param rxModel
- A document model determining the type of the documents.
- */
-BASIC_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > createDocumentsEnumeration(
- const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxModel );
-
-// ============================================================================
-
/** Locks or unlocks the controllers of all documents that have the same type
as the specified document.
diff --git a/basic/source/basmgr/vbahelper.cxx b/basic/source/basmgr/vbahelper.cxx
index f581a90..16e7222 100644
--- a/basic/source/basmgr/vbahelper.cxx
+++ b/basic/source/basmgr/vbahelper.cxx
@@ -200,13 +200,6 @@ struct StaticCurrDirPool : public ::rtl::Static< CurrDirPool, StaticCurrDirPool
// ============================================================================
-uno::Reference< container::XEnumeration > createDocumentsEnumeration( const uno::Reference< frame::XModel >& rxModel )
-{
- return new DocumentsEnumeration( rxModel );
-}
-
-// ============================================================================
-
void lockControllersOfAllDocuments( const uno::Reference< frame::XModel >& rxModel, sal_Bool bLockControllers )
{
lclIterateDocuments( &lclLockControllers, rxModel, bLockControllers );
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
index 7a482d0..612f476 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -559,24 +559,4 @@ IMPL_LINK( SvxCharMapData, DeleteHdl, PushButton *, EMPTYARG )
return 0;
}
-IMPL_LINK( SvxCharMapData, AssignHdl, PushButton *, EMPTYARG )
-{
- SfxAllItemSet aSet( SfxObjectShell::Current()->GetPool() );
- aSet.Put( SfxStringItem( SID_CHARMAP, String::CreateFromAscii("test") ) );
- SfxModalDialog* pDlg = new SfxMacroAssignDlg( mpDialog, com::sun::star::uno::Reference < com::sun::star::frame::XFrame >(), aSet );
- if ( pDlg && pDlg->Execute() == RET_OK )
- {
- const SfxItemSet* pOutSet = pDlg->GetOutputItemSet();
- const SfxPoolItem* pItem;
- if( SFX_ITEM_SET == pOutSet->GetItemState( SID_CHARMAP, sal_False, &pItem ) )
- {
- // show assigned shortcut
- }
- }
-
- delete pDlg;
-
- return 0;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx
index 040c299..a7f6370 100644
--- a/cui/source/inc/cuicharmap.hxx
+++ b/cui/source/inc/cuicharmap.hxx
@@ -112,7 +112,6 @@ friend class SvxCharacterMap;
DECL_LINK( CharHighlightHdl, Control* pControl );
DECL_LINK( CharPreSelectHdl, Control* pControl );
DECL_LINK( DeleteHdl, PushButton* pBtn );
- DECL_LINK( AssignHdl, PushButton* pBtn );
};
class SvxCharacterMap : public SfxModalDialog
diff --git a/sc/inc/attarray.hxx b/sc/inc/attarray.hxx
index b58472e..706a1c0 100644
--- a/sc/inc/attarray.hxx
+++ b/sc/inc/attarray.hxx
@@ -156,8 +156,6 @@ public:
bool Search( SCROW nRow, SCSIZE& nIndex ) const;
- bool HasLines( SCROW nRow1, SCROW nRow2, Rectangle& rSizes,
- bool bLeft, bool bRight ) const;
bool HasAttrib( SCROW nRow1, SCROW nRow2, sal_uInt16 nMask ) const;
bool ExtendMerge( SCCOL nThisCol, SCROW nStartRow, SCROW nEndRow,
SCCOL& rPaintCol, SCROW& rPaintRow,
diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx
index 2aa660a..3b0c923 100644
--- a/sc/source/core/data/attarray.cxx
+++ b/sc/source/core/data/attarray.cxx
@@ -1161,77 +1161,6 @@ long lcl_LineSize( const SvxBorderLine& rLine )
return nTotal;
}
-bool ScAttrArray::HasLines( SCROW nRow1, SCROW nRow2, Rectangle& rSizes,
- bool bLeft, bool bRight ) const
-{
- SCSIZE nStartIndex;
- SCSIZE nEndIndex;
- Search( nRow1, nStartIndex );
- Search( nRow2, nEndIndex );
- bool bFound = false;
-
- const SvxBoxItem* pItem = 0;
- const SvxBorderLine* pLine = 0;
- long nCmp;
-
- // top
-
- pItem = (const SvxBoxItem*) &pData[nStartIndex].pPattern->GetItem(ATTR_BORDER);
- pLine = pItem->GetTop();
- if (pLine)
- {
- nCmp = lcl_LineSize(*pLine);
- if ( nCmp > rSizes.Top() )
- rSizes.Top() = nCmp;
- bFound = true;
- }
-
- // down
-
- if ( nEndIndex != nStartIndex )
- pItem = (const SvxBoxItem*) &pData[nEndIndex].pPattern->GetItem(ATTR_BORDER);
- pLine = pItem->GetBottom();
- if (pLine)
- {
- nCmp = lcl_LineSize(*pLine);
- if ( nCmp > rSizes.Bottom() )
- rSizes.Bottom() = nCmp;
- bFound = true;
- }
-
- if ( bLeft || bRight )
- for ( SCSIZE i=nStartIndex; i<=nEndIndex; i++)
- {
- pItem = (const SvxBoxItem*) &pData[i].pPattern->GetItem(ATTR_BORDER);
-
- if (bLeft)
- {
- pLine = pItem->GetLeft();
- if (pLine)
- {
- nCmp = lcl_LineSize(*pLine);
- if ( nCmp > rSizes.Left() )
- rSizes.Left() = nCmp;
- bFound = true;
- }
- }
-
- if (bRight)
- {
- pLine = pItem->GetRight();
- if (pLine)
- {
- nCmp = lcl_LineSize(*pLine);
- if ( nCmp > rSizes.Right() )
- rSizes.Right() = nCmp;
- bFound = true;
- }
- }
- }
-
- return bFound;
-}
-
// Test if field contains specific attribute
bool ScAttrArray::HasAttrib( SCROW nRow1, SCROW nRow2, sal_uInt16 nMask ) const
diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx
index 66f80a4..2209b6a 100644
--- a/svtools/source/contnr/templwin.cxx
+++ b/svtools/source/contnr/templwin.cxx
@@ -872,20 +872,6 @@ void SvtFrameWindow_Impl::ViewNonEmptyWin()
ViewTextWin();
}
-IMPL_STATIC_LINK_NOINSTANCE( SvtFrameWindow_Impl, ExecuteHdl_Impl, SvtExecuteInfo*, pExecuteInfo )
-{
- try
- {
- pExecuteInfo->xDispatch->dispatch( pExecuteInfo->aTargetURL, Sequence < PropertyValue >() );
- }
- catch ( Exception& )
- {
- }
-
- delete pExecuteInfo;
- return 0;
-}
-
void SvtFrameWindow_Impl::ShowDocInfo( const String& rURL )
{
try
@@ -1012,13 +998,6 @@ void SvtFrameWindow_Impl::OpenFile( const String& rURL, sal_Bool bPreview, sal_B
}
else
{
- /*
- SvtExecuteInfo* pExecuteInfo = new SvtExecuteInfo;
- pExecuteInfo->xDispatch = xDisp;
- pExecuteInfo->aTargetURL = aURL;
- Application::PostUserEvent(
- STATIC_LINK(0, SvtFrameWindow_Impl, ExecuteHdl_Impl), pExecuteInfo );
- */
Sequence < PropertyValue > aArgs;
xDisp->dispatch( aURL, aArgs );
m_aOpenURL = rtl::OUString();
diff --git a/svtools/source/contnr/templwin.hxx b/svtools/source/contnr/templwin.hxx
index 248eafa..070d016 100644
--- a/svtools/source/contnr/templwin.hxx
+++ b/svtools/source/contnr/templwin.hxx
@@ -219,8 +219,6 @@ private:
::com::sun::star::util::URL aTargetURL;
};
- DECL_STATIC_LINK( SvtFrameWindow_Impl, ExecuteHdl_Impl, SvtExecuteInfo* );
-
public:
SvtFrameWindow_Impl( Window* pParent );
~SvtFrameWindow_Impl();
diff --git a/svx/inc/svx/bmpmask.hxx b/svx/inc/svx/bmpmask.hxx
index 407cf5e..5cdc6d2 100644
--- a/svx/inc/svx/bmpmask.hxx
+++ b/svx/inc/svx/bmpmask.hxx
@@ -138,7 +138,6 @@ class SVX_DLLPUBLIC SvxBmpMask : public SfxDockingWindow
sal_uIntPtr* pTols );
Bitmap ImpMask( const Bitmap& rBitmap );
- BitmapEx ImpMask( const BitmapEx& rBitmapEx );
GDIMetaFile ImpMask( const GDIMetaFile& rMtf );
Animation ImpMask( const Animation& rAnimation );
BitmapEx ImpMaskTransparent( const BitmapEx& rBitmapEx,
diff --git a/svx/inc/svx/itemwin.hxx b/svx/inc/svx/itemwin.hxx
index 11f370f..acf00d1 100644
--- a/svx/inc/svx/itemwin.hxx
+++ b/svx/inc/svx/itemwin.hxx
@@ -86,8 +86,6 @@ class SvxColorBox : public ColorLB
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame;
#ifdef _SVX_ITEMWIN_CXX
- DECL_LINK( DelayHdl_Impl, Timer * );
-
void ReleaseFocus_Impl();
#endif
diff --git a/svx/inc/svx/unopage.hxx b/svx/inc/svx/unopage.hxx
index 0e68afd..d35ccfc 100644
--- a/svx/inc/svx/unopage.hxx
+++ b/svx/inc/svx/unopage.hxx
@@ -116,8 +116,6 @@ class SVX_DLLPUBLIC SvxDrawPage : public ::cppu::WeakAggImplHelper5< ::com::sun:
// ein ein SvxShape aggregierenden Objekt anlegen.
virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > _CreateShape( SdrObject *pObj ) const throw();
- static SvxDrawPage* GetPageForSdrPage( SdrPage* pPage ) throw();
-
UNO3_GETIMPLEMENTATION_DECL( SvxDrawPage )
// SfxListener
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index def7651..f55a181 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -719,13 +719,6 @@ Bitmap SvxBmpMask::ImpMask( const Bitmap& rBitmap )
//-------------------------------------------------------------------------
-BitmapEx SvxBmpMask::ImpMask( const BitmapEx& rBitmapEx )
-{
- return BitmapEx( ImpMask( rBitmapEx.GetBitmap() ), rBitmapEx.GetMask() );
-}
-
-//-------------------------------------------------------------------------
-
BitmapEx SvxBmpMask::ImpMaskTransparent( const BitmapEx& rBitmapEx, const Color& rColor, const long nTol )
{
EnterWait();
diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx
index a3116d1..fdb7b14 100644
--- a/svx/source/tbxctrls/itemwin.cxx
+++ b/svx/source/tbxctrls/itemwin.cxx
@@ -301,21 +301,6 @@ SvxColorBox::SvxColorBox(
// -----------------------------------------------------------------------
-IMPL_LINK( SvxColorBox, DelayHdl_Impl, Timer *, EMPTYARG )
-{
- SfxObjectShell* pSh = SfxObjectShell::Current();
-
- if ( pSh )
- {
- const SvxColorListItem* pItem = (const SvxColorListItem*)( pSh->GetItem( SID_COLOR_TABLE ) );
- if ( pItem )
- Fill( pItem->GetColorList() );
- }
- return 0;
-}
-
-// -----------------------------------------------------------------------
-
SvxColorBox::~SvxColorBox()
{
}
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index 1f0b91d..cb5aab3 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -126,13 +126,6 @@ void SvxDrawPage::release() throw()
OWeakAggObject::release();
}
-//----------------------------------------------------------------------
-
-SvxDrawPage* SvxDrawPage::GetPageForSdrPage( SdrPage* mpPage ) throw()
-{
- return getImplementation( mpPage->getUnoPage() );
-}
-
// XComponent
void SvxDrawPage::disposing() throw()
{
diff --git a/unusedcode.easy b/unusedcode.easy
index de596f0..242f326 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -2,7 +2,6 @@ AtomDocument::AtomDocument(AtomPubSession*, std::basic_string<char, std::char_tr
AtomFolder::AtomFolder(AtomPubSession*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)
AtomPubSession::getCollectionUrl(Collection::Type)
AtomPubSession::~AtomPubSession()
-BitmapWriteAccess::FillPolygon(Polygon const&)
BufferNode::childAt(int) const
ByteString::Assign(char const*, unsigned short)
ByteString::Assign(char)
@@ -97,12 +96,6 @@ FontSizeBox::SetUserValue(long, FieldUnit)
FontStyleBox::FontStyleBox(Window*, long)
FormattedField::SetValidateText(String const&, String const*)
FormatterBase::SetFieldText(String const&, unsigned char)
-GDIMetaFile::IsEqual(GDIMetaFile const&) const
-GDIMetaFile::ReplaceColors(Color const&, Color const&, unsigned long)
-GDIMetaFile::SaveStatus()
-GDIMetaFile::Wind(unsigned long)
-GDIMetaFile::WindEnd()
-GDIMetaFile::WindNext()
GraphCtrl::GraphCtrl(Window*, long)
GtkSalFrame::popIgnoreDamage()
GtkSalFrame::pushIgnoreDamage()
@@ -112,10 +105,6 @@ HTMLControls::Insert(HTMLControls const*, unsigned short, unsigned short)
HTMLControls::Remove(HTMLControl const*&, unsigned short)
HTMLControls::Remove(unsigned short, unsigned short)
Hatch::SetStyle(HatchStyle)
-HeaderBar::InsertItem(unsigned short, Image const&, String const&, long, unsigned short, unsigned short)
-HeaderBar::InsertItem(unsigned short, Image const&, long, unsigned short, unsigned short)
-HeaderBar::SetHelpId(unsigned short, rtl::OString const&)
-HeaderBar::SetHelpText(unsigned short, String const&)
ImageButton::ImageButton(unsigned short)
ImageList::AddImage(unsigned short, Image const&)
ImageList::ReplaceImage(unsigned short, unsigned short)
@@ -162,7 +151,7 @@ MenuBar::MenuBar(ResId const&)
MergeData::~MergeData()
MergeDataFile::Dump()
MessBox::MessBox(unsigned short)
-MessBox::SetDefaultCheckBoxText()
+MetaAction::IsEqual(MetaAction const&) const
MetaCommentAction::MetaCommentAction(unsigned char const*, unsigned int)
MetricBox::RemoveValue(long, FieldUnit)
MetricField::ConvertValue(long, unsigned short, FieldUnit, MapUnit)
@@ -210,22 +199,15 @@ SVGExport::GetGlyphPlacement() const
SVGExport::IsUseGradient() const
SVGExport::popClip()
SVGExport::pushClip(basegfx::B2DPolyPolygon const&)
-SalColormap::SalColormap(BitmapPalette const&)
-SalColormap::SetPalette(BitmapPalette const&)
SalDisplay::IsLocal()
SalGraphics::DrawBitmap(SalTwoRect const*, SalBitmap const&, unsigned int, OutputDevice const*)
SalGraphics::DrawNativeControlText(unsigned int, unsigned int, Rectangle const&, unsigned int, ImplControlValue const&, rtl::OUString const&, OutputDevice const*)
SalGraphics::drawAlphaBitmap(SalTwoRect const&, SalBitmap const&, SalBitmap const&)
SalGraphics::drawPolyLine(basegfx::B2DPolygon const&, double, basegfx::B2DVector const&, basegfx::B2DLineJoin)
SalGraphics::drawPolyPolygon(basegfx::B2DPolyPolygon const&, double)
-SalI18N_InputContext::CommitStringCallback(unsigned short*, unsigned long)
-SalI18N_InputContext::SetPreeditState(int)
SanExtensionImpl::extractCertExt()
SanExtensionImpl::setCertExtn(com::sun::star::uno::Sequence<signed char>, com::sun::star::uno::Sequence<signed char>, unsigned char)
SanExtensionImpl::setCertExtn(unsigned char*, unsigned int, unsigned char*, unsigned int, unsigned char)
-SbiExprNode::IsString()
-SbiExpression::SbiExpression(SbiParser*, SbiToken)
-SbiExpression::SbiExpression(SbiParser*, String const&)
SbiExpression::VBA_Imp()
SbiIoSystem::NextChannel()
SbiRuntime::GetParams()
@@ -253,7 +235,6 @@ ScAddInDocs::Insert(ScDocument* const&, unsigned short&)
ScAddInDocs::Insert(ScDocument* const*, unsigned short)
ScAddInDocs::Remove(ScDocument* const&, unsigned short)
ScAreaLinkSaveCollection::clear()
-ScAttrArray::HasLines(int, int, Rectangle&, bool, bool) const
ScCellMergeOption::ScCellMergeOption()
ScCellObj::SetFormulaResultDouble(double)
ScCellObj::SetFormulaResultString(rtl::OUString const&)
@@ -261,6 +242,7 @@ ScCellObj::SetFormulaWithGrammar(rtl::OUString const&, rtl::OUString const&, for
ScChangeActionContent::SetNewValue(String const&, ScDocument*)
ScCompressedArray<int, unsigned char>::GetEntryCount() const
ScCompressedArray<int, unsigned short>::CopyFrom(ScCompressedArray<int, unsigned short> const&, int, int, long)
+ScCompressedArray<int, unsigned short>::GetEntryCount() const
ScCompressedArray<int, unsigned short>::GetValue(int) const
ScCompressedArray<int, unsigned short>::Insert(int, unsigned long)
ScCompressedArray<int, unsigned short>::Remove(int, unsigned long)
@@ -537,29 +519,6 @@ SvXMLUnitConverter::convertEnum(rtl::OUStringBuffer&, unsigned short, SvXMLEnumS
SvXMLUnitConverter::convertMeasureToXML(rtl::OUStringBuffer&, int, short) const
SvpSalInstance::CancelEvent(SalFrame const*, void*, unsigned short)
SvtBroadcaster::Forward(SvtBroadcaster&, SfxHint const&)
-SvtFrameWindow_Impl::ExecuteHdl_Impl(SvtFrameWindow_Impl*, SvtFrameWindow_Impl::SvtExecuteInfo*)
-SvtGraphicFill::getGradient1stColor() const
-SvtGraphicFill::getGradient2ndColor() const
-SvtGraphicFill::getGradientStepCount() const
-SvtGraphicFill::getHatchColor() const
-SvtGraphicFill::getHatchType() const
-SvtGraphicFill::setFillColor(Color)
-SvtGraphicFill::setFillRule(SvtGraphicFill::FillRule)
-SvtGraphicFill::setFillType(SvtGraphicFill::FillType)
-SvtGraphicFill::setGraphic(Graphic const&)
-SvtGraphicFill::setHatchColor(Color)
-SvtGraphicFill::setHatchType(SvtGraphicFill::HatchType)
-SvtGraphicFill::setTiling(bool)
-SvtGraphicFill::setTransform(SvtGraphicFill::Transform const&)
-SvtGraphicFill::setTransparency(double)
-SvtGraphicStroke::setCapType(SvtGraphicStroke::CapType)
-SvtGraphicStroke::setDashArray(std::__debug::vector<double, std::allocator<double> > const&)
-SvtGraphicStroke::setEndArrow(PolyPolygon const&)
-SvtGraphicStroke::setJoinType(SvtGraphicStroke::JoinType)
-SvtGraphicStroke::setMiterLimit(double)
-SvtGraphicStroke::setStartArrow(PolyPolygon const&)
-SvtGraphicStroke::setStrokeWidth(double)
-SvtGraphicStroke::setTransparency(double)
SvtIconChoiceCtrl::SvtIconChoiceCtrl(Window*, ResId const&)
SvtIconWindow_Impl::GetSelectedIconText() const
SvtListenerIter::First(void* (*)())
@@ -587,11 +546,8 @@ SvxAutocorrWordList::Insert(SvxAutocorrWord* const*, unsigned short)
SvxAutocorrWordList::Insert(SvxAutocorrWordList const*, unsigned short, unsigned short)
SvxAutocorrWordList::Remove(SvxAutocorrWord* const&, unsigned short)
SvxAutocorrWordList::Remove(unsigned short, unsigned short)
-SvxBmpMask::ImpMask(BitmapEx const&)
-SvxCharMapData::LinkStubAssignHdl(void*, void*)
SvxChartDataDescrItem::SvxChartDataDescrItem(SvxChartDataDescr, unsigned short)
SvxChartTextOrientItem::SvxChartTextOrientItem(SvxChartTextOrient, unsigned short)
-SvxColorBox::LinkStubDelayHdl_Impl(void*, void*)
SvxColorValueSet::SvxColorValueSet(Window*, long)
SvxColumnItem::GetVisibleRight() const
SvxContourDlg::ScaleContour(PolyPolygon&, Graphic const&, MapUnit, Size const&)
@@ -602,7 +558,6 @@ SvxContourDlg::SetGraphicLinked(unsigned char)
SvxContourDlg::SetPolyPolygon(PolyPolygon const&)
SvxDoCapitals::Do(String const&, unsigned short, unsigned short, unsigned char)
SvxDrawOutlinerViewForwarder::SetShapePos(Point const&)
-SvxDrawPage::GetPageForSdrPage(SdrPage*)
SvxDrawPage::SvxDrawPage()
SvxEditSourceHelper::UserSpaceToEE(Rectangle const&, Size const&, bool)
SvxEditSourceHint::SetEndValue(unsigned long)
@@ -836,7 +791,6 @@ SwpHtStart::Insert(SwTxtAttr const**, unsigned short)
SwpHtStart::Insert(SwpHtStart const*, unsigned short, unsigned short)
SwpHtStart::Remove(SwTxtAttr const*&, unsigned short)
SystemChildWindow::SystemChildWindow(Window*, ResId const&)
-SystemChildWindow::SystemChildWindow(Window*, long, SystemWindowData*, unsigned char)
TB::NeedsPositioning()
TESortedPositions::Insert(TESortedPositions const*, unsigned short, unsigned short)
TESortedPositions::Insert(unsigned long const&, unsigned short&)
@@ -856,6 +810,7 @@ TempFile::IsValid() const
TextObj::TextObj(TextObj&)
TextObj::Write(SvStream*)
TransferableDataHelper::GetInterface(com::sun::star::datatransfer::DataFlavor const&, com::sun::star::uno::Reference<com::sun::star::uno::XInterface>&)
+TypeDescriptor_Init_Impl::~TypeDescriptor_Init_Impl()
UCBStorage::IsStorageFile(String const&)
UCBStream::UCBStream(com::sun::star::uno::Reference<com::sun::star::io::XOutputStream>&)
UnoApiTest::UnoApiTest()
@@ -1040,9 +995,6 @@ basegfx::B2DHomPoint::getB2DPoint() const
basegfx::B2DHomPoint::setX(double)
basegfx::B2DHomPoint::setY(double)
basegfx::B2DPolygon::insert(unsigned int, basegfx::B2DPolygon const&, unsigned int, unsigned int)
-basegfx::B2DPolygon::isBezierSegment(unsigned int) const
-basegfx::B2DPolygon::resetControlPoints(unsigned int)
-basegfx::B2DTuple::correctValues(double)
basegfx::B2DVector::isNormalized() const
basegfx::B2I64Tuple::getEmptyTuple()
basegfx::B2IVector::angle(basegfx::B2IVector const&) const
@@ -1145,7 +1097,6 @@ basegfx::unotools::homMatrixFromAffineMatrix(com::sun::star::geometry::AffineMat
basegfx::unotools::integerPoint2DFromB2IPoint(basegfx::B2IPoint const&)
basegfx::unotools::integerRectangle2DFromB2IRectangle(basegfx::B2IRange const&)
basic::ScriptExtensionIterator::implGetScriptPackageFromPackage(com::sun::star::uno::Reference<com::sun::star::deployment::XPackage>, bool&)
-basic::vba::createDocumentsEnumeration(com::sun::star::uno::Reference<com::sun::star::frame::XModel> const&)
basic::vba::getCurrentDirectory(com::sun::star::uno::Reference<com::sun::star::frame::XModel> const&)
binfilter::B3dEdgeEntryBucketMemArr::Insert(binfilter::B3dEdgeEntryBucketMemArr const*, unsigned short, unsigned short, unsigned short)
binfilter::B3dEdgeEntryBucketMemArr::Replace(char const*&, unsigned short)
@@ -1789,6 +1740,7 @@ oox::xls::FormulaParserImpl::pushParenthesesOperand()
oox::xls::FormulaParserImpl::removeLastOperands(unsigned long)
oox::xls::FormulaProcessorBase::extractCellAddress(com::sun::star::table::CellAddress&, com::sun::star::uno::Sequence<com::sun::star::sheet::FormulaToken> const&, bool) const
oox::xls::FormulaProcessorBase::generateApiAddressString(com::sun::star::table::CellAddress const&) const
+oox::xls::FormulaProcessorBase::generateApiRangeListString(oox::xls::ApiCellRangeList const&) const
oox::xls::FunctionParamInfoIterator::getParamInfo() const
oox::xls::FunctionProvider::getFuncInfoFromOdfFuncName(rtl::OUString const&) const
oox::xls::SheetDataBuffer::XfIdRange::set(com::sun::star::table::CellAddress const&, int, int)
diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc
index c94d215..1f60241 100644
--- a/vcl/inc/svids.hrc
+++ b/vcl/inc/svids.hrc
@@ -186,7 +186,7 @@
#define SV_STDTEXT_FIRST SV_STDTEXT_SERVICENOTAVAILABLE
#define SV_STDTEXT_SERVICENOTAVAILABLE 10200
-#define SV_STDTEXT_DONTHINTAGAIN 10201
+
#define SV_STDTEXT_DONTASKAGAIN 10202
#define SV_STDTEXT_DONTWARNAGAIN 10203
#define SV_STDTEXT_ABOUT 10204
diff --git a/vcl/inc/vcl/bmpacc.hxx b/vcl/inc/vcl/bmpacc.hxx
index 4b4416b..3b973c8 100644
--- a/vcl/inc/vcl/bmpacc.hxx
+++ b/vcl/inc/vcl/bmpacc.hxx
@@ -202,8 +202,6 @@ public:
void FillRect( const Rectangle& rRect );
void DrawRect( const Rectangle& rRect );
- void FillPolygon( const Polygon& rPoly );
-
private:
BitmapColor* mpLineColor;
diff --git a/vcl/inc/vcl/msgbox.hxx b/vcl/inc/vcl/msgbox.hxx
index bc8bf8e..6d6c920 100644
--- a/vcl/inc/vcl/msgbox.hxx
+++ b/vcl/inc/vcl/msgbox.hxx
@@ -100,7 +100,6 @@ public:
void SetImage( const Image& rImage ) { maImage = rImage; }
const Image& GetImage() const { return maImage; }
- void SetDefaultCheckBoxText();
void SetCheckBoxText( const XubString& rText ) { maCheckBoxText = rText;}
const XubString& GetCheckBoxText() const { return maCheckBoxText;}
void SetCheckBoxState( sal_Bool bCheck );
diff --git a/vcl/source/gdi/bmpacc3.cxx b/vcl/source/gdi/bmpacc3.cxx
index 17b8db3..483e3b5 100644
--- a/vcl/source/gdi/bmpacc3.cxx
+++ b/vcl/source/gdi/bmpacc3.cxx
@@ -266,32 +266,4 @@ void BitmapWriteAccess::DrawRect( const Rectangle& rRect )
}
}
-// ------------------------------------------------------------------
-
-void BitmapWriteAccess::FillPolygon( const Polygon& rPoly )
-{
- const sal_uInt16 nSize = rPoly.GetSize();
-
- if( nSize && mpFillColor )
- {
- const BitmapColor& rFillColor = *mpFillColor;
- Region aRegion( rPoly );
- Rectangle aRect;
-
- aRegion.Intersect( Rectangle( Point(), Size( Width(), Height() ) ) );
-
- if( !aRegion.IsEmpty() )
- {
- RegionHandle aRegHandle( aRegion.BeginEnumRects() );
-
- while( aRegion.GetNextEnumRect( aRegHandle, aRect ) )
- for( long nY = aRect.Top(), nEndY = aRect.Bottom(); nY <= nEndY; nY++ )
- for( long nX = aRect.Left(), nEndX = aRect.Right(); nX <= nEndX; nX++ )
- SetPixel( nY, nX, rFillColor );
-
- aRegion.EndEnumRects( aRegHandle );
- }
- }
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/src/stdtext.src b/vcl/source/src/stdtext.src
index 9fd1487..53d4fb5 100644
--- a/vcl/source/src/stdtext.src
+++ b/vcl/source/src/stdtext.src
@@ -34,11 +34,6 @@ String SV_STDTEXT_SERVICENOTAVAILABLE
Text [ en-US ] = "The component (%s) could not be loaded.\nPlease start setup with the repair option.";
};
-String SV_STDTEXT_DONTHINTAGAIN
-{
- Text [ en-US ] = "Do not show this information again.";
-};
-
String SV_STDTEXT_DONTASKAGAIN
{
Text [ en-US ] = "Do not show this question again.";
diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx
index c9e56ef..042c629 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.cxx
@@ -447,15 +447,6 @@ void MessBox::SetCheckBoxState( sal_Bool bCheck )
// -----------------------------------------------------------------------
-void MessBox::SetDefaultCheckBoxText()
-{
- ResMgr* pResMgr = ImplGetResMgr();
- if( pResMgr )
- maCheckBoxText = XubString( ResId( SV_STDTEXT_DONTHINTAGAIN, *pResMgr ) );
-}
-
-// -----------------------------------------------------------------------
-
Size MessBox::GetOptimalSize(WindowSizeType eType) const
{
switch( eType ) {
commit 84479bc5ab3a185abb57c39d0a0a7a8c763b5875
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 9 22:53:14 2012 +0000
reduce DragMode foo
diff --git a/unusedcode.easy b/unusedcode.easy
index 7169083..de596f0 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -374,7 +374,6 @@ SectReprArr::Insert(SectReprArr const*, unsigned short, unsigned short)
SectReprArr::Remove(SectRepr* const&, unsigned short)
SectReprArr::Remove(unsigned short, unsigned short)
SecurityEnvironment_NssImpl::getImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface>)
-SelectionEngine::ActivateDragMode()
SetOfByte::GetClearBit(unsigned short) const
SetOfByte::GetClearCount() const
SetOfByte::GetSetBit(unsigned short) const
diff --git a/vcl/inc/vcl/seleng.hxx b/vcl/inc/vcl/seleng.hxx
index 8466df4..553ed67 100644
--- a/vcl/inc/vcl/seleng.hxx
+++ b/vcl/inc/vcl/seleng.hxx
@@ -75,7 +75,6 @@ public:
#define SELENG_IN_SEL 0x0002
#define SELENG_IN_ADD 0x0004
#define SELENG_ADD_ALW 0x0008
-#define SELENG_IN_DRG 0x0010
#define SELENG_HAS_ANCH 0x0020
#define SELENG_CMDEVT 0x0040
#define SELENG_WAIT_UPEVT 0x0080
@@ -127,9 +126,6 @@ public:
sal_Bool IsAlwaysAdding() const;
void EnableDrag( sal_Bool bOn );
- sal_Bool IsDragEnabled() const;
- void ActivateDragMode();
- sal_Bool IsInDragMode() const;
void SetSelectionMode( SelectionMode eMode );
SelectionMode GetSelectionMode() const { return eSelMode; }
@@ -174,14 +170,6 @@ public:
}
};
-inline sal_Bool SelectionEngine::IsDragEnabled() const
-{
- if ( nFlags & SELENG_DRG_ENAB )
- return sal_True;
- else
- return sal_False;
-}
-
inline sal_Bool SelectionEngine::IsAddMode() const
{
if ( nFlags & (SELENG_IN_ADD | SELENG_ADD_ALW) )
@@ -222,14 +210,6 @@ inline sal_Bool SelectionEngine::IsAlwaysAdding() const
return sal_False;
}
-inline sal_Bool SelectionEngine::IsInDragMode() const
-{
- if ( nFlags & SELENG_IN_DRG )
- return sal_True;
- else
- return sal_False;
-}
-
inline sal_Bool SelectionEngine::IsInSelection() const
{
if ( nFlags & SELENG_IN_SEL )
diff --git a/vcl/source/window/seleng.cxx b/vcl/source/window/seleng.cxx
index 1d83c1f..483b286 100644
--- a/vcl/source/window/seleng.cxx
+++ b/vcl/source/window/seleng.cxx
@@ -100,17 +100,6 @@ void SelectionEngine::SetSelectionMode( SelectionMode eMode )
/*************************************************************************
|*
-|* SelectionEngine::ActivateDragMode()
-|*
-*************************************************************************/
-
-void SelectionEngine::ActivateDragMode()
-{
- DBG_ERRORFILE( "SelectionEngine::ActivateDragMode not implemented" );
-}
-
-/*************************************************************************
-|*
|* SelectionEngine::CursorPosChanging()
|*
*************************************************************************/
commit e2f062ef7fdf80d9189b19cb396814976c73bf78
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 9 22:36:14 2012 +0000
force users of horrific ReadUniOrByteStringLine to provide the charset
diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx
index 1ccc42b..19189a1 100644
--- a/sc/source/filter/dif/difimp.cxx
+++ b/sc/source/filter/dif/difimp.cxx
@@ -452,7 +452,7 @@ bool DifParser::ReadNextLine( String& rStr )
{
if( aLookAheadLine.Len() == 0 )
{
- return rIn.ReadUniOrByteStringLine( rStr );
+ return rIn.ReadUniOrByteStringLine( rStr, rIn.GetStreamCharSet() );
}
else
{
@@ -470,7 +470,7 @@ bool DifParser::LookAhead()
bool bValidStructure = false;
OSL_ENSURE( aLookAheadLine.Len() == 0, "*DifParser::LookAhead(): LookAhead called twice in a row" );
- rIn.ReadUniOrByteStringLine( aLookAheadLine );
+ rIn.ReadUniOrByteStringLine( aLookAheadLine, rIn.GetStreamCharSet() );
pAktBuffer = aLookAheadLine.GetBuffer();
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index f53ded4..a10ab39 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -788,7 +788,7 @@ sal_Bool ScImportExport::Text2Doc( SvStream& rStrm )
rStrm.Seek( nOldPos );
for( ;; )
{
- rStrm.ReadUniOrByteStringLine( aLine );
+ rStrm.ReadUniOrByteStringLine( aLine, rStrm.GetStreamCharSet() );
if( rStrm.IsEof() )
break;
SCCOL nCol = nStartCol;
diff --git a/tools/inc/tools/stream.hxx b/tools/inc/tools/stream.hxx
index 52ae394..2accc44 100644
--- a/tools/inc/tools/stream.hxx
+++ b/tools/inc/tools/stream.hxx
@@ -416,8 +416,6 @@ public:
/// Read a line of Unicode if eSrcCharSet==RTL_TEXTENCODING_UNICODE,
/// otherwise read a line of Bytecode and convert from eSrcCharSet
sal_Bool ReadUniOrByteStringLine( String& rStr, rtl_TextEncoding eSrcCharSet );
- sal_Bool ReadUniOrByteStringLine( String& rStr )
- { return ReadUniOrByteStringLine( rStr, GetStreamCharSet() ); }
/// Write a sequence of Unicode characters
sal_Bool WriteUnicodeText( const String& rStr );
/// Write a sequence of Unicode characters if eDestCharSet==RTL_TEXTENCODING_UNICODE,
diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index 1b31103..0fb9ca0 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -1041,7 +1041,7 @@ sal_Bool SvStream::ReadCsvLine( String& rStr, sal_Bool bEmbeddedLineBreak,
const String& rFieldSeparators, sal_Unicode cFieldQuote,
sal_Bool bAllowBackslashEscape)
{
- ReadUniOrByteStringLine( rStr);
+ ReadUniOrByteStringLine(rStr, GetStreamCharSet());
if (bEmbeddedLineBreak)
{
@@ -1096,7 +1096,7 @@ sal_Bool SvStream::ReadCsvLine( String& rStr, sal_Bool bEmbeddedLineBreak,
{
nLastOffset = rStr.Len();
String aNext;
- ReadUniOrByteStringLine( aNext);
+ ReadUniOrByteStringLine(aNext, GetStreamCharSet());
rStr += sal_Unicode(_LF);
rStr += aNext;
}
commit b2b318cca726630486dfcad442ba61499c3c7c12
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 9 21:25:52 2012 +0000
we know that the encoding is not UTF-16 here
diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx
index 9f1ef77..0502b8e 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/createaddresslistdialog.cxx
@@ -609,8 +609,7 @@ IMPL_LINK(SwCreateAddressListDialog, OkHdl_Impl, PushButton*, EMPTYARG)
}
//remove tab and quote
sLine = sLine.copy( 0, sLine.getLength() - 2 );
- pStream->WriteUnicodeOrByteText( sLine, RTL_TEXTENCODING_UTF8 );
- endl(*pStream);
+ pStream->WriteByteStringLine( sLine, RTL_TEXTENCODING_UTF8 );
::std::vector< ::std::vector< OUString > >::iterator aDataIter;
for( aDataIter = m_pCSVData->aDBData.begin(); aDataIter != m_pCSVData->aDBData.end(); ++aDataIter)
@@ -624,8 +623,7 @@ IMPL_LINK(SwCreateAddressListDialog, OkHdl_Impl, PushButton*, EMPTYARG)
}
//remove tab and quote
sLine = sLine.copy( 0, sLine.getLength() - 2 );
- pStream->WriteUnicodeOrByteText( sLine, RTL_TEXTENCODING_UTF8 );
- endl(*pStream);
+ pStream->WriteByteStringLine( sLine, RTL_TEXTENCODING_UTF8 );
}
aMedium.Commit();
EndDialog(RET_OK);
commit 5870f91a86bc26a827dbecdd330c63b9e3a51678
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 9 21:17:45 2012 +0000
we know that the encoding is not UTF-16 here
diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx
index 848b91e..9f1ef77 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/createaddresslistdialog.cxx
@@ -412,7 +412,7 @@ SwCreateAddressListDialog::SwCreateAddressListDialog(
OUString sMiddle(sTempMiddle);
String sLine;
- sal_Bool bRead = pStream->ReadUniOrByteStringLine( sLine, RTL_TEXTENCODING_UTF8 );
+ sal_Bool bRead = pStream->ReadByteStringLine( sLine, RTL_TEXTENCODING_UTF8 );
if(bRead)
{
@@ -431,7 +431,7 @@ SwCreateAddressListDialog::SwCreateAddressListDialog(
}
}
}
- while(pStream->ReadUniOrByteStringLine( sLine, RTL_TEXTENCODING_UTF8 ))
+ while(pStream->ReadByteStringLine( sLine, RTL_TEXTENCODING_UTF8 ))
{
::std::vector<OUString> aNewData;
//analyze data line
commit 3c62fbcdd78e472d3dde604eff33be54cb3e21be
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 9 21:05:46 2012 +0000
simplify LocalFileHelper::ConvertURLToPhysicalName
diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx
index e8e4750..f64a630 100644
--- a/connectivity/source/drivers/dbase/DIndex.cxx
+++ b/connectivity/source/drivers/dbase/DIndex.cxx
@@ -393,7 +393,7 @@ void ODbaseIndex::createINFEntry()
sCfgFile += m_pTable->getName();
sCfgFile += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".inf"));
- String sPhysicalPath;
+ rtl::OUString sPhysicalPath;
LocalFileHelper::ConvertURLToPhysicalName(sCfgFile,sPhysicalPath);
Config aInfFile(sPhysicalPath);
@@ -436,9 +436,9 @@ sal_Bool ODbaseIndex::DropImpl()
sCfgFile += m_pTable->getName();
sCfgFile += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".inf"));
- String sPhysicalPath;
- String sNDX(sCfgFile);
- OSL_VERIFY_RES( LocalFileHelper::ConvertURLToPhysicalName(sNDX,sPhysicalPath),"Can not convert Config Filename into Physical Name!");
+ rtl::OUString sPhysicalPath;
+ OSL_VERIFY_RES( LocalFileHelper::ConvertURLToPhysicalName(sCfgFile, sPhysicalPath),
+ "Can not convert Config Filename into Physical Name!");
Config aInfFile(sPhysicalPath);
aInfFile.SetGroup(dBASE_III_GROUP);
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index e0c7c7a..bcf0c60 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -1422,19 +1422,19 @@ IMPL_LINK( SvxEMailTabPage, FileDialogHdl_Impl, PushButton*, pButton )
FileDialogHelper aHelper(
com::sun::star::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE,
0 );
- String sPath = aMailerURLED.GetText();
- if ( !sPath.Len() )
- sPath.AppendAscii("/usr/bin");
+ rtl::OUString sPath = aMailerURLED.GetText();
+ if ( sPath.isEmpty() )
+ sPath = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/usr/bin"));
- String sUrl;
- ::utl::LocalFileHelper::ConvertPhysicalNameToURL(sPath,sUrl);
+ rtl::OUString sUrl;
+ ::utl::LocalFileHelper::ConvertPhysicalNameToURL(sPath, sUrl);
aHelper.SetDisplayDirectory(sUrl);
aHelper.AddFilter( m_sDefaultFilterName, String::CreateFromAscii("*"));
if ( ERRCODE_NONE == aHelper.Execute() )
{
sUrl = aHelper.GetPath();
- ::utl::LocalFileHelper::ConvertURLToPhysicalName(sUrl,sPath);
+ ::utl::LocalFileHelper::ConvertURLToPhysicalName(sUrl, sPath);
aMailerURLED.SetText(sPath);
}
}
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 3a27eaa..63700aa 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -1470,8 +1470,12 @@ IMPL_LINK( SvxLineTabPage, MenuCreateHdl_Impl, MenuButton *, pButton )
// convert URL encodings to UI characters (eg %20 for spaces)
String aPhysicalName;
- if( ::utl::LocalFileHelper::ConvertURLToPhysicalName( *it, aPhysicalName ))
+ rtl::OUString sTmp;
+ if( ::utl::LocalFileHelper::ConvertURLToPhysicalName( *it, sTmp ))
+ {
+ aPhysicalName = sTmp;
pUIName = &aPhysicalName;
+ }
SvxBrushItem* pBrushItem = new SvxBrushItem(*it, aEmptyStr, GPOS_AREA, SID_ATTR_BRUSH);
pBrushItem->SetDoneLink(STATIC_LINK(this, SvxLineTabPage, GraphicArrivedHdl_Impl));
diff --git a/dbaccess/source/ext/adabas/AdabasNewDb.cxx b/dbaccess/source/ext/adabas/AdabasNewDb.cxx
index 27296c3..c1abf3f 100644
--- a/dbaccess/source/ext/adabas/AdabasNewDb.cxx
+++ b/dbaccess/source/ext/adabas/AdabasNewDb.cxx
@@ -328,7 +328,7 @@ OAdabasNewDbDlg::OAdabasNewDbDlg( Window* pParent,
}
- if(m_SYSDEV_File.Len() < 41 && m_TRANSDEV_File.Len() < 41 && m_DATADEV_File.Len() < 41)
+ if(m_SYSDEV_File.getLength() < 41 && m_TRANSDEV_File.getLength() < 41 && m_DATADEV_File.getLength() < 41)
{
m_ET_SYSDEVSPACE.SetText(m_SYSDEV_File );
m_ET_TRANSACTIONLOG.SetText(m_TRANSDEV_File);
@@ -418,7 +418,7 @@ IMPL_LINK( OAdabasNewDbDlg, ImplOKHdl, OKButton*, /*EMPTYARG*/ )
return 0;
}
}
- else if(m_SYSDEV_File.Len() > 40 || m_TRANSDEV_File.Len() > 40 || m_DATADEV_File.Len() > 40)
+ else if(m_SYSDEV_File.getLength() > 40 || m_TRANSDEV_File.getLength() > 40 || m_DATADEV_File.getLength() > 40)
{
InfoBox aInfo(this,ModuleRes(INFO_STR_MAX_FILE_LENGTH));
String aMsg(aInfo.GetMessText());
@@ -433,22 +433,22 @@ IMPL_LINK( OAdabasNewDbDlg, ImplOKHdl, OKButton*, /*EMPTYARG*/ )
{
// we need url
- String sTemp;
+ rtl::OUString sTemp;
bOk = LocalFileHelper::ConvertPhysicalNameToURL(m_DATADEV_File,sTemp);
m_DATADEV_File = sTemp;
- sTemp = String();
+ sTemp = rtl::OUString();
bOk = LocalFileHelper::ConvertPhysicalNameToURL(m_SYSDEV_File,sTemp);
m_SYSDEV_File = sTemp;
- sTemp = String();
+ sTemp = rtl::OUString();
bOk = LocalFileHelper::ConvertPhysicalNameToURL(m_TRANSDEV_File,sTemp);
m_TRANSDEV_File = sTemp;
}
String aErrorMessage = String(ModuleRes(STR_DEVSPACE_NO_FILE));
- if(!m_SYSDEV_File.Len())
+ if(m_SYSDEV_File.isEmpty())
aErrorMessage.SearchAndReplace(String::CreateFromAscii("$name$"),String::CreateFromAscii("SYSDEVSPACE"));
- else if(!m_TRANSDEV_File.Len())
+ else if(m_TRANSDEV_File.isEmpty())
aErrorMessage.SearchAndReplace(String::CreateFromAscii("$name$"),String::CreateFromAscii("TRANSACTIONLOG"));
- else if(!m_DATADEV_File.Len())
+ else if(m_DATADEV_File.isEmpty())
aErrorMessage.SearchAndReplace(String::CreateFromAscii("$name$"),String::CreateFromAscii("DATDEVSPACE"));
else if(m_ET_SYSUSR.GetText() == m_ET_CONUSR.GetText())
aErrorMessage = String(ModuleRes(STR_NO_SAME_USER));
@@ -479,11 +479,11 @@ IMPL_LINK( OAdabasNewDbDlg, ImplOKHdl, OKButton*, /*EMPTYARG*/ )
aCreateArgs[nPos].Name = PROPERTY_DATABASENAME;
aCreateArgs[nPos++].Value <<= ::rtl::OUString(m_ET_DATABASENAME.GetText().ToUpperAscii());
aCreateArgs[nPos].Name = PROPERTY_DATADEVSPACE;
- aCreateArgs[nPos++].Value <<= ::rtl::OUString(m_DATADEV_File);
+ aCreateArgs[nPos++].Value <<= m_DATADEV_File;
aCreateArgs[nPos].Name = PROPERTY_SYSDEVSPACE;
- aCreateArgs[nPos++].Value <<= ::rtl::OUString(m_SYSDEV_File);
+ aCreateArgs[nPos++].Value <<= m_SYSDEV_File;
aCreateArgs[nPos].Name = PROPERTY_TRANSACTION_LOG;
- aCreateArgs[nPos++].Value <<= ::rtl::OUString(m_TRANSDEV_File);
+ aCreateArgs[nPos++].Value <<= m_TRANSDEV_File;
aCreateArgs[nPos].Name = PROPERTY_DATADEVSIZE;
aCreateArgs[nPos++].Value <<= sal_Int32(m_NF_DATADEVSPACE_SIZE.GetValue()*256);
aCreateArgs[nPos].Name = PROPERTY_LOGDEVSIZE;
@@ -587,7 +587,7 @@ IMPL_LINK( OAdabasNewDbDlg, ButtonClickHdl, Button *, pButton )
else if(pButton == &m_PB_DATADEVSPACE)
aPath = m_DATADEV_File;
- String sUrl;
+ rtl::OUString sUrl;
::utl::LocalFileHelper::ConvertPhysicalNameToURL(aPath,sUrl);
aFileDlg.SetDisplayDirectory(sUrl);
@@ -599,7 +599,7 @@ IMPL_LINK( OAdabasNewDbDlg, ButtonClickHdl, Button *, pButton )
if(pButton == &m_PB_SYSDEVSPACE)
{
m_SYSDEV_File = aUrl.PathToFileName();
- if(m_SYSDEV_File.Len() > 40)
+ if(m_SYSDEV_File.getLength() > 40)
{
InfoBox aInfo(this,ModuleRes(INFO_STR_MAX_FILE_LENGTH));
String aMsg(aInfo.GetMessText());
@@ -613,7 +613,7 @@ IMPL_LINK( OAdabasNewDbDlg, ButtonClickHdl, Button *, pButton )
else if(pButton == &m_PB_TRANSACTIONLOG)
{
m_TRANSDEV_File = aUrl.PathToFileName();
- if(m_TRANSDEV_File.Len() > 40)
+ if(m_TRANSDEV_File.getLength() > 40)
{
InfoBox aInfo(this,ModuleRes(INFO_STR_MAX_FILE_LENGTH));
String aMsg(aInfo.GetMessText());
@@ -627,7 +627,7 @@ IMPL_LINK( OAdabasNewDbDlg, ButtonClickHdl, Button *, pButton )
else if(pButton == &m_PB_DATADEVSPACE)
{
m_DATADEV_File = aUrl.PathToFileName();
- if(m_DATADEV_File.Len() > 40)
+ if(m_DATADEV_File.getLength() > 40)
{
InfoBox aInfo(this,ModuleRes(INFO_STR_MAX_FILE_LENGTH));
String aMsg(aInfo.GetMessText());
@@ -731,8 +731,8 @@ sal_Bool OAdabasNewDbDlg::fillEnvironmentVariable(const ::rtl::OUString& _sVaria
if(osl_getEnvironment(_sVariableName.pData,&pDbVar) == osl_Process_E_None && pDbVar)
{
_rsValue = pDbVar;
- String sTemp;
- LocalFileHelper::ConvertPhysicalNameToURL(_rsValue,sTemp);
+ rtl::OUString sTemp;
+ LocalFileHelper::ConvertPhysicalNameToURL(_rsValue, sTemp);
_rsValue = sTemp;
rtl_uString_release(pDbVar);
pDbVar = NULL;
diff --git a/dbaccess/source/ext/adabas/AdabasNewDb.hxx b/dbaccess/source/ext/adabas/AdabasNewDb.hxx
index 224c175..e8e5acc 100644
--- a/dbaccess/source/ext/adabas/AdabasNewDb.hxx
+++ b/dbaccess/source/ext/adabas/AdabasNewDb.hxx
@@ -99,9 +99,9 @@ namespace adabasui
OKButton m_PB_OK;
CancelButton m_PB_CANCEL;
- String m_SYSDEV_File;
- String m_TRANSDEV_File;
- String m_DATADEV_File;
+ rtl::OUString m_SYSDEV_File;
+ rtl::OUString m_TRANSDEV_File;
+ rtl::OUString m_DATADEV_File;
String m_Backup_File;
String m_ConPwd;
String m_SysPwd;
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index 11c6b17..24e044c 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -277,7 +277,7 @@ DBG_NAME(OConnectionHelper)
if(osl_getEnvironment(sEnvVarName.pData,&pDbVar) == osl_Process_E_None && pDbVar)
{
sAdabasWorkDir = pDbVar;
- String sURL;
+ rtl::OUString sURL;
utl::LocalFileHelper::ConvertPhysicalNameToURL(sAdabasWorkDir,sURL);
sAdabasWorkDir = sURL;
rtl_uString_release(pDbVar);
@@ -288,7 +288,7 @@ DBG_NAME(OConnectionHelper)
if(osl_getEnvironment(sEnvVarName.pData,&pDbVar) == osl_Process_E_None && pDbVar)
{
sAdabasConfigDir = pDbVar;
- String sURL;
+ rtl::OUString sURL;
utl::LocalFileHelper::ConvertPhysicalNameToURL(sAdabasConfigDir,sURL);
sAdabasConfigDir = sURL;
rtl_uString_release(pDbVar);
@@ -299,7 +299,7 @@ DBG_NAME(OConnectionHelper)
if(osl_getEnvironment(sEnvVarName.pData,&pDbVar) == osl_Process_E_None && pDbVar)
{
sRootDir = pDbVar;
- String sURL;
+ rtl::OUString sURL;
utl::LocalFileHelper::ConvertPhysicalNameToURL(sRootDir,sURL);
sRootDir = sURL;
rtl_uString_release(pDbVar);
diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx
index ffba407..9f73597 100644
--- a/dbaccess/source/ui/dlg/dbfindex.cxx
+++ b/dbaccess/source/ui/dlg/dbfindex.cxx
@@ -356,7 +356,7 @@ void ODbaseIndexDialog::Init()
aURL.SetSmartProtocol(INET_PROT_FILE);
for(;pBegin != pEnd;++pBegin)
{
- String aName;
+ rtl::OUString aName;
::utl::LocalFileHelper::ConvertURLToPhysicalName(pBegin->getStr(),aName);
aURL.SetSmartURL(aName);
aExt = aURL.getExtension();
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index 6268bc6..d988171 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -415,7 +415,7 @@ void Desktop::CreateTemporaryDirectory()
::utl::UCBContentHelper::Kill( aOldTempURL );
}
- String aRet;
+ ::rtl::OUString aRet;
::rtl::OUString aTempPath( aTempBaseURL );
// create new current temporary directory
diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx
index f1bfbd2..a182a36 100644
--- a/editeng/source/items/flditem.cxx
+++ b/editeng/source/items/flditem.cxx
@@ -766,7 +766,7 @@ XubString SvxExtFileField::GetFormatted() const
if( INET_PROT_NOT_VALID == aURLObj.GetProtocol() )
{
// invalid? try to interpret string as system file name
- String aURLStr;
+ rtl::OUString aURLStr;
::utl::LocalFileHelper::ConvertPhysicalNameToURL( aFile, aURLStr );
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 86d5b4f..bd6ff45 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -4370,7 +4370,7 @@ SdrObject* SvxMSDffManager::ImportGraphic( SvStream& rSt, SfxItemSet& rSet, cons
INetURLObject aAbsURL;
if ( !INetURLObject( maBaseURL ).GetNewAbsURL( rtl::OUStringToOString(aFileName, RTL_TEXTENCODING_UTF8), &aAbsURL ) )
{
- String aValidURL;
+ rtl::OUString aValidURL;
if( ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aFileName, aValidURL ) )
aAbsURL = INetURLObject( aValidURL );
}
diff --git a/filter/source/msfilter/msfiltertracer.cxx b/filter/source/msfilter/msfiltertracer.cxx
index 0bc2ccb..e9da59d 100644
--- a/filter/source/msfilter/msfiltertracer.cxx
+++ b/filter/source/msfilter/msfiltertracer.cxx
@@ -88,7 +88,7 @@ MSFilterTracer::MSFilterTracer( const ::rtl::OUString& rConfigPath, uno::Sequenc
aLogFile = INetURLObject( aPath );
else
{
- String aURLStr;
+ rtl::OUString aURLStr;
if( ::utl::LocalFileHelper::ConvertPhysicalNameToURL( Application::GetAppFileName(), aURLStr ) )
{
aLogFile = INetURLObject(aURLStr);
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index 8a5869c..8dd7068 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -394,7 +394,7 @@ sal_Bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue
if( aURL.GetProtocol() != INET_PROT_FILE )
{
- String aTmp;
+ rtl::OUString aTmp;
if( ::utl::LocalFileHelper::ConvertPhysicalNameToURL( rFile, aTmp ) )
aURL = INetURLObject(aTmp);
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 3743c75..2db644b 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -249,7 +249,7 @@ namespace
INetURLObject aURL( aNewFile );
if ( INET_PROT_NOT_VALID == aURL.GetProtocol() )
{
- String sURL;
+ rtl::OUString sURL;
if ( ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aNewFile, sURL ) )
aURL = INetURLObject( sURL );
}
@@ -344,7 +344,7 @@ namespace
{
INetURLObject aCurrentURL;
- String sURL;
+ rtl::OUString sURL;
if ( ::utl::LocalFileHelper::ConvertPhysicalNameToURL( sCurrentToken, sURL ) )
aCurrentURL = INetURLObject( sURL );
else
diff --git a/framework/source/classes/droptargetlistener.cxx b/framework/source/classes/droptargetlistener.cxx
index 98e159a..c1a422f 100644
--- a/framework/source/classes/droptargetlistener.cxx
+++ b/framework/source/classes/droptargetlistener.cxx
@@ -219,7 +219,7 @@ sal_Bool DropTargetListener::implts_IsDropFormatSupported( SotFormatStringId nFo
void DropTargetListener::implts_OpenFile( const String& rFilePath )
{
- String aFileURL;
+ rtl::OUString aFileURL;
if ( !::utl::LocalFileHelper::ConvertPhysicalNameToURL( rFilePath, aFileURL ) )
aFileURL = rFilePath;
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index 51ec80f..7ef9502 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -689,17 +689,17 @@ IMPL_LINK( SubstitutePathVariables, implts_ConfigurationNotify, SubstitutePathNo
rtl::OUString SubstitutePathVariables::ConvertOSLtoUCBURL( const rtl::OUString& aOSLCompliantURL ) const
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "SubstitutePathVariables::ConvertOSLtoUCBURL" );
- String aResult;
+ rtl::OUString aResult;
rtl::OUString aTemp;
osl::FileBase::getSystemPathFromFileURL( aOSLCompliantURL, aTemp );
utl::LocalFileHelper::ConvertPhysicalNameToURL( aTemp, aResult );
// Not all OSL URL's can be mapped to UCB URL's!
- if ( aResult.Len() == 0 )
+ if ( aResult.isEmpty() )
return aOSLCompliantURL;
else
- return rtl::OUString( aResult );
+ return aResult;
}
rtl::OUString SubstitutePathVariables::GetWorkPath() const
diff --git a/lingucomponent/source/languageguessing/guesslang.cxx b/lingucomponent/source/languageguessing/guesslang.cxx
index 4473dd0..21fcbe3 100644
--- a/lingucomponent/source/languageguessing/guesslang.cxx
+++ b/lingucomponent/source/languageguessing/guesslang.cxx
@@ -145,13 +145,13 @@ void LangGuess_Impl::EnsureInitialized()
m_bInitialized = true;
// set default fingerprint path to where those get installed
- String aPhysPath;
- String aURL( SvtPathOptions().GetFingerprintPath() );
+ rtl::OUString aPhysPath;
+ rtl::OUString aURL( SvtPathOptions().GetFingerprintPath() );
utl::LocalFileHelper::ConvertURLToPhysicalName( aURL, aPhysPath );
#ifdef WNT
- aPhysPath += '\\';
+ aPhysPath = aPhysPath + rtl::OUString(static_cast<sal_Unicode>('\\'));
#else
- aPhysPath += '/';
+ aPhysPath = aPhysPath + rtl::OUString(static_cast<sal_Unicode>('/'));
#endif
SetFingerPrintsDB( aPhysPath );
diff --git a/sc/source/core/data/globalx.cxx b/sc/source/core/data/globalx.cxx
index bc71c67..092d117 100644
--- a/sc/source/core/data/globalx.cxx
+++ b/sc/source/core/data/globalx.cxx
@@ -70,7 +70,7 @@ void ScGlobal::InitAddIns()
{
// use LocalFileHelper to convert the path to a URL that always points
// to the file on the server
- String aUrl;
+ rtl::OUString aUrl;
if ( utl::LocalFileHelper::ConvertPhysicalNameToURL( aPath, aUrl ) )
aPath = aUrl;
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index 41a5363..c2aec1e 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -3270,7 +3270,7 @@ sal_uLong EasyFile::createFileName( const String& rURL, String& rFileName )
if( aURL.GetProtocol() == INET_PROT_NOT_VALID )
{
- String aURLStr;
+ rtl::OUString aURLStr;
::utl::LocalFileHelper::ConvertPhysicalNameToURL( rURL, aURLStr );
aURL = INetURLObject( aURLStr );
}
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 2e8493d..203d2f3 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -1986,12 +1986,12 @@ String ImplSdPPTImport::ReadSound(sal_uInt32 nSoundRef) const
String ImplSdPPTImport::ReadMedia( sal_uInt32 nMediaRef ) const
{
- String aRetVal;
+ rtl::OUString aRetVal;
DffRecordHeader* pHd( const_cast<ImplSdPPTImport*>(this)->aDocRecManager.GetRecordHeader( PPT_PST_ExObjList, SEEK_FROM_BEGINNING ) );
if ( pHd )
{
pHd->SeekToContent( rStCtrl );
- while ( ( rStCtrl.Tell() < pHd->GetRecEndFilePos() ) && !aRetVal.Len() )
+ while ( ( rStCtrl.Tell() < pHd->GetRecEndFilePos() ) && aRetVal.isEmpty() )
{
DffRecordHeader aHdMovie;
rStCtrl >> aHdMovie;
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index 84d2237..54c675c 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -585,7 +585,7 @@ sal_Bool SdNavigatorWin::InsertFile(const String& rFileName)
if( aURL.GetProtocol() == INET_PROT_NOT_VALID )
{
- String aURLStr;
+ rtl::OUString aURLStr;
::utl::LocalFileHelper::ConvertPhysicalNameToURL( rFileName, aURLStr );
aURL = INetURLObject( aURLStr );
}
diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index f42ad34..9b686bc 100644
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -393,7 +393,7 @@ IMPL_LINK( View, DropInsertFileHdl, Timer*, EMPTYARG )
if( aURL.GetProtocol() == INET_PROT_NOT_VALID )
{
- String aURLStr;
+ rtl::OUString aURLStr;
::utl::LocalFileHelper::ConvertPhysicalNameToURL( aCurrentDropFile, aURLStr );
aURL = INetURLObject( aURLStr );
}
diff --git a/sfx2/inc/sfx2/docfile.hxx b/sfx2/inc/sfx2/docfile.hxx
index 62f93ee..f05e7e4 100644
--- a/sfx2/inc/sfx2/docfile.hxx
+++ b/sfx2/inc/sfx2/docfile.hxx
@@ -89,7 +89,7 @@ class SFX2_DLLPUBLIC SfxMedium : public SvRefBase
bTriedStorage;
StreamMode nStorOpenMode;
INetURLObject* pURLObj;
- String aName;
+ rtl::OUString aName;
SvGlobalName aFilterClass;
SvStream* pInStream;
SvStream* pOutStream;
@@ -164,7 +164,7 @@ public:
::com::sun::star::util::DateTime GetInitFileDate( sal_Bool bIgnoreOldValue );
::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > GetContent() const;
- const String& GetPhysicalName() const;
+ const rtl::OUString& GetPhysicalName() const;
sal_Bool IsRemote();
sal_Bool IsOpen() const; // { return aStorage.Is() || pInStream; }
void DownLoad( const Link& aLink = Link());
@@ -267,7 +267,7 @@ public:
SAL_DLLPRIVATE sal_Bool IsPreview_Impl();
SAL_DLLPRIVATE void ClearBackup_Impl();
SAL_DLLPRIVATE void Done_Impl( ErrCode );
- SAL_DLLPRIVATE void SetPhysicalName_Impl(const String& rName);
+ SAL_DLLPRIVATE void SetPhysicalName_Impl(const rtl::OUString& rName);
SAL_DLLPRIVATE void CanDisposeStorage_Impl( sal_Bool bDisposeStorage );
SAL_DLLPRIVATE sal_Bool WillDisposeStorageOnClose_Impl();
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index ca9060a..2a17778 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -445,7 +445,7 @@ sal_Bool SfxApplication::GetOptions( SfxItemSet& rSet )
{
const String aName( SfxResId( CONFIG_PATH_START + nProp ) );
aNames.InsertValue( nProp, aName );
- String aValue;
+ rtl::OUString aValue;
switch ( nProp )
{
case SvtPathOptions::PATH_ADDIN: ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aPathCfg.GetAddinPath(), aValue ); break;
@@ -816,7 +816,7 @@ void SfxApplication::SetOptions(const SfxItemSet &rSet)
{
case SvtPathOptions::PATH_ADDIN:
{
- String aTmp;
+ rtl::OUString aTmp;
if( ::utl::LocalFileHelper::ConvertURLToPhysicalName( sValue, aTmp ) )
aPathOptions.SetAddinPath( aTmp );
break;
@@ -832,7 +832,7 @@ void SfxApplication::SetOptions(const SfxItemSet &rSet)
case SvtPathOptions::PATH_FAVORITES: aPathOptions.SetFavoritesPath( sValue );break;
case SvtPathOptions::PATH_FILTER:
{
- String aTmp;
+ rtl::OUString aTmp;
if( ::utl::LocalFileHelper::ConvertURLToPhysicalName( sValue, aTmp ) )
aPathOptions.SetFilterPath( aTmp );
break;
@@ -841,7 +841,7 @@ void SfxApplication::SetOptions(const SfxItemSet &rSet)
case SvtPathOptions::PATH_GRAPHIC: aPathOptions.SetGraphicPath( sValue );break;
case SvtPathOptions::PATH_HELP:
{
- String aTmp;
+ rtl::OUString aTmp;
if( ::utl::LocalFileHelper::ConvertURLToPhysicalName( sValue, aTmp ) )
aPathOptions.SetHelpPath( aTmp );
break;
@@ -850,7 +850,7 @@ void SfxApplication::SetOptions(const SfxItemSet &rSet)
case SvtPathOptions::PATH_LINGUISTIC: aPathOptions.SetLinguisticPath( sValue );break;
case SvtPathOptions::PATH_MODULE:
{
- String aTmp;
+ rtl::OUString aTmp;
if( ::utl::LocalFileHelper::ConvertURLToPhysicalName( sValue, aTmp ) )
aPathOptions.SetModulePath( aTmp );
break;
@@ -859,7 +859,7 @@ void SfxApplication::SetOptions(const SfxItemSet &rSet)
case SvtPathOptions::PATH_PALETTE: aPathOptions.SetPalettePath( sValue );break;
case SvtPathOptions::PATH_PLUGIN:
{
- String aTmp;
+ rtl::OUString aTmp;
if( ::utl::LocalFileHelper::ConvertURLToPhysicalName( sValue, aTmp ) )
aPathOptions.SetPluginPath( aTmp );
break;
@@ -867,7 +867,7 @@ void SfxApplication::SetOptions(const SfxItemSet &rSet)
case SvtPathOptions::PATH_STORAGE:
{
- String aTmp;
+ rtl::OUString aTmp;
if( ::utl::LocalFileHelper::ConvertURLToPhysicalName( sValue, aTmp ) )
aPathOptions.SetStoragePath( aTmp );
break;
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index 1b98252..7cddda5 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -371,7 +371,7 @@ sal_Bool SvFileObject::GetGraphic_Impl( Graphic& rGrf, SvStream* pStream )
{
DBG_WARNING3( "Graphic error [%d] - [%s] URL[%s]",
nRes,
- xMed->GetPhysicalName().GetBuffer(),
+ xMed->GetPhysicalName().getStr(),
sFileNm.GetBuffer() );
}
else
diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx
index 2a2fb43..1f48420 100644
--- a/sfx2/source/appl/linkmgr2.cxx
+++ b/sfx2/source/appl/linkmgr2.cxx
@@ -427,7 +427,7 @@ void LinkManager::ReconnectDdeLink(SfxObjectShell& rServer)
// DDE connections between OOo apps are always named 'soffice'.
continue;
- String aTmp;
+ rtl::OUString aTmp;
OUString aURL = aFile;
if (utl::LocalFileHelper::ConvertPhysicalNameToURL(aFile, aTmp))
aURL = aTmp;
diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx
index 4fe3e04..7876858 100644
--- a/sfx2/source/doc/docfac.cxx
+++ b/sfx2/source/doc/docfac.cxx
@@ -222,7 +222,7 @@ void SfxObjectFactory::SetSystemTemplate( const String& rServiceName, const Stri
static ::rtl::OUString DEF_TPL_STR(RTL_CONSTASCII_USTRINGPARAM("/soffice."));
- String sURL;
+ rtl::OUString sURL;
String sPath;
sal_Unicode aPathBuffer[nMaxPathSize];
if ( SystemPath::GetUserTemplateLocation( aPathBuffer, nMaxPathSize ))
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 0332493..250f586 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -516,12 +516,12 @@ Reference < XContent > SfxMedium::GetContent() const
else
{
// TODO: OSL_FAIL("SfxMedium::GetContent()\nCreate Content? This code exists as fallback only. Please clarify, why its used.");
- String aURL;
- if ( aName.Len() )
+ rtl::OUString aURL;
+ if ( !aName.isEmpty() )
::utl::LocalFileHelper::ConvertPhysicalNameToURL( aName, aURL );
else if ( aLogicName.Len() )
aURL = GetURLObject().GetMainURL( INetURLObject::NO_DECODE );
- if ( aURL.Len() )
+ if (!aURL.isEmpty() )
::ucbhelper::Content::create( aURL, xEnv, pImp->aContent );
}
}
@@ -690,9 +690,9 @@ sal_Bool SfxMedium::CloseOutStream_Impl()
}
//------------------------------------------------------------------
-const String& SfxMedium::GetPhysicalName() const
+const rtl::OUString& SfxMedium::GetPhysicalName() const
{
- if ( !aName.Len() && aLogicName.Len() )
+ if ( aName.isEmpty() && aLogicName.Len() )
(( SfxMedium*)this)->CreateFileStream();
// return the name then
@@ -749,7 +749,7 @@ sal_Bool SfxMedium::IsStorage()
if ( pImp->pTempFile )
{
- String aURL;
+ rtl::OUString aURL;
if ( !::utl::LocalFileHelper::ConvertPhysicalNameToURL( aName, aURL ) )
{
OSL_FAIL("Physical name not convertable!");
@@ -1366,7 +1366,7 @@ uno::Reference < embed::XStorage > SfxMedium::GetStorage( sal_Bool bCreateTempIf
nStorOpenMode = SFX_STREAM_READONLY;
pImp->xStorage = comphelper::OStorageHelper::GetStorageFromURL( aTmpName, embed::ElementModes::READ );
pImp->bStorageBasedOnInStream = sal_False;
- String aTemp;
+ rtl::OUString aTemp;
::utl::LocalFileHelper::ConvertURLToPhysicalName( aTmpName, aTemp );
SetPhysicalName_Impl( aTemp );
@@ -1560,7 +1560,7 @@ sal_Bool SfxMedium::StorageCommit_Impl()
// connect the medium to the temporary file of the storage
pImp->aContent = ::ucbhelper::Content();
aName = aBackupExc.TemporaryFileURL;
- OSL_ENSURE( aName.Len(), "The exception _must_ contain the temporary URL!\n" );
+ OSL_ENSURE( !aName.isEmpty(), "The exception _must_ contain the temporary URL!\n" );
}
}
@@ -1779,7 +1779,7 @@ sal_Bool SfxMedium::TryDirectTransfer( const ::rtl::OUString& aURL, SfxItemSet&
void SfxMedium::Transfer_Impl()
{
// The transfer is required only in two cases: either if there is a temporary file or if there is a salvage item
- String aNameURL;
+ rtl::OUString aNameURL;
if ( pImp->pTempFile )
aNameURL = pImp->pTempFile->GetURL();
else if ( aLogicName.Len() && pImp->m_bSalvageMode )
@@ -1789,7 +1789,7 @@ void SfxMedium::Transfer_Impl()
OSL_FAIL( "The medium name is not convertable!\n" );
}
- if ( aNameURL.Len() && ( !eError || (eError & ERRCODE_WARNING_MASK) ) )
+ if ( !aNameURL.isEmpty() && ( !eError || (eError & ERRCODE_WARNING_MASK) ) )
{
RTL_LOGFILE_CONTEXT( aLog, "sfx2 (mv76033) SfxMedium::Transfer_Impl, copying to target" );
@@ -2191,7 +2191,7 @@ void SfxMedium::GetLockingStream_Impl()
aMedium[comphelper::MediaDescriptor::PROP_STREAM()] >>= pImp->m_xLockingStream;
aMedium[comphelper::MediaDescriptor::PROP_INPUTSTREAM()] >>= xInputStream;
- if ( !pImp->pTempFile && !aName.Len() )
+ if ( !pImp->pTempFile && aName.isEmpty() )
{
// the medium is still based on the original file, it makes sence to initialize the streams
if ( pImp->m_xLockingStream.is() )
@@ -2235,8 +2235,8 @@ void SfxMedium::GetMedium_Impl()
else
{
uno::Sequence < beans::PropertyValue > xProps;
- String aFileName;
- if ( aName.Len() )
+ rtl::OUString aFileName;
+ if (!aName.isEmpty())
{
if ( !::utl::LocalFileHelper::ConvertPhysicalNameToURL( aName, aFileName ) )
{
@@ -2418,9 +2418,10 @@ void SfxMedium::Init_Impl()
// try to convert the URL into a physical name - but never change a physical name
// physical name may be set if the logical name is changed after construction
- if ( !aName.Len() )
+ if ( aName.isEmpty() )
::utl::LocalFileHelper::ConvertURLToPhysicalName( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ), aName );
- else {
+ else
+ {
DBG_ASSERT( pSalvageItem, "Suspicious change of logical name!" );
}
}
@@ -2735,7 +2736,7 @@ const String& SfxMedium::GetOrigURL() const
//----------------------------------------------------------------
-void SfxMedium::SetPhysicalName_Impl( const String& rNameP )
+void SfxMedium::SetPhysicalName_Impl( const rtl::OUString& rNameP )
{
if ( rNameP != aName )
{
@@ -2745,7 +2746,7 @@ void SfxMedium::SetPhysicalName_Impl( const String& rNameP )
pImp->pTempFile = NULL;
}
- if ( aName.Len() || rNameP.Len() )
+ if ( !aName.isEmpty() || !rNameP.isEmpty() )
pImp->aContent = ::ucbhelper::Content();
aName = rNameP;
@@ -2909,9 +2910,9 @@ SfxMedium::~SfxMedium()
delete pSet;
- if( pImp->bIsTemp && aName.Len() )
+ if( pImp->bIsTemp && !aName.isEmpty() )
{
- String aTemp;
+ rtl::OUString aTemp;
if ( !::utl::LocalFileHelper::ConvertPhysicalNameToURL( aName, aTemp ))
{
OSL_FAIL("Physical name not convertable!");
@@ -3053,7 +3054,7 @@ const uno::Sequence < util::RevisionTag >& SfxMedium::GetVersionList( bool _bNoR
{
// if the medium has no name, then this medium should represent a new document and can have no version info
if ( ( !_bNoReload || !pImp->m_bVersionsAlreadyLoaded ) && !pImp->aVersions.getLength() &&
- ( aName.Len() || aLogicName.Len() ) && GetStorage().is() )
+ ( !aName.isEmpty() || aLogicName.Len() ) && GetStorage().is() )
{
uno::Reference < document::XDocumentRevisionListPersistence > xReader( comphelper::getProcessServiceFactory()->createInstance(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.DocumentRevisionListPersistence")) ), uno::UNO_QUERY );
@@ -3255,7 +3256,7 @@ void SfxMedium::CreateTempFile( sal_Bool bReplace )
pImp->pTempFile->EnableKillingFile( sal_True );
aName = pImp->pTempFile->GetFileName();
::rtl::OUString aTmpURL = pImp->pTempFile->GetURL();
- if ( !aName.Len() || !aTmpURL.getLength() )
+ if ( aName.isEmpty() || aTmpURL.isEmpty() )
{
SetError( ERRCODE_IO_CANTWRITE, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
return;
@@ -3352,7 +3353,7 @@ void SfxMedium::CreateTempFileNoCopy()
pImp->pTempFile = new ::utl::TempFile();
pImp->pTempFile->EnableKillingFile( sal_True );
aName = pImp->pTempFile->GetFileName();
- if ( !aName.Len() )
+ if ( aName.isEmpty() )
{
SetError( ERRCODE_IO_CANTWRITE, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
return;
diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index 94e6326..6938099 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -254,7 +254,7 @@ IMPL_LINK( SfxNewFileDialog_Impl, Update, void *, EMPTYARG )
{
// temp. fix until Templates are managed by UCB compatible service
// does NOT work with locally cached components !
- String aTemp;
+ rtl::OUString aTemp;
utl::LocalFileHelper::ConvertPhysicalNameToURL( aFileName, aTemp );
aFileName = aTemp;
}
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 8355ebd..20f56e3 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -603,7 +603,7 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed )
SFX_ITEMSET_ARG( pSet, pBaseItem, SfxStringItem,
SID_BASEURL, sal_False);
- String aBaseURL;
+ rtl::OUString aBaseURL;
SFX_ITEMSET_ARG( pMedium->GetItemSet(), pSalvageItem, SfxStringItem, SID_DOC_SALVAGE, sal_False);
if( pBaseItem )
aBaseURL = pBaseItem->GetValue();
@@ -611,7 +611,7 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed )
{
if ( pSalvageItem )
{
- String aName( pMed->GetPhysicalName() );
+ rtl::OUString aName( pMed->GetPhysicalName() );
::utl::LocalFileHelper::ConvertPhysicalNameToURL( aName, aBaseURL );
}
else
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index 47105d7..01087cd 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -409,7 +409,7 @@ SfxObjectShell::~SfxObjectShell()
// The removing of the temporary file must be done as the latest step in the document destruction
if ( pImp->aTempName.Len() )
{
- String aTmp;
+ rtl::OUString aTmp;
::utl::LocalFileHelper::ConvertPhysicalNameToURL( pImp->aTempName, aTmp );
::utl::UCBContentHelper::Kill( aTmp );
}
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index e55e43a..8e123e3 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -445,7 +445,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
// doing
- String aTemp;
+ rtl::OUString aTemp;
utl::LocalFileHelper::ConvertPhysicalNameToURL( pMed->GetPhysicalName(), aTemp );
INetURLObject aPhysObj( aTemp );
SFX_ITEMSET_ARG( pSh->GetMedium()->GetItemSet(),
diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx
index 897f9fe..d6a5f53 100644
--- a/sot/source/sdstor/storage.cxx
+++ b/sot/source/sdstor/storage.cxx
@@ -519,7 +519,7 @@ void SotStorage::CreateStorage( sal_Bool bForceUCBStorage, StreamMode nMode, Sto
INetURLObject aObj( m_aName );
if ( aObj.GetProtocol() == INET_PROT_NOT_VALID )
{
- String aURL;
+ rtl::OUString aURL;
::utl::LocalFileHelper::ConvertPhysicalNameToURL( m_aName, aURL );
aObj.SetURL( aURL );
m_aName = aObj.GetMainURL( INetURLObject::NO_DECODE );
@@ -738,7 +738,7 @@ sal_Bool SotStorage::IsStorageFile( const String & rFileName )
INetURLObject aObj( aName );
if ( aObj.GetProtocol() == INET_PROT_NOT_VALID )
{
- String aURL;
+ rtl::OUString aURL;
::utl::LocalFileHelper::ConvertPhysicalNameToURL( aName, aURL );
aObj.SetURL( aURL );
aName = aObj.GetMainURL( INetURLObject::NO_DECODE );
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index bc2f100..c1981aa 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -3217,7 +3217,7 @@ sal_Bool UCBStorage::Equals( const BaseStorage& rStorage ) const
sal_Bool UCBStorage::IsStorageFile( const String& rFileName )
{
- String aFileURL = rFileName;
+ rtl::OUString aFileURL = rFileName;
INetURLObject aObj( aFileURL );
if ( aObj.GetProtocol() == INET_PROT_NOT_VALID )
{
diff --git a/svl/source/misc/folderrestriction.cxx b/svl/source/misc/folderrestriction.cxx
index c03999a..8de4d29 100644
--- a/svl/source/misc/folderrestriction.cxx
+++ b/svl/source/misc/folderrestriction.cxx
@@ -54,7 +54,7 @@ static void convertStringListToUrls (
{
INetURLObject aCurrentURL;
- String sURL;
+ rtl::OUString sURL;
if ( ::utl::LocalFileHelper::ConvertPhysicalNameToURL( sCurrentToken, sURL ) )
aCurrentURL = INetURLObject( sURL );
else
diff --git a/svl/source/misc/restrictedpaths.cxx b/svl/source/misc/restrictedpaths.cxx
index ffdcdc6..1e6e74b 100644
--- a/svl/source/misc/restrictedpaths.cxx
+++ b/svl/source/misc/restrictedpaths.cxx
@@ -69,7 +69,7 @@ namespace svt
{
INetURLObject aCurrentURL;
- String sURL;
+ rtl::OUString sURL;
if ( ::utl::LocalFileHelper::ConvertPhysicalNameToURL( sCurrentToken, sURL ) )
aCurrentURL = INetURLObject( sURL );
else
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index 21547e3..39461a6 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -260,7 +260,7 @@ IMPL_STATIC_LINK( SvtMatchContext_Impl, Select_Impl, void*, )
String sCompletion( *(*pThis->pCompletions)[nPos] );
// convert the file into an URL
- String sURL( sCompletion );
+ rtl::OUString sURL( sCompletion );
::utl::LocalFileHelper::ConvertPhysicalNameToURL( sCompletion, sURL );
// note: if this doesn't work, we're not interested in: we're checking the
// untouched sCompletion then
@@ -273,7 +273,7 @@ IMPL_STATIC_LINK( SvtMatchContext_Impl, Select_Impl, void*, )
continue;
}
}
- if (( sURL.Len() > 0 ) && ( sURL.GetChar(sURL.Len()-1) != '/' ))
+ if (( sURL.getLength() > 0 ) && ( sURL[sURL.getLength()-1] != '/' ))
{
String sUpperURL( sURL );
sUpperURL.ToUpperAscii();
diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx
index eec9b4f..3b4bfc4 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -215,7 +215,7 @@ void GraphicObject::ImplAutoSwapIn()
{
if( HasLink() )
{
- String aURLStr;
+ rtl::OUString aURLStr;
if( ::utl::LocalFileHelper::ConvertPhysicalNameToURL( GetLink(), aURLStr ) )
{
diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx
index c4deeec..c64aa8b 100644
--- a/svtools/source/misc/templatefoldercache.cxx
+++ b/svtools/source/misc/templatefoldercache.cxx
@@ -591,7 +591,7 @@ namespace svt
aParser.SetURL( _rPath, INetURLObject::WAS_ENCODED );
if ( INET_PROT_NOT_VALID == aParser.GetProtocol() )
{
- String sURL;
+ rtl::OUString sURL;
LocalFileHelper::ConvertPhysicalNameToURL( _rPath, sURL );
aParser.SetURL( sURL, INetURLObject::WAS_ENCODED );
}
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index 653c9ae..84e4688 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -1523,7 +1523,7 @@ sal_Bool BrokenRecoveryDialog::isExecutionNeeded()
IMPL_LINK( BrokenRecoveryDialog, OkButtonHdl, void*, EMPTYARG )
{
String sPhysicalPath = m_aSaveDirED.GetText().EraseLeadingChars().EraseTrailingChars();
- String sURL;
+ rtl::OUString sURL;
::utl::LocalFileHelper::ConvertPhysicalNameToURL( sPhysicalPath, sURL );
m_sSavePath = sURL;
while (!m_sSavePath.getLength())
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index 9ce8d48..c64fbb6 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -1263,7 +1263,7 @@ sal_Bool GalleryTheme::InsertTransferable( const uno::Reference< datatransfer::X
if( aURL.GetProtocol() == INET_PROT_NOT_VALID )
{
- String aLocalURL;
+ rtl::OUString aLocalURL;
if( ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aFile, aLocalURL ) )
aURL = INetURLObject( aLocalURL );
@@ -1516,7 +1516,7 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm )
}
else
{
- String aLocalURL;
+ rtl::OUString aLocalURL;
pObj->aURL = INetURLObject( aFileName );
diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx
index 5b0afd8..cc2dfe3 100644
--- a/svx/source/svdraw/svdotxln.cxx
+++ b/svx/source/svdraw/svdotxln.cxx
@@ -227,7 +227,7 @@ bool SdrTextObj::LoadText(const String& rFileName, const String& /*rFilterName*/
if( aFileURL.GetProtocol() == INET_PROT_NOT_VALID )
{
- String aFileURLStr;
+ rtl::OUString aFileURLStr;
if( ::utl::LocalFileHelper::ConvertPhysicalNameToURL( rFileName, aFileURLStr ) )
aFileURL = INetURLObject( aFileURLStr );
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index be42afc..c1cd7b4 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -1554,7 +1554,7 @@ bool SvxGraphicObject::setPropertyValueImpl( const ::rtl::OUString& rName, const
if( aURLObj.GetProtocol() == INET_PROT_NOT_VALID )
{
- String aValidURL;
+ rtl::OUString aValidURL;
if( ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aURL, aValidURL ) )
aURLObj = INetURLObject( aValidURL );
diff --git a/sw/source/core/swg/SwXMLTextBlocks.cxx b/sw/source/core/swg/SwXMLTextBlocks.cxx
index 360376d..5a19bc6 100644
--- a/sw/source/core/swg/SwXMLTextBlocks.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks.cxx
@@ -529,11 +529,11 @@ sal_Bool SwXMLTextBlocks::IsOnlyTextBlock( sal_uInt16 nIdx ) const
sal_Bool SwXMLTextBlocks::IsFileUCBStorage( const String & rFileName)
{
- String aName( rFileName );
+ rtl::OUString aName( rFileName );
INetURLObject aObj( aName );
if ( aObj.GetProtocol() == INET_PROT_NOT_VALID )
{
- String aURL;
+ rtl::OUString aURL;
::utl::LocalFileHelper::ConvertPhysicalNameToURL( aName, aURL );
aObj.SetURL( aURL );
aName = aObj.GetMainURL( INetURLObject::NO_DECODE );
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 0ab1cf6..c14e189 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -4251,11 +4251,11 @@ void SwWW8ImplReader::ReadDocInfo()
aSttb.Print( stderr );
#endif
String sPath = aSttb.getStringAtIndex( 0x1 );
- String aURL;
+ rtl::OUString aURL;
// attempt to convert to url ( won't work for obvious reasons on linux
if ( sPath.Len() )
::utl::LocalFileHelper::ConvertPhysicalNameToURL( sPath, aURL );
- if ( aURL.Len() )
+ if (!aURL.getLength())
xDocProps->setTemplateURL( aURL );
else
xDocProps->setTemplateURL( sPath );
diff --git a/unotools/inc/unotools/localfilehelper.hxx b/unotools/inc/unotools/localfilehelper.hxx
index ebccc43..9feed58 100644
--- a/unotools/inc/unotools/localfilehelper.hxx
+++ b/unotools/inc/unotools/localfilehelper.hxx
@@ -44,7 +44,7 @@ namespace utl
If no UCP is available for the local file system, sal_False and an empty URL is returned.
Returning sal_True and an empty URL means that the URL doesn't point to a local file.
*/
- static sal_Bool ConvertPhysicalNameToURL( const String& rName, String& rReturn );
+ static bool ConvertPhysicalNameToURL(const rtl::OUString& rName, rtl::OUString& rReturn);
static sal_Bool ConvertSystemPathToURL( const String& rName, const String& rBaseURL, String& rReturn );
/**
@@ -53,12 +53,11 @@ namespace utl
otherwise sal_True and a valid URL, because a file name can always be converted if a UCP for the local
file system is present ( watch: this doesn't mean that this file really exists! )
*/
- static sal_Bool ConvertURLToPhysicalName( const String& rName, String& rReturn );
- static bool ConvertURLToPhysicalName( const rtl::OUString& rName, rtl::OUString& rReturn );
+ static bool ConvertURLToPhysicalName( const rtl::OUString& rName, rtl::OUString& rReturn );
static sal_Bool ConvertURLToSystemPath( const String& rName, String& rReturn );
- static sal_Bool IsLocalFile( const String& rName );
- static sal_Bool IsFileContent( const String& rName );
+ static sal_Bool IsLocalFile(const rtl::OUString& rName);
+ static sal_Bool IsFileContent(const rtl::OUString& rName);
static ::com::sun::star::uno::Sequence< ::rtl::OUString >
GetFolderContents( const ::rtl::OUString& rFolder, sal_Bool bFolder );
diff --git a/unotools/source/config/defaultoptions.cxx b/unotools/source/config/defaultoptions.cxx
index eb8c600..1b9d386 100644
--- a/unotools/source/config/defaultoptions.cxx
+++ b/unotools/source/config/defaultoptions.cxx
@@ -199,7 +199,7 @@ void SvtDefaultOptions_Impl::Commit()
String SvtDefaultOptions_Impl::GetDefaultPath( sal_uInt16 nId ) const
{
- String aRet;
+ rtl::OUString aRet;
sal_uInt16 nIdx = 0;
while ( PathMap_Impl[nIdx]._ePath <= SvtPathOptions::PATH_WORK )
@@ -213,7 +213,7 @@ String SvtDefaultOptions_Impl::GetDefaultPath( sal_uInt16 nId ) const
nId == SvtPathOptions::PATH_MODULE ||
nId == SvtPathOptions::PATH_PLUGIN )
{
- String aTmp;
+ rtl::OUString aTmp;
::utl::LocalFileHelper::ConvertPhysicalNameToURL( aRet, aTmp );
aRet = aTmp;
}
diff --git a/unotools/source/config/pathoptions.cxx b/unotools/source/config/pathoptions.cxx
index 74f19dd..3be2d1c 100644
--- a/unotools/source/config/pathoptions.cxx
+++ b/unotools/source/config/pathoptions.cxx
@@ -255,7 +255,7 @@ const String& SvtPathOptions_Impl::GetPath( SvtPathOptions::Pathes ePath )
try
{
OUString aPathValue;
- String aResult;
+ OUString aResult;
sal_Int32 nHandle = m_aMapEnumToPropHandle[ (sal_Int32)ePath ];
// Substitution is done by the service itself using the substition service
@@ -290,7 +290,7 @@ void SvtPathOptions_Impl::SetPath( SvtPathOptions::Pathes ePath, const String& r
if ( ePath < SvtPathOptions::PATH_COUNT )
{
- String aResult;
+ OUString aResult;
OUString aNewValue;
Any a;
@@ -413,7 +413,7 @@ OUString SvtPathOptions_Impl::SubstVar( const OUString& rVar ) const
if ( bConvertLocal )
{
// Convert the URL to a system path for special path variables
- String aReturn;
+ rtl::OUString aReturn;
utl::LocalFileHelper::ConvertURLToPhysicalName( aWorkText, aReturn );
return aReturn;
}
@@ -949,7 +949,7 @@ sal_Bool SvtPathOptions::SearchFile( String& rIniFile, Pathes ePath )
if ( aObj.HasError() )
{
bIsURL = sal_False;
- String aURL;
+ rtl::OUString aURL;
if ( LocalFileHelper::ConvertPhysicalNameToURL( aPathToken, aURL ) )
aObj.SetURL( aURL );
}
@@ -978,8 +978,12 @@ sal_Bool SvtPathOptions::SearchFile( String& rIniFile, Pathes ePath )
if ( bRet )
{
if ( !bIsURL )
+ {
+ rtl::OUString sTmp(rIniFile);
::utl::LocalFileHelper::ConvertURLToPhysicalName(
- aObj.GetMainURL( INetURLObject::NO_DECODE ), rIniFile );
+ aObj.GetMainURL( INetURLObject::NO_DECODE ), sTmp );
+ rIniFile = sTmp;
+ }
else
rIniFile = aObj.GetMainURL( INetURLObject::NO_DECODE );
break;
diff --git a/unotools/source/ucbhelper/localfilehelper.cxx b/unotools/source/ucbhelper/localfilehelper.cxx
index b2c14cf..2d28dac 100644
--- a/unotools/source/ucbhelper/localfilehelper.cxx
+++ b/unotools/source/ucbhelper/localfilehelper.cxx
@@ -100,7 +100,7 @@ sal_Bool LocalFileHelper::ConvertURLToSystemPath( const String& rName, String& r
return ( rReturn.Len() != 0 );
}
-sal_Bool LocalFileHelper::ConvertPhysicalNameToURL( const String& rName, String& rReturn )
+bool LocalFileHelper::ConvertPhysicalNameToURL(const rtl::OUString& rName, rtl::OUString& rReturn)
{
rReturn = ::rtl::OUString();
::ucbhelper::ContentBroker* pBroker = ::ucbhelper::ContentBroker::get();
@@ -120,23 +120,15 @@ sal_Bool LocalFileHelper::ConvertPhysicalNameToURL( const String& rName, String&
rtl::OUString aBase( ::ucbhelper::getLocalFileURL( xManager ) );
rReturn = ::ucbhelper::getFileURLFromSystemPath( xManager, aBase, rName );
}
- catch ( ::com::sun::star::uno::RuntimeException& )
+ catch (const ::com::sun::star::uno::RuntimeException&)
{
}
}
- return ( rReturn.Len() != 0 );
-}
-
-bool LocalFileHelper::ConvertURLToPhysicalName( const rtl::OUString& rName, rtl::OUString& rReturn )
-{
- String aReturn;
- bool bReturn = ConvertURLToPhysicalName( rName, aReturn );
- rReturn = rtl::OUString( aReturn );
- return bReturn;
+ return !rReturn.isEmpty();
}
-sal_Bool LocalFileHelper::ConvertURLToPhysicalName( const String& rName, String& rReturn )
+bool LocalFileHelper::ConvertURLToPhysicalName(const rtl::OUString& rName, rtl::OUString& rReturn)
{
rReturn = ::rtl::OUString();
::ucbhelper::ContentBroker* pBroker = ::ucbhelper::ContentBroker::get();
@@ -157,24 +149,24 @@ sal_Bool LocalFileHelper::ConvertURLToPhysicalName( const String& rName, String&
if ( aObj.GetProtocol() == aLocal.GetProtocol() )
rReturn = ::ucbhelper::getSystemPathFromFileURL( xManager, rName );
}
- catch ( ::com::sun::star::uno::RuntimeException& )
+ catch (const ::com::sun::star::uno::RuntimeException&)
{
}
}
- return ( rReturn.Len() != 0 );
+ return !rReturn.isEmpty();
}
-sal_Bool LocalFileHelper::IsLocalFile( const String& rName )
+sal_Bool LocalFileHelper::IsLocalFile(const rtl::OUString& rName)
{
- String aTmp;
- return ConvertURLToPhysicalName( rName, aTmp );
+ rtl::OUString aTmp;
+ return ConvertURLToPhysicalName(rName, aTmp);
}
-sal_Bool LocalFileHelper::IsFileContent( const String& rName )
+sal_Bool LocalFileHelper::IsFileContent(const rtl::OUString& rName)
{
String aTmp;
- return ConvertURLToSystemPath( rName, aTmp );
+ return ConvertURLToSystemPath(rName, aTmp);
}
typedef ::std::vector< ::rtl::OUString* > StringList_Impl;
diff --git a/unotools/source/ucbhelper/tempfile.cxx b/unotools/source/ucbhelper/tempfile.cxx
index 74c3c53..cc70904 100644
--- a/unotools/source/ucbhelper/tempfile.cxx
+++ b/unotools/source/ucbhelper/tempfile.cxx
@@ -411,7 +411,7 @@ String TempFile::GetURL() const
{
if ( !pImp->aURL.Len() )
{
- String aTmp;
+ rtl::OUString aTmp;
LocalFileHelper::ConvertPhysicalNameToURL( GetFileName(), aTmp );
pImp->aURL = aTmp;
}
More information about the Libreoffice-commits
mailing list