From 6a8f6c4b1324e28c598a065683103ac2ef8ea3fc Mon Sep 17 00:00:00 2001 From: Jesse Date: Wed, 14 Dec 2011 14:43:58 -0500 Subject: Removed extra semicolons --- sd/source/ui/dlg/prltempl.cxx | 2 +- sd/source/ui/toolpanel/TaskPaneTreeNode.cxx | 2 +- sd/source/ui/view/drawview.cxx | 2 +- sd/source/ui/view/drtxtob.cxx | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx index 9d7145179ebf..f0d92c8cc993 100644 --- a/sd/source/ui/dlg/prltempl.cxx +++ b/sd/source/ui/dlg/prltempl.cxx @@ -102,7 +102,7 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, aInputSet.Put( rStyleBase.GetItemSet() ); // need parent-relationship - const SfxItemSet* pParentItemSet = rStyleBase.GetItemSet().GetParent();; + const SfxItemSet* pParentItemSet = rStyleBase.GetItemSet().GetParent(); if( pParentItemSet ) aInputSet.SetParent( pParentItemSet ); diff --git a/sd/source/ui/toolpanel/TaskPaneTreeNode.cxx b/sd/source/ui/toolpanel/TaskPaneTreeNode.cxx index bce9a06e9ebe..3a57e814951e 100644 --- a/sd/source/ui/toolpanel/TaskPaneTreeNode.cxx +++ b/sd/source/ui/toolpanel/TaskPaneTreeNode.cxx @@ -99,7 +99,7 @@ sal_Int32 TreeNode::GetMinimumWidth (void) nTotalMinimumWidth = nMinimumWidth; } - return nTotalMinimumWidth;; + return nTotalMinimumWidth; } diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx index 33e7d57f3fc8..7d20db8adabc 100644 --- a/sd/source/ui/view/drawview.cxx +++ b/sd/source/ui/view/drawview.cxx @@ -542,7 +542,7 @@ void DrawView::PresPaint(const Region& rRegion) sal_Bool DrawView::IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const { - return FmFormView::IsObjMarkable(pObj, pPV);; + return FmFormView::IsObjMarkable(pObj, pPV); } /************************************************************************* diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx index 6f7a83cfaa67..9362c48300e7 100644 --- a/sd/source/ui/view/drtxtob.cxx +++ b/sd/source/ui/view/drtxtob.cxx @@ -382,7 +382,7 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) { if( mpView && mpView->GetTextEditOutlinerView() ) { - EditView & rEditView = mpView->GetTextEditOutlinerView()->GetEditView();; + EditView & rEditView = mpView->GetTextEditOutlinerView()->GetEditView(); String aStatusVal; LanguageType nLang = LANGUAGE_NONE; bool bIsLookUpWord = GetStatusValueForThesaurusFromContext( aStatusVal, nLang, rEditView ); -- cgit v1.2.3 From 45a570f55b66c992d7dd1fccfae4424a40d624d5 Mon Sep 17 00:00:00 2001 From: Thorsten Behrens Date: Fri, 16 Dec 2011 19:29:35 +0100 Subject: Fix assertion in PageSelector::CheckConsistency() Seems the recent merge from impress210 brought an inconsistency in slide selection - shuffle calls to make it go away. --- sd/source/ui/slidesorter/controller/SlsListener.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sd') diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx index df67a539a52d..fdd01a47552e 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.cxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx @@ -509,8 +509,8 @@ void SAL_CALL Listener::propertyChange ( // nevertheless in order to make the new current page the // last recently selected page of the PageSelector. This is // used when making the selection visible. - mrController.GetPageSelector().SelectPage(nCurrentPage-1); mrController.GetCurrentSlideManager()->NotifyCurrentSlideChange(nCurrentPage-1); + mrController.GetPageSelector().SelectPage(nCurrentPage-1); } catch (beans::UnknownPropertyException&) { -- cgit v1.2.3 From e81e5108b90340419264fa2562cc6b96837fee52 Mon Sep 17 00:00:00 2001 From: Ivan Timofeev Date: Mon, 19 Dec 2011 10:01:29 +0400 Subject: impress: slide transition pane: use proper control width --- sd/source/ui/animations/SlideTransitionPane.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index bff23fe42516..6e7862d664ec 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -714,7 +714,7 @@ void SlideTransitionPane::updateLayout() aCtrlSize = maFT_SOUND.GetSizePixel(); if( bStack ) aUpperLeft.setY( aUpperLeft.getY() - aCtrlSize.getHeight()); - aCtrlSize.setWidth( nFTSoundWidth ); + aCtrlSize.setWidth( nFTSoundWidth - 2 * nOffsetX ); maFT_SOUND.SetPosSizePixel( aUpperLeft, aCtrlSize ); aUpperLeft.setX( nIndent ); @@ -728,7 +728,7 @@ void SlideTransitionPane::updateLayout() aCtrlSize = maFT_SPEED.GetSizePixel(); if( bStack ) aUpperLeft.setY( aUpperLeft.getY() - aCtrlSize.getHeight()); - aCtrlSize.setWidth( nFTSpeedWidth ); + aCtrlSize.setWidth( nFTSpeedWidth - 2 * nOffsetX ); maFT_SPEED.SetPosSizePixel( aUpperLeft, aCtrlSize ); // fixed line "Modify Transition" -- cgit v1.2.3 From c1c3ef64bca25183979f666aef51ab2854d628d8 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 21 Dec 2011 09:26:31 +0000 Subject: callcatcher: remove some unused code --- chart2/source/view/axes/DateHelper.cxx | 15 +--------- chart2/source/view/inc/DateHelper.hxx | 1 - i18nutil/inc/i18nutil/unicode.hxx | 1 - i18nutil/source/utility/unicode.cxx | 6 ---- oox/source/export/SchXMLSeriesHelper.cxx | 35 ---------------------- oox/source/export/SchXMLSeriesHelper.hxx | 5 ---- sc/source/ui/inc/tabvwsh.hxx | 1 - sc/source/ui/view/tabvwsh.cxx | 9 ------ sd/source/ui/func/futext.cxx | 17 ----------- sd/source/ui/inc/futext.hxx | 2 -- .../ui/slidesorter/controller/SlsSlotManager.cxx | 22 -------------- .../slidesorter/inc/controller/SlsSlotManager.hxx | 2 -- sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx | 5 ---- sd/source/ui/slidesorter/view/SlsLayouter.cxx | 16 ---------- sdext/source/presenter/PresenterTextView.cxx | 32 -------------------- sdext/source/presenter/PresenterTextView.hxx | 6 ---- sw/source/ui/inc/view.hxx | 2 -- sw/source/ui/uiview/view0.cxx | 7 ----- unotools/inc/unotools/accelcfg.hxx | 3 -- unotools/source/config/accelcfg.cxx | 16 +--------- unotools/source/config/lingucfg.cxx | 25 ++++------------ unusedcode.easy | 13 +------- vcl/inc/impbmp.hxx | 2 -- vcl/source/gdi/impbmp.cxx | 7 ----- xmloff/source/chart/SchXMLSeriesHelper.cxx | 35 ---------------------- xmloff/source/chart/SchXMLSeriesHelper.hxx | 5 ---- 26 files changed, 8 insertions(+), 282 deletions(-) (limited to 'sd') diff --git a/chart2/source/view/axes/DateHelper.cxx b/chart2/source/view/axes/DateHelper.cxx index 247e0f66c16a..41f6aa13bc5e 100644 --- a/chart2/source/view/axes/DateHelper.cxx +++ b/chart2/source/view/axes/DateHelper.cxx @@ -41,25 +41,12 @@ bool DateHelper::IsInSameYear( const Date& rD1, const Date& rD2 ) { return rD1.GetYear() == rD2.GetYear(); } + bool DateHelper::IsInSameMonth( const Date& rD1, const Date& rD2 ) { return (rD1.GetYear() == rD2.GetYear()) && (rD1.GetMonth() == rD2.GetMonth()); } -long DateHelper::GetMonthsBetweenDates( Date aD1, Date aD2 ) -{ - Date aHelp = aD1; - long nSign = 1; - if( aD1 < aD2 ) - { - aD1 = aD2; - aD2 = aHelp; - nSign = -1; - } - - return nSign*( ( aD1.GetMonth() - aD2.GetMonth() ) - + ( aD1.GetYear() - aD2.GetYear() )*12 ); -} Date DateHelper::GetDateSomeMonthsAway( const Date& rD, long nMonthDistance ) { diff --git a/chart2/source/view/inc/DateHelper.hxx b/chart2/source/view/inc/DateHelper.hxx index 7891035fc338..427a230f2bbe 100644 --- a/chart2/source/view/inc/DateHelper.hxx +++ b/chart2/source/view/inc/DateHelper.hxx @@ -46,7 +46,6 @@ public: static bool IsInSameYear( const Date& rD1, const Date& rD2 ); static bool IsInSameMonth( const Date& rD1, const Date& rD2 ); - static long GetMonthsBetweenDates( Date aD1, Date aD2 ); static Date GetDateSomeMonthsAway( const Date& rD, long nMonthDistance ); static Date GetDateSomeYearsAway( const Date& rD, long nYearDistance ); static bool IsLessThanOneMonthAway( const Date& rD1, const Date& rD2 ); diff --git a/i18nutil/inc/i18nutil/unicode.hxx b/i18nutil/inc/i18nutil/unicode.hxx index d5e72b1feb70..24e9c6330498 100644 --- a/i18nutil/inc/i18nutil/unicode.hxx +++ b/i18nutil/inc/i18nutil/unicode.hxx @@ -44,7 +44,6 @@ class I18NUTIL_DLLPUBLIC unicode public: static sal_Int16 SAL_CALL getUnicodeType( const sal_Unicode ch ); - static sal_Bool SAL_CALL isUnicodeScriptType( const sal_Unicode ch, sal_Int16 type); static sal_Int16 SAL_CALL getUnicodeScriptType( const sal_Unicode ch, ScriptTypeList *typeList = NULL, sal_Int16 unknownType = 0 ); static sal_Unicode SAL_CALL getUnicodeScriptStart(com::sun::star::i18n::UnicodeScript type); static sal_Unicode SAL_CALL getUnicodeScriptEnd(com::sun::star::i18n::UnicodeScript type); diff --git a/i18nutil/source/utility/unicode.cxx b/i18nutil/source/utility/unicode.cxx index b0a97d6a55d7..00d4e80b730d 100644 --- a/i18nutil/source/utility/unicode.cxx +++ b/i18nutil/source/utility/unicode.cxx @@ -324,12 +324,6 @@ unicode::getUnicodeScriptType( const sal_Unicode ch, ScriptTypeList* typeList, s typeList[i].value : unknownType; } -sal_Bool SAL_CALL -unicode::isUnicodeScriptType( const sal_Unicode ch, sal_Int16 type) { - return ch >= UnicodeScriptType[type][UnicodeScriptTypeFrom] && - ch <= UnicodeScriptType[type][UnicodeScriptTypeTo]; -} - sal_Unicode SAL_CALL unicode::getUnicodeScriptStart( UnicodeScript type) { return UnicodeScriptType[type][UnicodeScriptTypeFrom]; diff --git a/oox/source/export/SchXMLSeriesHelper.cxx b/oox/source/export/SchXMLSeriesHelper.cxx index fc6ee8b1b67f..e233b8a2a89a 100644 --- a/oox/source/export/SchXMLSeriesHelper.cxx +++ b/oox/source/export/SchXMLSeriesHelper.cxx @@ -187,41 +187,6 @@ bool SchXMLSeriesHelper::isCandleStickSeries( return bRet; } -// static -Reference< chart2::XDataSeries > SchXMLSeriesHelper::getFirstCandleStickSeries( - const Reference< chart2::XDiagram > & xDiagram ) -{ - Reference< chart2::XDataSeries > xResult; - - try - { - Reference< chart2::XCoordinateSystemContainer > xCooSysCnt( xDiagram, uno::UNO_QUERY_THROW ); - Sequence< Reference< chart2::XCoordinateSystem > > aCooSysSeq( xCooSysCnt->getCoordinateSystems()); - for( sal_Int32 nCooSysIdx=0; !xResult.is() && nCooSysIdx xCTCnt( aCooSysSeq[nCooSysIdx], uno::UNO_QUERY_THROW ); - Sequence< Reference< chart2::XChartType > > aCTSeq( xCTCnt->getChartTypes()); - for( sal_Int32 nCTIdx=0; !xResult.is() && nCTIdxgetChartType().equals( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart2.CandleStickChartType")))) - { - Reference< chart2::XDataSeriesContainer > xSeriesCnt( aCTSeq[nCTIdx], uno::UNO_QUERY_THROW ); - Sequence< Reference< chart2::XDataSeries > > aSeriesSeq( xSeriesCnt->getDataSeries() ); - if( aSeriesSeq.getLength()) - xResult.set( aSeriesSeq[0] ); - break; - } - } - } - } - catch( const uno::Exception & ) - { - OSL_FAIL( "Exception caught" ); - } - return xResult; -} - //static uno::Reference< beans::XPropertySet > SchXMLSeriesHelper::createOldAPISeriesPropertySet( const uno::Reference< chart2::XDataSeries >& xSeries diff --git a/oox/source/export/SchXMLSeriesHelper.hxx b/oox/source/export/SchXMLSeriesHelper.hxx index 1fdabba3aa9b..e19160157fd1 100644 --- a/oox/source/export/SchXMLSeriesHelper.hxx +++ b/oox/source/export/SchXMLSeriesHelper.hxx @@ -56,11 +56,6 @@ public: , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel ); - static ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries > getFirstCandleStickSeries( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram > & xDiagram ); - static ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createOldAPISeriesPropertySet( const ::com::sun::star::uno::Reference< diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index 791bbc332bbd..05e68387d8ba 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -205,7 +205,6 @@ private: DECL_LINK( SimpleRefAborted, String* ); DECL_LINK( SimpleRefChange, String* ); DECL_LINK( FormControlActivated, FmFormShell* ); - DECL_LINK( HtmlOptionsHdl, void * ); protected: virtual void Activate(sal_Bool bMDI); diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx index f25002f66567..5f59adad258b 100644 --- a/sc/source/ui/view/tabvwsh.cxx +++ b/sc/source/ui/view/tabvwsh.cxx @@ -99,13 +99,4 @@ SFX_IMPL_NAMED_VIEWFACTORY( ScTabViewShell, "Default" ) SFX_VIEW_REGISTRATION(ScDocShell); } -//------------------------------------------------------------------ - -IMPL_LINK( ScTabViewShell, HtmlOptionsHdl, void*, EMPTYARG ) -{ - // Invalidierung, falls blinkender Text erlaubt/verboten wurde - GetViewFrame()->GetBindings().Invalidate(SID_DRAW_TEXT_MARQUEE); - return 0; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index 4286ff690b6d..7e9d54ec35b0 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -1366,23 +1366,6 @@ void FuText::ReceiveRequest(SfxRequest& rReq) } } - - -/************************************************************************* -|* -|* SpellChecker: Error-LinkHdl -|* -\************************************************************************/ - -IMPL_LINK( FuText, SpellError, void *, nLang ) -{ - String aError( SvtLanguageTable::GetLanguageString( (LanguageType)(sal_uLong)nLang ) ); - ErrorHandler::HandleError(* new StringErrorInfo( - ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS, aError) ); - return 0; -} - - void FuText::DoubleClick(const MouseEvent& ) { // Nothing to do diff --git a/sd/source/ui/inc/futext.hxx b/sd/source/ui/inc/futext.hxx index bcffd4fa12d8..290a43ebff80 100644 --- a/sd/source/ui/inc/futext.hxx +++ b/sd/source/ui/inc/futext.hxx @@ -72,8 +72,6 @@ public: sal_Bool DeleteDefaultText(); SdrTextObj* GetTextObj() { return static_cast< SdrTextObj* >( mxTextObj.get() ); } - DECL_LINK(SpellError, void* ); - virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); /** is called when the currenct function should be aborted.

diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index 57a620871708..fc5eec6eb80b 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -1159,28 +1159,6 @@ void SlotManager::DuplicateSelectedSlides (SfxRequest& rRequest) _1)); } -IMPL_LINK(SlotManager, UserEventCallback, void*, EMPTYARG) -{ - if ( ! maCommandQueue.empty()) - { - Command* pCommand = maCommandQueue.front(); - maCommandQueue.pop(); - - if (pCommand != NULL) - { - // The queue ownes the command that has just been removed from - // it. Therefore it is deleted after it has been executed. - (*pCommand)(); - delete pCommand; - } - } - - return 1; -} - - - - void SlotManager::ChangeSlideExclusionState ( const model::SharedPageDescriptor& rpDescriptor, const bool bExcludeSlide) diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx index 5e5ad8a72178..c5bdcb51675d 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx @@ -114,8 +114,6 @@ private: This can be the current selection or the insertion indicator. */ sal_Int32 GetInsertionPosition (void); - - DECL_LINK(UserEventCallback, void*); }; } } } // end of namespace ::sd::slidesorter::controller diff --git a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx index 342c3d5f23c9..48898f8fc606 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx @@ -119,11 +119,6 @@ public: const Size& rPreviewModelSize, const sal_uInt32 nPageCount); - /** Change the zoom factor. This does not change the general layout - (number of columns). - */ - void _SetZoom (Fraction nZoomFactor); - /** Return the number of columns. */ sal_Int32 GetColumnCount (void) const; diff --git a/sd/source/ui/slidesorter/view/SlsLayouter.cxx b/sd/source/ui/slidesorter/view/SlsLayouter.cxx index e2c9c9767767..274009f2c276 100644 --- a/sd/source/ui/slidesorter/view/SlsLayouter.cxx +++ b/sd/source/ui/slidesorter/view/SlsLayouter.cxx @@ -372,22 +372,6 @@ bool Layouter::Rearrange ( return mpImplementation->Rearrange(rWindowSize, rPageSize, nPageCount); } - - - -void Layouter::_SetZoom (Fraction nZoomFactor) -{ - OSL_ASSERT(mpWindow); - - MapMode aMapMode (mpWindow->GetMapMode()); - aMapMode.SetScaleX (nZoomFactor); - aMapMode.SetScaleY (nZoomFactor); - mpWindow->SetMapMode (aMapMode); -} - - - - sal_Int32 Layouter::GetColumnCount (void) const { return mpImplementation->mnColumnCount; diff --git a/sdext/source/presenter/PresenterTextView.cxx b/sdext/source/presenter/PresenterTextView.cxx index 5bfbfd7d77d0..63a0f91bcbae 100644 --- a/sdext/source/presenter/PresenterTextView.cxx +++ b/sdext/source/presenter/PresenterTextView.cxx @@ -549,38 +549,6 @@ PresenterTextParagraph::PresenterTextParagraph ( } } - - - -PresenterTextParagraph::PresenterTextParagraph ( - const sal_Int32 nParagraphIndex, - const Reference& rxBreakIterator, - const Reference& rxScriptTypeDetector, - const ::rtl::OUString& rsText, - const SharedPresenterTextCaret& rpCaret) - : msParagraphText(rsText), - mnParagraphIndex(nParagraphIndex), - mpCaret(rpCaret), - mxBreakIterator(rxBreakIterator), - mxScriptTypeDetector(rxScriptTypeDetector), - maLines(), - mnVerticalOffset(0), - mnXOrigin(0), - mnYOrigin(0), - mnWidth(0), - mnAscent(0), - mnDescent(0), - mnLineHeight(-1), - meAdjust(style::ParagraphAdjust_LEFT), - mnWritingMode (text::WritingMode2::LR_TB), - mnCharacterOffset(0), - maCells() -{ -} - - - - void PresenterTextParagraph::Paint ( const Reference& rxCanvas, const geometry::RealSize2D& rSize, diff --git a/sdext/source/presenter/PresenterTextView.hxx b/sdext/source/presenter/PresenterTextView.hxx index 062a24721466..32c54caa373e 100644 --- a/sdext/source/presenter/PresenterTextView.hxx +++ b/sdext/source/presenter/PresenterTextView.hxx @@ -108,12 +108,6 @@ public: const cssu::Reference& rxScriptTypeDetector, const cssu::Reference& rxTextRange, const SharedPresenterTextCaret& rpCaret); - PresenterTextParagraph ( - const sal_Int32 nParagraphIndex, - const cssu::Reference& rxBreakIterator, - const cssu::Reference& rxScriptTypeDetector, - const ::rtl::OUString& rsText, - const SharedPresenterTextCaret& rpCaret); void Paint ( const cssu::Reference& rxCanvas, diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx index 4e7d8f6db509..4445edf8edd8 100755 --- a/sw/source/ui/inc/view.hxx +++ b/sw/source/ui/inc/view.hxx @@ -302,8 +302,6 @@ class SW_DLLPUBLIC SwView: public SfxViewShell SW_DLLPRIVATE DECL_LINK( TimeoutHdl, Timer * ); SW_DLLPRIVATE DECL_LINK( UpdatePercentHdl, GraphicFilter* ); - SW_DLLPRIVATE DECL_LINK( HtmlOptionsHdl, void * ); - SW_DLLPRIVATE DECL_LINK( FieldPopupModeEndHdl, FloatingWindow * ); inline long GetXScroll() const; diff --git a/sw/source/ui/uiview/view0.cxx b/sw/source/ui/uiview/view0.cxx index e3ae94eb0e61..8ff37c89beee 100644 --- a/sw/source/ui/uiview/view0.cxx +++ b/sw/source/ui/uiview/view0.cxx @@ -595,11 +595,4 @@ void SwView::ExecViewOptions(SfxRequest &rReq) rReq.Done(); } -IMPL_LINK( SwView, HtmlOptionsHdl, void*, EMPTYARG ) -{ - // Invalidierung, falls blinkender Text erlaubt/verboten wurde - GetViewFrame()->GetBindings().Invalidate(SID_DRAW_TEXT_MARQUEE); - return 0; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unotools/inc/unotools/accelcfg.hxx b/unotools/inc/unotools/accelcfg.hxx index d18076b15c89..04a105ce9b06 100644 --- a/unotools/inc/unotools/accelcfg.hxx +++ b/unotools/inc/unotools/accelcfg.hxx @@ -67,9 +67,6 @@ public: // save the configuration to a stream, f.e. into a document bool Commit( SvStream& rStream ); - - // sets a single configuration item - void SetCommand( const SvtAcceleratorConfigItem& rItem ); }; #endif diff --git a/unotools/source/config/accelcfg.cxx b/unotools/source/config/accelcfg.cxx index f780df1f3442..61209f7ff22d 100644 --- a/unotools/source/config/accelcfg.cxx +++ b/unotools/source/config/accelcfg.cxx @@ -202,23 +202,9 @@ SvtAcceleratorConfiguration::~SvtAcceleratorConfiguration() } } -void SvtAcceleratorConfiguration::SetCommand( const SvtAcceleratorConfigItem& rItem ) -{ - std::list< SvtAcceleratorConfigItem>::iterator p; - for ( p = pImp->aList.begin(); p != pImp->aList.end(); ++p ) - if ( p->nCode == rItem.nCode && p->nModifier == rItem.nModifier ) - { - p->aCommand = rItem.aCommand; - return; - } - - pImp->aList.push_back( rItem ); - -} - String SvtAcceleratorConfiguration::GetStreamName() { - return String::CreateFromAscii("KeyBindings.xml"); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("KeyBindings.xml")); } SvStream* SvtAcceleratorConfiguration::GetDefaultStream( StreamMode nMode ) diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx index eb4b38164935..27516fbe14d2 100644 --- a/unotools/source/config/lingucfg.cxx +++ b/unotools/source/config/lingucfg.cxx @@ -183,8 +183,7 @@ public: sal_Bool SetProperty( sal_Int32 nPropertyHandle, const com::sun::star::uno::Any &rValue ); - sal_Bool GetOptions( SvtLinguOptions &rOptions ) const; - sal_Bool SetOptions( const SvtLinguOptions &rOptions ); + const SvtLinguOptions& GetOptions() const; sal_Bool IsReadOnly( const rtl::OUString &rPropertyName ) const; sal_Bool IsReadOnly( sal_Int32 nPropertyHandle ) const; @@ -556,27 +555,12 @@ sal_Bool SvtLinguConfigItem::SetProperty( sal_Int32 nPropertyHandle, const uno:: return bSucc; } - -sal_Bool SvtLinguConfigItem::GetOptions( SvtLinguOptions &rOptions ) const +const SvtLinguOptions& SvtLinguConfigItem::GetOptions() const { osl::MutexGuard aGuard(theSvtLinguConfigItemMutex::get()); - - rOptions = aOpt; - return sal_True; + return aOpt; } - -sal_Bool SvtLinguConfigItem::SetOptions( const SvtLinguOptions &rOptions ) -{ - osl::MutexGuard aGuard(theSvtLinguConfigItemMutex::get()); - - aOpt = rOptions; - SetModified(); - NotifyListeners(0); - return sal_True; -} - - sal_Bool SvtLinguConfigItem::LoadOptions( const uno::Sequence< OUString > &rProperyNames ) { osl::MutexGuard aGuard(theSvtLinguConfigItemMutex::get()); @@ -906,7 +890,8 @@ sal_Bool SvtLinguConfig::SetProperty( sal_Int32 nPropertyHandle, const uno::Any sal_Bool SvtLinguConfig::GetOptions( SvtLinguOptions &rOptions ) const { - return GetConfigItem().GetOptions( rOptions ); + rOptions = GetConfigItem().GetOptions(); + return sal_True; } sal_Bool SvtLinguConfig::IsReadOnly( const rtl::OUString &rPropertyName ) const diff --git a/unusedcode.easy b/unusedcode.easy index 4af564ecaf10..5e6da87fbc10 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -373,7 +373,6 @@ ScSimpleRangeList::Range::contains(ScSimpleRangeList::Range const&) const ScStringCell::ScStringCell() ScSubTotalDescriptorBase::GetData(ScSubTotalParam&) const ScSubTotalDescriptorBase::PutData(ScSubTotalParam const&) -ScTabViewShell::LinkStubHtmlOptionsHdl(void*, void*) ScUserList::end() ScUserList::end() const ScValidationEntries_Impl::Insert(ScValidationData* const&, unsigned short&) @@ -864,8 +863,6 @@ SwVbaColumn::calculateAbsoluteColumnWidth(int, com::sun::star::uno::Sequence const&, short) canvas::tools::verifyInput(com::sun::star::rendering::FloatingPointBitmapLayout const&, char const*, com::sun::star::uno::Reference const&, short) -chart::DateHelper::GetMonthsBetweenDates(Date, Date) chart::EquidistantTickIter::getCurrentIndex() const chart::EquidistantTickIter::getMaxIndex() const chart::EquidistantTickIter::gotoIndex(int) @@ -1783,8 +1779,6 @@ graphite2::Segment::append(graphite2::Segment const&) graphite2::Slot::update(int, int, graphite2::Position&) graphite2::TtfUtil::GetNameInfo(void const*, int, int, int, int, unsigned long&, unsigned long&) graphite2::TtfUtil::GlyfLookup(unsigned short, void const*, void const*, unsigned long, unsigned long, void const*) -jfw_plugin::VendorBase::createInstance() -jfw_plugin::VendorBase::getJavaExePaths(int*) jvmaccess::ClassPath::doLoadClass(com::sun::star::uno::Reference const&, void*, rtl::OUString const&, rtl::OUString const&) libcdr::CDRDocument::generateSVG(WPXInputStream*, WPXString&) libcdr::CDRInternalStream::CDRInternalStream(unsigned char const*, unsigned long) @@ -1798,7 +1792,6 @@ linguistic::ToLower(unsigned short, short) linguistic::ToTitle(String const&, short) linguistic::ToUpper(String const&, short) linguistic::ToUpper(unsigned short, short) -migration::AutocorrectionMigration_create(com::sun::star::uno::Reference const&) nullcanvas::CanvasFont::getFontMatrix() const nullcanvas::CanvasHelper::flush() const nullcanvas::CanvasHelper::getPalette() @@ -1996,7 +1989,6 @@ sax_fastparser::FastSerializerHelper::singleElement(char const*, com::sun::star: sax_fastparser::FastSerializerHelper::startElement(char const*, ...) sax_fastparser::FastSerializerHelper::write(float) sd::CopyDlg::LinkStubReset(void*, void*) -sd::FuText::LinkStubSpellError(void*, void*) sd::LeftDrawPaneShell::RegisterInterface(SfxModule*) sd::LeftImpressPaneShell::RegisterInterface(SfxModule*) sd::ToolPanelPaneShell::RegisterInterface(SfxModule*) @@ -2010,19 +2002,16 @@ sd::framework::ConfigurationClassifier::TraceResourceIdVector(char const*, std:: sd::framework::ConfigurationTracer::TraceConfiguration(com::sun::star::uno::Reference const&, char const*) sd::slidesorter::cache::GenericPageCache::ReleasePreviewBitmap(SdrPage const*) sd::slidesorter::controller::SelectionFunction::EventDescriptor::EventDescriptor(KeyEvent const&, sd::slidesorter::SlideSorter&) -sd::slidesorter::controller::SlotManager::LinkStubUserEventCallback(void*, void*) sd::slidesorter::model::VisualState::SetVisualStateBlend(double) sd::slidesorter::view::(anonymous namespace)::Blend(unsigned char, unsigned char, double) sd::slidesorter::view::(anonymous namespace)::CalculateColorChannel(double, double, double, double, double) sd::slidesorter::view::(anonymous namespace)::PageObjectRun::GetInnerBoundingBox(sd::slidesorter::view::Layouter const&, int) const sd::slidesorter::view::(anonymous namespace)::RectangleBackgroundTheme::RectangleBackgroundTheme(boost::shared_ptr const&, std::__debug::vector, std::allocator > > const&) sd::slidesorter::view::FontProvider::GetFont(OutputDevice const&) -sd::slidesorter::view::Layouter::_SetZoom(Fraction) sdext::presenter::(anonymous namespace)::MoveInFromBottomAnimator::MoveInFromBottomAnimator(com::sun::star::uno::Reference const&, rtl::Reference const&, bool, std::__debug::vector, std::allocator > > const&, std::__debug::vector, std::allocator > > const&) sdext::presenter::(anonymous namespace)::TransparentOverlayAnimator::TransparentOverlayAnimator(com::sun::star::uno::Reference const&, rtl::Reference const&, bool, std::__debug::vector, std::allocator > > const&, std::__debug::vector, std::allocator > > const&) sdext::presenter::(anonymous namespace)::UnfoldInCenterAnimator::UnfoldInCenterAnimator(com::sun::star::uno::Reference const&, rtl::Reference const&, bool, std::__debug::vector, std::allocator > > const&, std::__debug::vector, std::allocator > > const&) sdext::presenter::PresenterHorizontalScrollBar::PresenterHorizontalScrollBar(com::sun::star::uno::Reference const&, com::sun::star::uno::Reference const&, boost::shared_ptr const&, boost::function const&) -sdext::presenter::PresenterTextView::PresenterTextView(com::sun::star::uno::Reference const&, com::sun::star::uno::Reference const&) sdr::animation::Scheduler::Reset(unsigned int) sdr::contact::ViewContactOfPageObj::GetReferencedPage() const sdr::contact::ViewContactOfSdrMediaObj::hasPreferredSize() const @@ -2068,7 +2057,6 @@ std::__cxx1998::vector >::~vector std::__cxx1998::vector >::~vector() std::__cxx1998::vector >::~vector() std::__cxx1998::vector >::~vector() -svgi::(anonymous namespace)::appendChar(std::basic_string, std::allocator >&, char) svt::table::TableControl::GoTo(int, int) svx::SvxShowCharSetItem::~SvxShowCharSetItem() svxform::DataNavigatorManager::GetChildWindowId() @@ -2122,3 +2110,4 @@ vcl::PDFWriterImpl::drawPolyPolygon(PolyPolygon const&, int, bool) vcl::unx::GtkPrintWrapper::print_operation_set_has_selection(_GtkPrintOperation*, int) const vcl::unx::GtkPrintWrapper::print_operation_set_support_selection(_GtkPrintOperation*, int) const void ScCompressedArrayIterator::Follow(ScCompressedArrayIterator const&) +writerfilter::TagLogger::attribute(std::basic_string, std::allocator > const&, std::basic_string, std::allocator > const&) diff --git a/vcl/inc/impbmp.hxx b/vcl/inc/impbmp.hxx index c77e906bd8ae..f474a7eea5a1 100644 --- a/vcl/inc/impbmp.hxx +++ b/vcl/inc/impbmp.hxx @@ -74,8 +74,6 @@ public: sal_Bool ImplCreate( const ImpBitmap& rImpBitmap, SalGraphics* pGraphics ); sal_Bool ImplCreate( const ImpBitmap& rImpBitmap, sal_uInt16 nNewBitCount ); - void ImplDestroy(); - Size ImplGetSize() const; Size ImplGetSourceSize() const; void ImplSetSourceSize( const Size&); diff --git a/vcl/source/gdi/impbmp.cxx b/vcl/source/gdi/impbmp.cxx index 18ef5b6909f1..2f70e77c92a7 100644 --- a/vcl/source/gdi/impbmp.cxx +++ b/vcl/source/gdi/impbmp.cxx @@ -94,13 +94,6 @@ sal_Bool ImpBitmap::ImplCreate( const ImpBitmap& rImpBitmap, sal_uInt16 nNewBitC // ----------------------------------------------------------------------- -void ImpBitmap::ImplDestroy() -{ - mpSalBitmap->Destroy(); -} - -// ----------------------------------------------------------------------- - Size ImpBitmap::ImplGetSize() const { return mpSalBitmap->GetSize(); diff --git a/xmloff/source/chart/SchXMLSeriesHelper.cxx b/xmloff/source/chart/SchXMLSeriesHelper.cxx index 0ec80246c952..4ad0ef72576b 100644 --- a/xmloff/source/chart/SchXMLSeriesHelper.cxx +++ b/xmloff/source/chart/SchXMLSeriesHelper.cxx @@ -188,41 +188,6 @@ bool SchXMLSeriesHelper::isCandleStickSeries( return bRet; } -// static -Reference< chart2::XDataSeries > SchXMLSeriesHelper::getFirstCandleStickSeries( - const Reference< chart2::XDiagram > & xDiagram ) -{ - Reference< chart2::XDataSeries > xResult; - - try - { - Reference< chart2::XCoordinateSystemContainer > xCooSysCnt( xDiagram, uno::UNO_QUERY_THROW ); - Sequence< Reference< chart2::XCoordinateSystem > > aCooSysSeq( xCooSysCnt->getCoordinateSystems()); - for( sal_Int32 nCooSysIdx=0; !xResult.is() && nCooSysIdx xCTCnt( aCooSysSeq[nCooSysIdx], uno::UNO_QUERY_THROW ); - Sequence< Reference< chart2::XChartType > > aCTSeq( xCTCnt->getChartTypes()); - for( sal_Int32 nCTIdx=0; !xResult.is() && nCTIdxgetChartType().equals( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.CandleStickChartType" )))) - { - Reference< chart2::XDataSeriesContainer > xSeriesCnt( aCTSeq[nCTIdx], uno::UNO_QUERY_THROW ); - Sequence< Reference< chart2::XDataSeries > > aSeriesSeq( xSeriesCnt->getDataSeries() ); - if( aSeriesSeq.getLength()) - xResult.set( aSeriesSeq[0] ); - break; - } - } - } - } - catch( const uno::Exception & ) - { - OSL_FAIL( "Exception caught" ); - } - return xResult; -} - //static uno::Reference< beans::XPropertySet > SchXMLSeriesHelper::createOldAPISeriesPropertySet( const uno::Reference< chart2::XDataSeries >& xSeries diff --git a/xmloff/source/chart/SchXMLSeriesHelper.hxx b/xmloff/source/chart/SchXMLSeriesHelper.hxx index b5fc1ad91821..90fa620cb4ef 100644 --- a/xmloff/source/chart/SchXMLSeriesHelper.hxx +++ b/xmloff/source/chart/SchXMLSeriesHelper.hxx @@ -56,11 +56,6 @@ public: , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel ); - static ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries > getFirstCandleStickSeries( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram > & xDiagram ); - static ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createOldAPISeriesPropertySet( const ::com::sun::star::uno::Reference< -- cgit v1.2.3 From 92f396733ebc518bcb7a9eae2dd3169d333b82b9 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sat, 17 Dec 2011 15:53:11 +0000 Subject: convert ReadByteString/WriteByteString from ByteString to OString Nobody ever used the return values anyway, so for reading just return the string and for writing the number of bytes written Doesn't need to be members, make standalone functions Rename to read_lenPrefixed_uInt8s_ToO[U]String and write_lenPrefixed_uInt8s_FromO[U]String, lengthy, but much less unambiguous, seeing as a lot of users of it don't seem to be aware that they read/write pascal-style length prefixed strings, which isn't surprising given the apparent simplicity of their original name. added a unit test --- basic/source/runtime/iosys.cxx | 2 +- connectivity/source/drivers/dbase/DTable.cxx | 2 +- connectivity/source/drivers/dbase/dindexnode.cxx | 2 +- editeng/source/editeng/editobj.cxx | 9 +-- filter/source/msfilter/mstoolbar.cxx | 2 +- idl/source/objects/bastype.cxx | 8 +- idl/source/objects/module.cxx | 12 +-- idl/source/objects/object.cxx | 4 +- idl/source/objects/types.cxx | 8 +- sc/source/filter/ftools/ftools.cxx | 6 +- sc/source/filter/inc/ftools.hxx | 6 +- sc/source/filter/lotus/lotform.cxx | 6 +- sc/source/filter/qpro/qproform.cxx | 2 +- sc/source/ui/unoobj/scdetect.cxx | 2 +- sd/source/filter/eppt/epptso.cxx | 2 +- sfx2/source/bastyp/sfxhtml.cxx | 2 +- sot/source/sdstor/ucbstorage.cxx | 3 +- svl/source/items/cntwall.cxx | 3 +- svl/source/numbers/zformat.cxx | 3 +- svtools/source/filter/igif/gifread.cxx | 4 +- svtools/source/graphic/grfmgr.cxx | 7 +- svtools/source/misc/imap.cxx | 37 ++++----- svtools/source/urlobj/inetimg.cxx | 8 +- svx/inc/svx/gallery1.hxx | 48 ++++++------ svx/inc/svx/galmisc.hxx | 14 ++-- svx/inc/svx/galtheme.hxx | 18 ++--- svx/source/gallery2/gallery1.cxx | 51 +++++-------- svx/source/gallery2/galobj.cxx | 36 +++------ svx/source/gallery2/galtheme.cxx | 19 ++--- sw/source/filter/ww1/w1class.cxx | 2 +- sw/source/filter/ww8/ww8par.cxx | 2 +- sw/source/filter/ww8/ww8par2.cxx | 2 +- sw/source/filter/ww8/ww8scan.cxx | 21 ++---- sw/source/filter/ww8/ww8scan.hxx | 5 +- sw/source/filter/ww8/ww8toolbar.cxx | 2 +- sw/source/ui/dochdl/swdtflvr.cxx | 6 +- tools/inc/tools/inetmsg.hxx | 96 ++++++++++++------------ tools/inc/tools/stream.hxx | 59 +++++++++++++-- tools/qa/cppunit/test_stream.cxx | 59 +++++++++++++-- tools/source/inet/inetmsg.cxx | 18 ++--- tools/source/inet/inetstrm.cxx | 2 +- tools/source/stream/stream.cxx | 36 ++------- vcl/source/gdi/animate.cxx | 6 +- vcl/source/gdi/cvtsvm.cxx | 11 ++- vcl/source/gdi/jobset.cxx | 18 +++-- vcl/source/gdi/metaact.cxx | 9 +-- 46 files changed, 353 insertions(+), 327 deletions(-) (limited to 'sd') diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx index a2fe3bd9a096..1a63f943d5a7 100644 --- a/basic/source/runtime/iosys.cxx +++ b/basic/source/runtime/iosys.cxx @@ -656,7 +656,7 @@ SbError SbiStream::Read( ByteString& rBuf, sal_uInt16 n, bool bForceReadingPerBy n = nLen; if( !n ) return nError = SbERR_BAD_RECORD_LENGTH; - rtl::OStringBuffer aBuffer(read_uInt8s_AsOString(*pStrm, n)); + rtl::OStringBuffer aBuffer(read_uInt8s_ToOString(*pStrm, n)); //Pad it out with ' ' to the requested length on short read sal_Int32 nRequested = sal::static_int_cast(n); comphelper::string::padToLength(aBuffer, nRequested, ' '); diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index fc5afcd3d354..cfabfbff4b0d 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -2739,7 +2739,7 @@ sal_Bool ODbaseTable::ReadMemo(sal_uIntPtr nBlockNo, ORowSetValue& aVariable) { if ( bIsText ) { - rtl::OStringBuffer aBuffer(read_uInt8s_AsOString(*m_pMemoStream, nLength)); + rtl::OStringBuffer aBuffer(read_uInt8s_ToOString(*m_pMemoStream, nLength)); //pad it out with ' ' to expected length on short read sal_Int32 nRequested = sal::static_int_cast(nLength); comphelper::string::padToLength(aBuffer, nRequested, ' '); diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx index 111745794750..046b457ab808 100644 --- a/connectivity/source/drivers/dbase/dindexnode.cxx +++ b/connectivity/source/drivers/dbase/dindexnode.cxx @@ -673,7 +673,7 @@ void ONDXNode::Read(SvStream &rStream, ODbaseIndex& rIndex) else { sal_uInt16 nLen = rIndex.getHeader().db_keylen; - rtl::OString aBuf = read_uInt8s_AsOString(rStream, nLen); + rtl::OString aBuf = read_uInt8s_ToOString(rStream, nLen); //get length minus trailing whitespace sal_Int32 nContentLen = aBuf.getLength(); while (nContentLen && aBuf[nContentLen-1] == ' ') diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx index 678f31abad56..0fd144b42514 100644 --- a/editeng/source/editeng/editobj.cxx +++ b/editeng/source/editeng/editobj.cxx @@ -1131,10 +1131,10 @@ void BinTextObject::StoreData( SvStream& rOStream ) const // Convert CH_FEATURE to CH_FEATURE_OLD aText.SearchAndReplaceAll( cFeatureConverted, CH_FEATURE_OLD ); - rOStream.WriteByteString( aText ); + write_lenPrefixed_uInt8s_FromOString(rOStream, aText); // StyleName and Family... - rOStream.WriteByteString( rtl::OUStringToOString(pC->GetStyle(), eEncoding) ); + write_lenPrefixed_uInt8s_FromOUString(rOStream, pC->GetStyle(), eEncoding); rOStream << (sal_uInt16)pC->GetFamily(); // Paragraph attributes ... @@ -1226,9 +1226,8 @@ void BinTextObject::CreateData( SvStream& rIStream ) ContentInfo* pC = CreateAndInsertContent(); // The Text... - ByteString aByteString; - rIStream.ReadByteString( aByteString ); - pC->GetText() = String( aByteString, eSrcEncoding ); + ByteString aByteString = read_lenPrefixed_uInt8s_ToOString(rIStream); + pC->GetText() = rtl::OStringToOUString(aByteString, eSrcEncoding); // StyleName and Family... rIStream.ReadByteString( pC->GetStyle(), eSrcEncoding ); diff --git a/filter/source/msfilter/mstoolbar.cxx b/filter/source/msfilter/mstoolbar.cxx index 2776e724d1f5..ed1c986dd2c7 100644 --- a/filter/source/msfilter/mstoolbar.cxx +++ b/filter/source/msfilter/mstoolbar.cxx @@ -412,7 +412,7 @@ WString::Read( SvStream &rS ) nOffSet = rS.Tell(); sal_uInt8 nChars = 0; rS >> nChars; - sString = read_LEuInt16s_AsOUString(rS, nChars); + sString = read_LEuInt16s_ToOUString(rS, nChars); return true; } diff --git a/idl/source/objects/bastype.cxx b/idl/source/objects/bastype.cxx index 15c56c088ea0..afeb0046730d 100644 --- a/idl/source/objects/bastype.cxx +++ b/idl/source/objects/bastype.cxx @@ -228,13 +228,13 @@ sal_Bool SvIdentifier::WriteSvIdl( SvStringHashEntry * pName, SvStream& operator << (SvStream & rStm, const SvIdentifier & r ) { - rStm.WriteByteString( r ); + write_lenPrefixed_uInt8s_FromOString(rStm, r); return rStm; } SvStream& operator >> (SvStream & rStm, SvIdentifier & r ) { - rStm.ReadByteString( r ); + r = read_lenPrefixed_uInt8s_ToOString(rStm); return rStm; } @@ -343,13 +343,13 @@ sal_Bool SvString::WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm, SvStream& operator << (SvStream & rStm, const SvString & r ) { - rStm.WriteByteString( r ); + write_lenPrefixed_uInt8s_FromOString(rStm, r); return rStm; } SvStream& operator >> (SvStream & rStm, SvString & r ) { - rStm.ReadByteString( r ); + r = read_lenPrefixed_uInt8s_ToOString(rStm); return rStm; } diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx index c2be3e232494..4fd5c78f7f6f 100644 --- a/idl/source/objects/module.cxx +++ b/idl/source/objects/module.cxx @@ -66,9 +66,9 @@ void SvMetaModule::Load( SvPersistStream & rStm ) rStm >> aAttrList; // browser rStm.ReadByteString( aIdlFileName ); - rStm.ReadByteString( aHelpFileName ); - rStm.ReadByteString( aSlotIdFile ); - rStm.ReadByteString( aModulePrefix ); + aHelpFileName = read_lenPrefixed_uInt8s_ToOString(rStm); + aSlotIdFile = read_lenPrefixed_uInt8s_ToOString(rStm); + aModulePrefix = read_lenPrefixed_uInt8s_ToOString(rStm); // read compiler data sal_uInt16 nCmpLen; @@ -91,9 +91,9 @@ void SvMetaModule::Save( SvPersistStream & rStm ) rStm << aAttrList; // browser rStm.WriteByteString( aIdlFileName ); - rStm.WriteByteString( aHelpFileName ); - rStm.WriteByteString( aSlotIdFile ); - rStm.WriteByteString( aModulePrefix ); + write_lenPrefixed_uInt8s_FromOString(rStm, aHelpFileName); + write_lenPrefixed_uInt8s_FromOString(rStm, aSlotIdFile); + write_lenPrefixed_uInt8s_FromOString(rStm, aModulePrefix); // write compiler data sal_uInt16 nCmpLen = 0; diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx index 0b3e1cf193e3..798acbc1e180 100644 --- a/idl/source/objects/object.cxx +++ b/idl/source/objects/object.cxx @@ -55,7 +55,7 @@ void SvClassElement::Load( SvPersistStream & rStm ) return; } if( nMask & 0x01 ) rStm >> aAutomation; - if( nMask & 0x02 ) rStm.ReadByteString( aPrefix ); + if( nMask & 0x02 ) aPrefix = read_lenPrefixed_uInt8s_ToOString(rStm); if( nMask & 0x04 ) { SvMetaClass * p; @@ -75,7 +75,7 @@ void SvClassElement::Save( SvPersistStream & rStm ) // write data rStm << nMask; if( nMask & 0x01 ) rStm << aAutomation; - if( nMask & 0x02 ) rStm.WriteByteString( aPrefix ); + if( nMask & 0x02 ) write_lenPrefixed_uInt8s_FromOString(rStm, aPrefix); if( nMask & 0x04 ) rStm << xClass; } diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx index 06db9ed18910..f2488aa0498b 100644 --- a/idl/source/objects/types.cxx +++ b/idl/source/objects/types.cxx @@ -1780,7 +1780,7 @@ void SvMetaEnumValue::Load( SvPersistStream & rStm ) OSL_FAIL( "wrong format" ); return; } - if( nMask & 0x01 ) rStm.ReadByteString( aEnumValue ); + if( nMask & 0x01 ) aEnumValue = read_lenPrefixed_uInt8s_ToOString(rStm); } void SvMetaEnumValue::Save( SvPersistStream & rStm ) @@ -1793,7 +1793,7 @@ void SvMetaEnumValue::Save( SvPersistStream & rStm ) // write data rStm << nMask; - if( nMask & 0x01 ) rStm.WriteByteString( aEnumValue ); + if( nMask & 0x01 ) write_lenPrefixed_uInt8s_FromOString(rStm, aEnumValue); } sal_Bool SvMetaEnumValue::ReadSvIdl( SvIdlDataBase & rBase, @@ -1837,7 +1837,7 @@ void SvMetaTypeEnum::Load( SvPersistStream & rStm ) return; } if( nMask & 0x01 ) rStm >> aEnumValueList; - if( nMask & 0x02 ) rStm.ReadByteString( aPrefix ); + if( nMask & 0x02 ) aPrefix = read_lenPrefixed_uInt8s_ToOString(rStm); } void SvMetaTypeEnum::Save( SvPersistStream & rStm ) @@ -1852,7 +1852,7 @@ void SvMetaTypeEnum::Save( SvPersistStream & rStm ) // write data rStm << nMask; if( nMask & 0x01 ) rStm << aEnumValueList; - if( nMask & 0x02 ) rStm.WriteByteString( aPrefix ); + if( nMask & 0x02 ) write_lenPrefixed_uInt8s_FromOString(rStm, aPrefix); } void SvMetaTypeEnum::ReadContextSvIdl( SvIdlDataBase & rBase, diff --git a/sc/source/filter/ftools/ftools.cxx b/sc/source/filter/ftools/ftools.cxx index 21d3e12fc803..bbfbe41a2881 100644 --- a/sc/source/filter/ftools/ftools.cxx +++ b/sc/source/filter/ftools/ftools.cxx @@ -276,9 +276,9 @@ ScStyleSheet& ScfTools::MakePageStyleSheet( ScStyleSheetPool& rPool, const Strin // *** byte string import operations *** -------------------------------------- -rtl::OString ScfTools::read_zeroTerminated_uInt8s_AsOString(SvStream& rStrm, sal_Int32& rnBytesLeft) +rtl::OString ScfTools::read_zeroTerminated_uInt8s_ToOString(SvStream& rStrm, sal_Int32& rnBytesLeft) { - rtl::OString aRet(::read_zeroTerminated_uInt8s_AsOString(rStrm)); + rtl::OString aRet(::read_zeroTerminated_uInt8s_ToOString(rStrm)); rnBytesLeft -= aRet.getLength(); //we read this number of bytes anyway if (rStrm.good()) //if the stream is happy we read the null terminator as well --rnBytesLeft; @@ -287,7 +287,7 @@ rtl::OString ScfTools::read_zeroTerminated_uInt8s_AsOString(SvStream& rStrm, sal void ScfTools::AppendCString( SvStream& rStrm, String& rString, rtl_TextEncoding eTextEnc ) { - rString += ::read_zeroTerminated_uInt8s_AsOUString(rStrm, eTextEnc); + rString += ::read_zeroTerminated_uInt8s_ToOUString(rStrm, eTextEnc); } // *** HTML table names <-> named range names *** ----------------------------- diff --git a/sc/source/filter/inc/ftools.hxx b/sc/source/filter/inc/ftools.hxx index e57d42c27599..4bfac0961c83 100644 --- a/sc/source/filter/inc/ftools.hxx +++ b/sc/source/filter/inc/ftools.hxx @@ -237,11 +237,11 @@ public: // *** byte string import operations *** -------------------------------------- /** Reads and returns a zero terminated byte string and decreases a stream counter. */ - static rtl::OString read_zeroTerminated_uInt8s_AsOString(SvStream& rStrm, sal_Int32& rnBytesLeft); + static rtl::OString read_zeroTerminated_uInt8s_ToOString(SvStream& rStrm, sal_Int32& rnBytesLeft); /** Reads and returns a zero terminated byte string and decreases a stream counter. */ - inline static rtl::OUString read_zeroTerminated_uInt8s_AsOUString(SvStream& rStrm, sal_Int32& rnBytesLeft, rtl_TextEncoding eTextEnc) + inline static rtl::OUString read_zeroTerminated_uInt8s_ToOUString(SvStream& rStrm, sal_Int32& rnBytesLeft, rtl_TextEncoding eTextEnc) { - return rtl::OStringToOUString(read_zeroTerminated_uInt8s_AsOString(rStrm, rnBytesLeft), eTextEnc); + return rtl::OStringToOUString(read_zeroTerminated_uInt8s_ToOString(rStrm, rnBytesLeft), eTextEnc); } /** Appends a zero terminated byte string. */ diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx index 5bd02b10d99e..d649c447ff65 100644 --- a/sc/source/filter/lotus/lotform.cxx +++ b/sc/source/filter/lotus/lotform.cxx @@ -542,7 +542,7 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, sal_Int32& rRest, break; case FT_ConstString: { - String aTmp(ScfTools::read_zeroTerminated_uInt8s_AsOUString(aIn, nBytesLeft, eSrcChar)); + String aTmp(ScfTools::read_zeroTerminated_uInt8s_ToOUString(aIn, nBytesLeft, eSrcChar)); aStack << aPool.Store( aTmp ); } break; @@ -561,7 +561,7 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, sal_Int32& rRest, break; case FT_Nrref: { - String aTmp(ScfTools::read_zeroTerminated_uInt8s_AsOUString(aIn, nBytesLeft, eSrcChar)); + String aTmp(ScfTools::read_zeroTerminated_uInt8s_ToOUString(aIn, nBytesLeft, eSrcChar)); if( rRangeNameBufferWK3.FindRel( aTmp, nRngIndex ) ) aStack << aPool.Store( nRngIndex ); else @@ -574,7 +574,7 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, sal_Int32& rRest, break; case FT_Absnref: { - String aTmp(ScfTools::read_zeroTerminated_uInt8s_AsOUString(aIn, nBytesLeft, eSrcChar)); + String aTmp(ScfTools::read_zeroTerminated_uInt8s_ToOUString(aIn, nBytesLeft, eSrcChar)); if( rRangeNameBufferWK3.FindAbs( aTmp, nRngIndex ) ) aStack << aPool.Store( nRngIndex ); else diff --git a/sc/source/filter/qpro/qproform.cxx b/sc/source/filter/qpro/qproform.cxx index 30b7d6032745..6c8e8b7d371c 100644 --- a/sc/source/filter/qpro/qproform.cxx +++ b/sc/source/filter/qpro/qproform.cxx @@ -249,7 +249,7 @@ ConvErr QProToSc::Convert( const ScTokenArray*& pArray, sal_uInt16 /*nLen*/, con } if( nFmla[ i ] == 0x06 ) { - String aTmp(::read_zeroTerminated_uInt8s_AsOUString(maIn, maIn.GetStreamCharSet())); + String aTmp(::read_zeroTerminated_uInt8s_ToOUString(maIn, maIn.GetStreamCharSet())); sStringArray[ nStringCount ] = aTmp; nStringCount++; SAFEDEC_OR_RET(nRef, aTmp.Len() + 1, ConvErrCount); diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx index 9d33f09eca2f..fd3b0d264ebd 100644 --- a/sc/source/ui/unoobj/scdetect.cxx +++ b/sc/source/ui/unoobj/scdetect.cxx @@ -734,7 +734,7 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream ) // get file header rStr.Seek( 0 ); const sal_Size nTrySize = 80; - ByteString aHeader = read_uInt8s_AsOString(rStr, nTrySize); + ByteString aHeader = read_uInt8s_ToOString(rStr, nTrySize); if ( HTMLParser::IsHTMLFormat( aHeader.GetBuffer() ) ) { diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index 7e8064f781ea..c320f0c762d3 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -2605,7 +2605,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a *xCompObj >> nStringLen; if ( ( nStringLen > 1 ) && ( ( xCompObj->Tell() + nStringLen ) < nStreamLen ) ) { // i think that the OleIdentifier will follow - rtl::OString aTemp = read_uInt8s_AsOString(*xCompObj, nStringLen - 1); + rtl::OString aTemp = read_uInt8s_ToOString(*xCompObj, nStringLen - 1); aOleIdentifier = rtl::OStringToOUString(aTemp, RTL_TEXTENCODING_MS_1252); } } diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx index 18214c5db042..acf69186d2ac 100644 --- a/sfx2/source/bastyp/sfxhtml.cxx +++ b/sfx2/source/bastyp/sfxhtml.cxx @@ -274,7 +274,7 @@ sal_Bool SfxHTMLParser::FinishFileDownload( String& rStr ) : STRING_MAXLEN; aStream.Seek( 0 ); - rtl::OString sBuffer = read_uInt8s_AsOString(aStream, nLen); + rtl::OString sBuffer = read_uInt8s_ToOString(aStream, nLen); rStr = S2U(sBuffer); } diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx index b6fb581057fc..f1cf5c0c3127 100644 --- a/sot/source/sdstor/ucbstorage.cxx +++ b/sot/source/sdstor/ucbstorage.cxx @@ -3303,8 +3303,7 @@ String UCBStorage::GetLinkedFile( SvStream &rStream ) rStream >> nBytes; if( nBytes == 0x04034b50 ) { - ByteString aTmp; - rStream.ReadByteString( aTmp ); + ByteString aTmp = read_lenPrefixed_uInt8s_ToOString(rStream); if ( aTmp.CompareTo( "ContentURL=", 11 ) == COMPARE_EQUAL ) { aTmp.Erase( 0, 11 ); diff --git a/svl/source/items/cntwall.cxx b/svl/source/items/cntwall.cxx index f81bd487d48a..31ef07e8a06e 100644 --- a/svl/source/items/cntwall.cxx +++ b/svl/source/items/cntwall.cxx @@ -80,8 +80,7 @@ CntWallpaperItem::CntWallpaperItem( sal_uInt16 which, SvStream& rStream, sal_uIn readUnicodeString(rStream, _aURL, false); // "Read" SfxWallpaperItem's string member _aFilter. - ByteString aDummy; - rStream.ReadByteString(aDummy); + read_lenPrefixed_uInt8s_ToOString(rStream); } } diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index a85491e4f30d..424aaa0204ce 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -1768,8 +1768,7 @@ void SvNumberformat::ConvertLanguage( SvNumberFormatter& rConverter, void SvNumberformat::LoadString( SvStream& rStream, String& rStr ) { CharSet eStream = rStream.GetStreamCharSet(); - ByteString aStr; - rStream.ReadByteString( aStr ); + ByteString aStr = read_lenPrefixed_uInt8s_ToOString(rStream); sal_Char cStream = NfCurrencyEntry::GetEuroSymbol( eStream ); if ( aStr.Search( cStream ) == STRING_NOTFOUND ) { // simple conversion to unicode diff --git a/svtools/source/filter/igif/gifread.cxx b/svtools/source/filter/igif/gifread.cxx index 81dee55fabf5..607b6a877af3 100644 --- a/svtools/source/filter/igif/gifread.cxx +++ b/svtools/source/filter/igif/gifread.cxx @@ -257,8 +257,8 @@ sal_Bool GIFReader::ReadExtension() // Appl.-Extension hat Laenge 11 if ( cSize == 0x0b ) { - rtl::OString aAppId = read_uInt8s_AsOString(rIStm, 8); - rtl::OString aAppCode = read_uInt8s_AsOString(rIStm, 3); + rtl::OString aAppId = read_uInt8s_ToOString(rIStm, 8); + rtl::OString aAppCode = read_uInt8s_ToOString(rIStm, 3); rIStm >> cSize; // NetScape-Extension diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx index f259ccb06af4..db3e8728f8d2 100644 --- a/svtools/source/graphic/grfmgr.cxx +++ b/svtools/source/graphic/grfmgr.cxx @@ -1125,7 +1125,6 @@ SvStream& operator>>( SvStream& rIStm, GraphicObject& rGraphicObj ) VersionCompat aCompat( rIStm, STREAM_READ ); Graphic aGraphic; GraphicAttr aAttr; - ByteString aLink; sal_Bool bLink; rIStm >> aGraphic >> aAttr >> bLink; @@ -1135,8 +1134,8 @@ SvStream& operator>>( SvStream& rIStm, GraphicObject& rGraphicObj ) if( bLink ) { - rIStm.ReadByteString(aLink); - rGraphicObj.SetLink( UniString( aLink, RTL_TEXTENCODING_UTF8 ) ); + rtl::OUString aLink = read_lenPrefixed_uInt8s_ToOUString(rIStm, RTL_TEXTENCODING_UTF8); + rGraphicObj.SetLink(aLink); } else rGraphicObj.SetLink(); @@ -1154,7 +1153,7 @@ SvStream& operator<<( SvStream& rOStm, const GraphicObject& rGraphicObj ) rOStm << rGraphicObj.GetGraphic() << rGraphicObj.GetAttr() << bLink; if( bLink ) - rOStm.WriteByteString(rtl::OUStringToOString(rGraphicObj.GetLink(), RTL_TEXTENCODING_UTF8)); + write_lenPrefixed_uInt8s_FromOUString(rOStm, rGraphicObj.GetLink(), RTL_TEXTENCODING_UTF8); return rOStm; } diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx index 016250c23c8c..bb720f6838e7 100644 --- a/svtools/source/misc/imap.cxx +++ b/svtools/source/misc/imap.cxx @@ -104,16 +104,16 @@ void IMapObject::Write( SvStream& rOStm, const String& rBaseURL ) const const rtl::OString aRelURL = rtl::OUStringToOString( URIHelper::simpleNormalizedMakeRelative(rBaseURL, aURL), eEncoding); - rOStm.WriteByteString(aRelURL); - rOStm.WriteByteString(rtl::OUStringToOString(aAltText, eEncoding)); + write_lenPrefixed_uInt8s_FromOString(rOStm, aRelURL); + write_lenPrefixed_uInt8s_FromOUString(rOStm, aAltText, eEncoding); rOStm << bActive; - rOStm.WriteByteString(rtl::OUStringToOString(aTarget, eEncoding)); + write_lenPrefixed_uInt8s_FromOUString(rOStm, aTarget, eEncoding); pCompat = new IMapCompat( rOStm, STREAM_WRITE ); WriteIMapObject( rOStm ); - aEventList.Write( rOStm ); // V4 - rOStm.WriteByteString(rtl::OUStringToOString(aName, eEncoding)); // V5 + aEventList.Write( rOStm ); // V4 + write_lenPrefixed_uInt8s_FromOUString(rOStm, aName, eEncoding); // V5 delete pCompat; } @@ -129,16 +129,15 @@ void IMapObject::Read( SvStream& rIStm, const String& rBaseURL ) { IMapCompat* pCompat; rtl_TextEncoding nTextEncoding; - ByteString aString; // Typ und Version ueberlesen wir rIStm.SeekRel( 2 ); rIStm >> nReadVersion; rIStm >> nTextEncoding; - rIStm.ReadByteString( aString ); aURL = String( aString.GetBuffer(), nTextEncoding ); - rIStm.ReadByteString( aString ); aAltText = String( aString.GetBuffer(), nTextEncoding ); + aURL = read_lenPrefixed_uInt8s_ToOUString(rIStm, nTextEncoding); + aAltText = read_lenPrefixed_uInt8s_ToOUString(rIStm, nTextEncoding); rIStm >> bActive; - rIStm.ReadByteString( aString ); aTarget = String( aString.GetBuffer(), nTextEncoding ); + aTarget = read_lenPrefixed_uInt8s_ToOUString(rIStm, nTextEncoding); // URL absolut machen aURL = URIHelper::SmartRel2Abs( INetURLObject(rBaseURL), aURL, URIHelper::GetMaybeFileHdl(), true, false, INetURLObject::WAS_ENCODED, INetURLObject::DECODE_UNAMBIGUOUS ); @@ -153,9 +152,7 @@ void IMapObject::Read( SvStream& rIStm, const String& rBaseURL ) // ab Version 5 kann ein Objektname vorhanden sein if ( nReadVersion >= 0x0005 ) - { - rIStm.ReadByteString( aString ); aName = String( aString.GetBuffer(), nTextEncoding ); - } + aName = read_lenPrefixed_uInt8s_ToOUString(rIStm, nTextEncoding); } delete pCompat; @@ -1117,20 +1114,19 @@ void ImageMap::Write( SvStream& rOStm, const String& rBaseURL ) const { IMapCompat* pCompat; String aImageName( GetName() ); - String aDummy; sal_uInt16 nOldFormat = rOStm.GetNumberFormatInt(); sal_uInt16 nCount = (sal_uInt16) GetIMapObjectCount(); - const rtl_TextEncoding eEncoding = osl_getThreadTextEncoding(); + const rtl_TextEncoding eEncoding = osl_getThreadTextEncoding(); //vomit! rOStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); // MagicCode schreiben rOStm << IMAPMAGIC; rOStm << GetVersion(); - rOStm.WriteByteString(rtl::OUStringToOString(aImageName, eEncoding)); - rOStm.WriteByteString(rtl::OUStringToOString(aDummy, eEncoding)); + write_lenPrefixed_uInt8s_FromOUString(rOStm, aImageName, eEncoding); + write_lenPrefixed_uInt8s_FromOString(rOStm, rtl::OString()); //dummy rOStm << nCount; - rOStm.WriteByteString(rtl::OUStringToOString(aImageName, eEncoding)); + write_lenPrefixed_uInt8s_FromOUString(rOStm, aImageName, eEncoding); pCompat = new IMapCompat( rOStm, STREAM_WRITE ); @@ -1152,7 +1148,6 @@ void ImageMap::Write( SvStream& rOStm, const String& rBaseURL ) const void ImageMap::Read( SvStream& rIStm, const String& rBaseURL ) { - ByteString aString; char cMagic[6]; sal_uInt16 nOldFormat = rIStm.GetNumberFormatInt(); sal_uInt16 nCount; @@ -1170,10 +1165,10 @@ void ImageMap::Read( SvStream& rIStm, const String& rBaseURL ) // Version ueberlesen wir rIStm.SeekRel( 2 ); - rIStm.ReadByteString( aString ); aName = String( aString, osl_getThreadTextEncoding() ); - rIStm.ReadByteString( aString ); // Dummy + aName = read_lenPrefixed_uInt8s_ToOUString(rIStm, osl_getThreadTextEncoding()); + read_lenPrefixed_uInt8s_ToOString(rIStm); // Dummy rIStm >> nCount; - rIStm.ReadByteString( aString ); // Dummy + read_lenPrefixed_uInt8s_ToOString(rIStm); // Dummy pCompat = new IMapCompat( rIStm, STREAM_READ ); diff --git a/svtools/source/urlobj/inetimg.cxx b/svtools/source/urlobj/inetimg.cxx index fff9d170399a..8ed7996c16d0 100644 --- a/svtools/source/urlobj/inetimg.cxx +++ b/svtools/source/urlobj/inetimg.cxx @@ -73,7 +73,7 @@ sal_Bool INetImage::Read( SvStream& rIStm, sal_uLong nFormat ) { case SOT_FORMATSTR_ID_INET_IMAGE: { - String sINetImg = read_zeroTerminated_uInt8s_AsOUString(rIStm, RTL_TEXTENCODING_UTF8); + String sINetImg = read_zeroTerminated_uInt8s_ToOUString(rIStm, RTL_TEXTENCODING_UTF8); xub_StrLen nStart = 0; aImageURL = sINetImg.GetToken( 0, TOKEN_SEPARATOR, nStart ); aTargetURL = sINetImg.GetToken( 0, TOKEN_SEPARATOR, nStart ); @@ -119,11 +119,11 @@ sal_Bool INetImage::Read( SvStream& rIStm, sal_uLong nFormat ) // skip over iExtraHTML_Offset rIStm.SeekRel( sizeof( int ) ); - aImageURL = read_zeroTerminated_uInt8s_AsOUString(rIStm, eSysCSet); + aImageURL = read_zeroTerminated_uInt8s_ToOUString(rIStm, eSysCSet); if( nAltOffset ) { rIStm.Seek( nFilePos + nAltOffset ); - aAlternateText = read_zeroTerminated_uInt8s_AsOUString(rIStm, eSysCSet); + aAlternateText = read_zeroTerminated_uInt8s_ToOUString(rIStm, eSysCSet); } else if( aAlternateText.Len() ) aAlternateText.Erase(); @@ -131,7 +131,7 @@ sal_Bool INetImage::Read( SvStream& rIStm, sal_uLong nFormat ) if( nAnchorOffset ) { rIStm.Seek( nFilePos + nAnchorOffset ); - aTargetURL = read_zeroTerminated_uInt8s_AsOUString(rIStm, eSysCSet); + aTargetURL = read_zeroTerminated_uInt8s_ToOUString(rIStm, eSysCSet); } else if( aTargetURL.Len() ) aTargetURL.Erase(); diff --git a/svx/inc/svx/gallery1.hxx b/svx/inc/svx/gallery1.hxx index aa5cc4aa0f8e..de6ebc684a32 100644 --- a/svx/inc/svx/gallery1.hxx +++ b/svx/inc/svx/gallery1.hxx @@ -47,16 +47,16 @@ class GalleryThemeEntry { private: - String aName; + rtl::OUString aName; INetURLObject aThmURL; INetURLObject aSdgURL; INetURLObject aSdvURL; - sal_uInt32 nFileNumber; - sal_uInt32 nId; - sal_Bool bReadOnly; - sal_Bool bImported; - sal_Bool bModified; - sal_Bool bThemeNameFromResource; + sal_uInt32 nFileNumber; + sal_uInt32 nId; + sal_Bool bReadOnly; + sal_Bool bImported; + sal_Bool bModified; + sal_Bool bThemeNameFromResource; GalleryThemeEntry(); INetURLObject ImplGetURLIgnoreCase( const INetURLObject& rURL ) const; @@ -68,26 +68,26 @@ public: sal_Bool bNewFile, sal_uInt32 nId, sal_Bool bThemeNameFromResource ); ~GalleryThemeEntry() {}; - const String& GetThemeName() const { return aName; } - sal_uInt32 GetFileNumber() const { return nFileNumber; } + const rtl::OUString& GetThemeName() const { return aName; } + sal_uInt32 GetFileNumber() const { return nFileNumber; } const INetURLObject& GetThmURL() const { return aThmURL; } const INetURLObject& GetSdgURL() const { return aSdgURL; } const INetURLObject& GetSdvURL() const { return aSdvURL; } - sal_Bool IsImported() const { return bImported; } - sal_Bool IsReadOnly() const { return bReadOnly; } - sal_Bool IsDefault() const; + sal_Bool IsImported() const { return bImported; } + sal_Bool IsReadOnly() const { return bReadOnly; } + sal_Bool IsDefault() const; - sal_Bool IsHidden() const { return aName.SearchAscii( "private://gallery/hidden/" ) == 0; } + sal_Bool IsHidden() const { return aName.matchAsciiL(RTL_CONSTASCII_STRINGPARAM("private://gallery/hidden/")); } - sal_Bool IsModified() const { return bModified; } + sal_Bool IsModified() const { return bModified; } void SetModified( sal_Bool bSet ) { bModified = ( bSet && !IsImported() && !IsReadOnly() ); } - void SetName( const String& rNewName ); - sal_Bool IsNameFromResource() const { return bThemeNameFromResource; } + void SetName( const rtl::OUString& rNewName ); + sal_Bool IsNameFromResource() const { return bThemeNameFromResource; } - sal_uInt32 GetId() const { return nId; } + sal_uInt32 GetId() const { return nId; } void SetId( sal_uInt32 nNewId, sal_Bool bResetThemeName ); }; @@ -99,10 +99,10 @@ typedef ::std::vector< GalleryThemeEntry* > GalleryThemeList; struct GalleryImportThemeEntry { - String aThemeName; - String aUIName; - INetURLObject aURL; - String aImportName; + rtl::OUString aThemeName; + rtl::OUString aUIName; + INetURLObject aURL; + rtl::OUString aImportName; }; typedef ::std::vector< GalleryImportThemeEntry* > GalleryImportThemeList; @@ -144,9 +144,9 @@ private: void ImplLoadImports(); void ImplWriteImportList(); - SVX_DLLPUBLIC GalleryThemeEntry* ImplGetThemeEntry( const String& rThemeName ); + SVX_DLLPUBLIC GalleryThemeEntry* ImplGetThemeEntry( const rtl::OUString& rThemeName ); GalleryThemeEntry* ImplGetThemeEntry( sal_uIntPtr nThemeId ); - GalleryImportThemeEntry* ImplGetImportThemeEntry( const String& rImportName ); + GalleryImportThemeEntry* ImplGetImportThemeEntry( const rtl::OUString& rImportName ); GalleryTheme* ImplGetCachedTheme( const GalleryThemeEntry* pThemeEntry ); void ImplDeleteCachedTheme( GalleryTheme* pTheme ); @@ -164,7 +164,7 @@ public: const GalleryThemeEntry* GetThemeInfo( const String& rThemeName ) { return ImplGetThemeEntry( rThemeName ); } SVX_DLLPUBLIC sal_Bool HasTheme( const String& rThemeName ); - String GetThemeName( sal_uIntPtr nThemeId ) const; + rtl::OUString GetThemeName( sal_uIntPtr nThemeId ) const; SVX_DLLPUBLIC sal_Bool CreateTheme( const String& rThemeName, sal_uInt32 nNumFrom = 0 ); sal_Bool RenameTheme( const String& rOldName, const String& rNewName ); diff --git a/svx/inc/svx/galmisc.hxx b/svx/inc/svx/galmisc.hxx index c7ed89c2f953..7f4563e89f7e 100644 --- a/svx/inc/svx/galmisc.hxx +++ b/svx/inc/svx/galmisc.hxx @@ -245,8 +245,8 @@ class GalleryHint : public SfxHint private: sal_uIntPtr mnType; - String maThemeName; - String maStringData; + rtl::OUString maThemeName; + rtl::OUString maStringData; sal_uIntPtr mnData1; sal_uIntPtr mnData2; @@ -258,11 +258,11 @@ public: GalleryHint( sal_uIntPtr nType, const String& rThemeName, const String& rStringData, sal_uIntPtr nData1 = 0UL, sal_uIntPtr nData2 = 0UL ) : mnType( nType ), maThemeName( rThemeName ), maStringData( rStringData ), mnData1( nData1 ), mnData2( nData2 ) {} - sal_uIntPtr GetType() const { return mnType; } - const String& GetThemeName() const { return maThemeName; } - const String& GetStringData() const { return maStringData; } - sal_uIntPtr GetData1() const { return mnData1; } - sal_uIntPtr GetData2() const { return mnData2; } + sal_uIntPtr GetType() const { return mnType; } + const rtl::OUString& GetThemeName() const { return maThemeName; } + const rtl::OUString& GetStringData() const { return maStringData; } + sal_uIntPtr GetData1() const { return mnData1; } + sal_uIntPtr GetData2() const { return mnData2; } }; #endif diff --git a/svx/inc/svx/galtheme.hxx b/svx/inc/svx/galtheme.hxx index 2bfdddf8ab4f..766bb449a78f 100644 --- a/svx/inc/svx/galtheme.hxx +++ b/svx/inc/svx/galtheme.hxx @@ -70,10 +70,10 @@ class ListBox; struct GalDragParams { - Region aDragRegion; - sal_uIntPtr nDragObjPos; - String aThemeName; - String aFileName; + Region aDragRegion; + sal_uIntPtr nDragObjPos; + rtl::OUString aThemeName; + rtl::OUString aFileName; SgaObjKind eObjKind; }; @@ -99,7 +99,7 @@ class GalleryTheme : public SfxBroadcaster private: GalleryObjectList aObjectList; - String aImportName; + rtl::OUString aImportName; String m_aDestDir; SotStorageRef aSvDrawStorageRef; Gallery* pParent; @@ -147,10 +147,10 @@ public: SVX_DLLPUBLIC bool RemoveObject( size_t nPos ); bool ChangeObjectPos( size_t nOldPos, size_t nNewPos ); - SVX_DLLPUBLIC const String& GetName() const; - const String& GetRealName() const; - const String& GetImportName() const { return aImportName; } - void SetImportName(const String& rImportName) { aImportName = rImportName; } + SVX_DLLPUBLIC const rtl::OUString& GetName() const; + const rtl::OUString& GetRealName() const; + const rtl::OUString& GetImportName() const { return aImportName; } + void SetImportName(const rtl::OUString& rImportName) { aImportName = rImportName; } const String& GetDestDir() const { return m_aDestDir; } void SetDestDir(const String& rDestDir) { m_aDestDir = rDestDir; } diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx index 4c10186cac9b..9b7cfe2739e6 100644 --- a/svx/source/gallery2/gallery1.cxx +++ b/svx/source/gallery2/gallery1.cxx @@ -78,7 +78,7 @@ GalleryThemeEntry::GalleryThemeEntry( const INetURLObject& rBaseURL, const Strin if( nId && bThemeNameFromResource ) aName = String( GAL_RESID( RID_GALLERYSTR_THEME_START + (sal_uInt16) nId ) ); - if( !aName.Len() ) + if( !aName.getLength() ) aName = rName; } @@ -107,7 +107,7 @@ INetURLObject GalleryThemeEntry::ImplGetURLIgnoreCase( const INetURLObject& rURL // ----------------------------------------------------------------------------- -void GalleryThemeEntry::SetName( const String& rNewName ) +void GalleryThemeEntry::SetName( const rtl::OUString& rNewName ) { if( aName != rNewName ) { @@ -132,16 +132,12 @@ void GalleryThemeEntry::SetId( sal_uInt32 nNewId, sal_Bool bResetThemeName ) SvStream& operator<<( SvStream& rOut, const GalleryImportThemeEntry& rEntry ) { - rOut.WriteByteString(rtl::OUStringToOString(rEntry.aThemeName, RTL_TEXTENCODING_UTF8)); - - rOut.WriteByteString(rtl::OUStringToOString(rEntry.aUIName, RTL_TEXTENCODING_UTF8)); - - rOut.WriteByteString(rtl::OUStringToOString(String(rEntry.aURL.GetMainURL( INetURLObject::NO_DECODE )), RTL_TEXTENCODING_UTF8)); - - rOut.WriteByteString(rtl::OUStringToOString(rEntry.aImportName, RTL_TEXTENCODING_UTF8)); - - rOut.WriteByteString(rtl::OUString()); + write_lenPrefixed_uInt8s_FromOUString(rOut, rEntry.aThemeName, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString(rOut, rEntry.aUIName, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString(rOut, (rEntry.aURL.GetMainURL( INetURLObject::NO_DECODE )), RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString(rOut, rEntry.aImportName, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOString(rOut, rtl::OString()); return rOut; } @@ -149,22 +145,11 @@ SvStream& operator<<( SvStream& rOut, const GalleryImportThemeEntry& rEntry ) SvStream& operator>>( SvStream& rIn, GalleryImportThemeEntry& rEntry ) { - ByteString aTmpStr; - - rIn.ReadByteString(aTmpStr); - rEntry.aThemeName = String( aTmpStr, RTL_TEXTENCODING_UTF8 ); - - rIn.ReadByteString(aTmpStr); - rEntry.aUIName = String( aTmpStr, RTL_TEXTENCODING_UTF8 ); - - rIn.ReadByteString(aTmpStr); - rEntry.aURL = INetURLObject( String( aTmpStr, RTL_TEXTENCODING_UTF8 ) ); - - rIn.ReadByteString(aTmpStr); - rEntry.aImportName = String( aTmpStr, RTL_TEXTENCODING_UTF8 ); - - rIn.ReadByteString(aTmpStr); - + rEntry.aThemeName = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); + rEntry.aUIName = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); + rEntry.aURL = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); + rEntry.aImportName = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); + read_lenPrefixed_uInt8s_ToOString(rIn); return rIn; } @@ -547,21 +532,23 @@ void Gallery::ImplWriteImportList() // ------------------------------------------------------------------------ -GalleryThemeEntry* Gallery::ImplGetThemeEntry( const String& rThemeName ) +GalleryThemeEntry* Gallery::ImplGetThemeEntry( const rtl::OUString& rThemeName ) { GalleryThemeEntry* pFound = NULL; - if( rThemeName.Len() ) + if( rThemeName.getLength() ) + { for ( size_t i = 0, n = aThemeList.size(); i < n && !pFound; ++i ) if( rThemeName == aThemeList[ i ]->GetThemeName() ) pFound = aThemeList[ i ]; + } return pFound; } // ------------------------------------------------------------------------ -GalleryImportThemeEntry* Gallery::ImplGetImportThemeEntry( const String& rImportName ) +GalleryImportThemeEntry* Gallery::ImplGetImportThemeEntry( const rtl::OUString& rImportName ) { for ( size_t i = 0, n = aImportList.size(); i < n; ++i ) if ( rImportName == aImportList[ i ]->aUIName ) @@ -571,7 +558,7 @@ GalleryImportThemeEntry* Gallery::ImplGetImportThemeEntry( const String& rImport // ------------------------------------------------------------------------ -String Gallery::GetThemeName( sal_uIntPtr nThemeId ) const +rtl::OUString Gallery::GetThemeName( sal_uIntPtr nThemeId ) const { GalleryThemeEntry* pFound = NULL; @@ -606,7 +593,7 @@ String Gallery::GetThemeName( sal_uIntPtr nThemeId ) const pFound = ( (Gallery*) this )->ImplGetThemeEntry( String::CreateFromAscii( aFallback.GetBuffer() ) ); } - return( pFound ? pFound->GetThemeName() : String() ); + return( pFound ? pFound->GetThemeName() : rtl::OUString() ); } // ------------------------------------------------------------------------ diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx index 1f03f1397b43..ddf56cbd7c01 100644 --- a/svx/source/gallery2/galobj.cxx +++ b/svx/source/gallery2/galobj.cxx @@ -168,7 +168,7 @@ void SgaObject::WriteData( SvStream& rOut, const String& rDestDir ) const String aURLWithoutDestDir = String(aURL.GetMainURL( INetURLObject::NO_DECODE )); aURLWithoutDestDir.SearchAndReplace(rDestDir, String()); - rOut.WriteByteString(rtl::OUStringToOString(aURLWithoutDestDir, RTL_TEXTENCODING_UTF8)); + write_lenPrefixed_uInt8s_FromOUString(rOut, aURLWithoutDestDir, RTL_TEXTENCODING_UTF8); } // ------------------------------------------------------------------------ @@ -185,9 +185,8 @@ void SgaObject::ReadData(SvStream& rIn, sal_uInt16& rReadVersion ) else rIn >> aThumbMtf; - ByteString aTmpStr; - rIn.ReadByteString(aTmpStr); - aURL = INetURLObject(rtl::OStringToOUString(aTmpStr,RTL_TEXTENCODING_UTF8)); + rtl::OUString aTmpStr = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); + aURL = INetURLObject(aTmpStr); } // ------------------------------------------------------------------------ @@ -294,9 +293,8 @@ void SgaObjectBmp::WriteData( SvStream& rOut, const String& rDestDir ) const SgaObject::WriteData( rOut, rDestDir ); char aDummy[ 10 ]; rOut.Write( aDummy, 10 ); - String aDummyStr; - rOut.WriteByteString(rtl::OUStringToOString(aDummyStr, RTL_TEXTENCODING_UTF8)); - rOut.WriteByteString(rtl::OUStringToOString(aTitle, RTL_TEXTENCODING_UTF8)); + write_lenPrefixed_uInt8s_FromOString(rOut, rtl::OString()); //dummy + write_lenPrefixed_uInt8s_FromOUString(rOut, aTitle, RTL_TEXTENCODING_UTF8); } // ------------------------------------------------------------------------ @@ -306,14 +304,10 @@ void SgaObjectBmp::ReadData( SvStream& rIn, sal_uInt16& rReadVersion ) SgaObject::ReadData( rIn, rReadVersion ); rIn.SeekRel( 10 ); // 16, 16, 32, 16 - ByteString aTmpStr; - rIn.ReadByteString(aTmpStr); // dummy + read_lenPrefixed_uInt8s_ToOString(rIn); //dummy if( rReadVersion >= 5 ) - { - rIn.ReadByteString(aTmpStr); - aTitle = rtl::OStringToOUString(aTmpStr, RTL_TEXTENCODING_UTF8); - } + aTitle = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); } // ------------------ @@ -380,7 +374,7 @@ void SgaObjectSound::WriteData( SvStream& rOut, const String& rDestDir ) const { SgaObject::WriteData( rOut, rDestDir ); rOut << (sal_uInt16) eSoundType; - rOut.WriteByteString(rtl::OUStringToOString(aTitle, RTL_TEXTENCODING_UTF8)); + write_lenPrefixed_uInt8s_FromOUString(rOut, aTitle, RTL_TEXTENCODING_UTF8); } // ------------------------------------------------------------------------ @@ -396,11 +390,7 @@ void SgaObjectSound::ReadData( SvStream& rIn, sal_uInt16& rReadVersion ) rIn >> nTmp16; eSoundType = (GalSoundType) nTmp16; if( rReadVersion >= 6 ) - { - ByteString aTmpStr; - rIn.ReadByteString(aTmpStr); - aTitle = rtl::OStringToOUString(aTmpStr, RTL_TEXTENCODING_UTF8); - } + aTitle = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); } } @@ -591,7 +581,7 @@ sal_Bool SgaObjectSvDraw::DrawCentered( OutputDevice* pOut, const FmFormModel& r void SgaObjectSvDraw::WriteData( SvStream& rOut, const String& rDestDir ) const { SgaObject::WriteData( rOut, rDestDir ); - rOut.WriteByteString(rtl::OUStringToOString(aTitle, RTL_TEXTENCODING_UTF8)); + write_lenPrefixed_uInt8s_FromOUString(rOut, aTitle, RTL_TEXTENCODING_UTF8); } // ------------------------------------------------------------------------ @@ -601,11 +591,7 @@ void SgaObjectSvDraw::ReadData( SvStream& rIn, sal_uInt16& rReadVersion ) SgaObject::ReadData( rIn, rReadVersion ); if( rReadVersion >= 5 ) - { - ByteString aTmpStr; - rIn.ReadByteString(aTmpStr); - aTitle = rtl::OStringToOUString(aTmpStr, RTL_TEXTENCODING_UTF8); - } + aTitle = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index 12f1e6d257ab..4a34a85ee611 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -733,8 +733,7 @@ GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const INetURLObject& rURL, sa { sal_uInt32 nThemeId = 0; - ByteString aTmpStr; - pIStm->ReadByteString(aTmpStr); + rtl::OString aTmpStr = read_lenPrefixed_uInt8s_ToOString(*pIStm); aThemeName = rtl::OStringToOUString(aTmpStr, RTL_TEXTENCODING_UTF8); // Charakterkonvertierung durchfuehren @@ -1355,7 +1354,7 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const sal_Bool bRel; rOStm << (sal_uInt16) 0x0004; - rOStm.WriteByteString(rtl::OUStringToOString(GetRealName(), RTL_TEXTENCODING_UTF8)); + write_lenPrefixed_uInt8s_FromOUString(rOStm, GetRealName(), RTL_TEXTENCODING_UTF8); rOStm << nCount << (sal_uInt16) osl_getThreadTextEncoding(); for( sal_uInt32 i = 0; i < nCount; i++ ) @@ -1395,7 +1394,7 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const aPath.SearchAndReplace(m_aDestDir, String()); rOStm << bRel; - rOStm.WriteByteString(rtl::OUStringToOString(aPath, RTL_TEXTENCODING_UTF8)); + write_lenPrefixed_uInt8s_FromOUString(rOStm, aPath, RTL_TEXTENCODING_UTF8); rOStm << pObj->nOffset << (sal_uInt16) pObj->eObjKind; } @@ -1433,10 +1432,9 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm ) String aThemeName; rtl_TextEncoding nTextEncoding; - aImportName = String(); + aImportName = rtl::OUString(); rIStm >> nVersion; - ByteString aTmpStr; - rIStm.ReadByteString(aTmpStr); + rtl::OString aTmpStr = read_lenPrefixed_uInt8s_ToOString(rIStm); rIStm >> nCount; if( nVersion >= 0x0004 ) @@ -1471,13 +1469,12 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm ) { pObj = new GalleryObject; - ByteString aTempFileName; String aFileName; String aPath; sal_uInt16 nTemp; rIStm >> bRel; - rIStm.ReadByteString(aTempFileName); + rtl::OString aTempFileName = read_lenPrefixed_uInt8s_ToOString(rIStm); rIStm >> pObj->nOffset; rIStm >> nTemp; pObj->eObjKind = (SgaObjKind) nTemp; @@ -1583,7 +1580,7 @@ SvStream& operator>>( SvStream& rIn, GalleryTheme& rTheme ) void GalleryTheme::ImplSetModified( sal_Bool bModified ) { pThm->SetModified( bModified ); } -const String& GalleryTheme::GetRealName() const { return pThm->GetThemeName(); } +const rtl::OUString& GalleryTheme::GetRealName() const { return pThm->GetThemeName(); } const INetURLObject& GalleryTheme::GetThmURL() const { return pThm->GetThmURL(); } const INetURLObject& GalleryTheme::GetSdgURL() const { return pThm->GetSdgURL(); } const INetURLObject& GalleryTheme::GetSdvURL() const { return pThm->GetSdvURL(); } @@ -1594,7 +1591,7 @@ sal_Bool GalleryTheme::IsImported() const { return pThm->IsImported(); } sal_Bool GalleryTheme::IsReadOnly() const { return pThm->IsReadOnly(); } sal_Bool GalleryTheme::IsDefault() const { return pThm->IsDefault(); } sal_Bool GalleryTheme::IsModified() const { return pThm->IsModified(); } -const String& GalleryTheme::GetName() const { return IsImported() ? aImportName : pThm->GetThemeName(); } +const rtl::OUString& GalleryTheme::GetName() const { return IsImported() ? aImportName : pThm->GetThemeName(); } void GalleryTheme::InsertAllThemes( ListBox& rListBox ) { diff --git a/sw/source/filter/ww1/w1class.cxx b/sw/source/filter/ww1/w1class.cxx index 3e5c3e6e0c25..a7e35cd65e41 100644 --- a/sw/source/filter/ww1/w1class.cxx +++ b/sw/source/filter/ww1/w1class.cxx @@ -85,7 +85,7 @@ String Ww1PlainText::GetText( sal_uLong ulOffset, sal_uLong nLen ) const bool bSeekOk = rFib.GetStream().Seek(nPos) == nPos; rtl::OString a8BitStr = bSeekOk ? - read_uInt8s_AsOString(rFib.GetStream(), nLen) : + read_uInt8s_ToOString(rFib.GetStream(), nLen) : rtl::OString(); return rtl::OStringToOUString(a8BitStr, RTL_TEXTENCODING_MS_1252); } diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 99237686e660..0ab1cf6e175a 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -281,7 +281,7 @@ bool Sttb::Read( SvStream& rS ) { SBBItem aItem; rS >> aItem.cchData; - aItem.data = read_LEuInt16s_AsOUString(rS, aItem.cchData); + aItem.data = read_LEuInt16s_ToOUString(rS, aItem.cchData); dataItems.push_back( aItem ); } } diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index c6702c55fc50..b72fcd55ab51 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -4334,7 +4334,7 @@ void WW8RStyle::ImportOldFormatStyles() } else // user style { - rtl::OString aTmp = read_uInt8s_AsOString(rSt, nCount); + rtl::OString aTmp = read_uInt8s_ToOString(rSt, nCount); nByteCount += aTmp.getLength(); sName = rtl::OStringToOUString(aTmp, eStructChrSet); } diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index 56631b9bb225..56981ace6280 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -1910,23 +1910,16 @@ Err: return false; } -String read_uInt8_PascalString(SvStream& rStrm, rtl_TextEncoding eEnc) -{ - sal_uInt8 nLen(0); - rStrm >> nLen; - return rtl::OStringToOUString(read_uInt8s_AsOString(rStrm, nLen), eEnc); -} - String read_LEuInt16_PascalString(SvStream& rStrm) { sal_uInt16 nLen(0); rStrm >> nLen; - return read_LEuInt16s_AsOUString(rStrm, nLen); + return read_LEuInt16s_ToOUString(rStrm, nLen); } String read_uInt8_BeltAndBracesString(SvStream& rStrm, rtl_TextEncoding eEnc) { - String aRet = read_uInt8_PascalString(rStrm, eEnc); + rtl::OUString aRet = read_lenPrefixed_uInt8s_ToOUString(rStrm, eEnc); rStrm.SeekRel(sizeof(sal_uInt8)); // skip null-byte at end return aRet; } @@ -1968,11 +1961,11 @@ xub_StrLen WW8ScannerBase::WW8ReadString( SvStream& rStrm, String& rStr, nLen = USHRT_MAX - 1; if( bIsUnicode ) - rStr.Append(String(read_LEuInt16s_AsOUString(rStrm, nLen))); + rStr.Append(String(read_LEuInt16s_ToOUString(rStrm, nLen))); else { // Alloc method automatically sets Zero at the end - rtl::OString aByteStr = read_uInt8s_AsOString(rStrm, nLen); + rtl::OString aByteStr = read_uInt8s_ToOString(rStrm, nLen); rStr.Append(String(rtl::OStringToOUString(aByteStr, eEnc))); } nTotalRead += nLen; @@ -3876,7 +3869,7 @@ void WW8ReadSTTBF(bool bVer8, SvStream& rStrm, sal_uInt32 nStart, sal_Int32 nLen { sal_uInt8 nBChar(0); rStrm >> nBChar; - rtl::OString aTmp = read_uInt8s_AsOString(rStrm, nBChar); + rtl::OString aTmp = read_uInt8s_ToOString(rStrm, nBChar); rArray.push_back(rtl::OStringToOUString(aTmp, eCS)); } @@ -3909,7 +3902,7 @@ void WW8ReadSTTBF(bool bVer8, SvStream& rStrm, sal_uInt32 nStart, sal_Int32 nLen { sal_uInt8 nBChar(0); rStrm >> nBChar; - rtl::OString aTmp = read_uInt8s_AsOString(rStrm, nBChar); + rtl::OString aTmp = read_uInt8s_ToOString(rStrm, nBChar); pValueArray->push_back(rtl::OStringToOUString(aTmp, eCS)); } } @@ -3935,7 +3928,7 @@ void WW8ReadSTTBF(bool bVer8, SvStream& rStrm, sal_uInt32 nStart, sal_Int32 nLen ++nRead; if (nBChar) { - rtl::OString aTmp = read_uInt8s_AsOString(rStrm, nBChar); + rtl::OString aTmp = read_uInt8s_ToOString(rStrm, nBChar); nRead += aTmp.getLength(); rArray.push_back(rtl::OStringToOUString(aTmp, eCS)); } diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx index a323b84bae6e..9cac3eb94c28 100644 --- a/sw/source/filter/ww8/ww8scan.hxx +++ b/sw/source/filter/ww8/ww8scan.hxx @@ -136,7 +136,10 @@ public: //Read a Pascal-style, i.e. single byte string length followed //by string contents -String read_uInt8_PascalString(SvStream& rStrm, rtl_TextEncoding eEnc); +inline String read_uInt8_PascalString(SvStream& rStrm, rtl_TextEncoding eEnc) +{ + return read_lenPrefixed_uInt8s_ToOUString(rStrm, eEnc); +} String read_LEuInt16_PascalString(SvStream& rStrm); //Belt and Braces strings, i.e. Pascal-style strings followed by diff --git a/sw/source/filter/ww8/ww8toolbar.cxx b/sw/source/filter/ww8/ww8toolbar.cxx index d615d860619c..06cf7e707e2b 100644 --- a/sw/source/filter/ww8/ww8toolbar.cxx +++ b/sw/source/filter/ww8/ww8toolbar.cxx @@ -1128,7 +1128,7 @@ bool TcgSttbfCore::Read( SvStream& rS ) for ( sal_Int32 index = 0; index < cData; ++index ) { rS >> dataItems[ index ].cchData; - dataItems[ index ].data = read_LEuInt16s_AsOUString(rS, dataItems[index].cchData); + dataItems[ index ].data = read_LEuInt16s_ToOUString(rS, dataItems[index].cchData); rS >> dataItems[ index ].extraData; } } diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx index 6f3905105b8b..422e090b06e9 100755 --- a/sw/source/ui/dochdl/swdtflvr.cxx +++ b/sw/source/ui/dochdl/swdtflvr.cxx @@ -1993,9 +1993,9 @@ int SwTransferable::_PasteDDE( TransferableDataHelper& rData, } // report useful error!! rtl_TextEncoding eEncoding = DDE_TXT_ENCODING; - aApp = read_zeroTerminated_uInt8s_AsOUString(*xStrm, eEncoding); - aTopic = read_zeroTerminated_uInt8s_AsOUString(*xStrm, eEncoding); - aItem = read_zeroTerminated_uInt8s_AsOUString(*xStrm, eEncoding); + aApp = read_zeroTerminated_uInt8s_ToOUString(*xStrm, eEncoding); + aTopic = read_zeroTerminated_uInt8s_ToOUString(*xStrm, eEncoding); + aItem = read_zeroTerminated_uInt8s_ToOUString(*xStrm, eEncoding); } String aCmd; diff --git a/tools/inc/tools/inetmsg.hxx b/tools/inc/tools/inetmsg.hxx index 610b804e7502..7c88b9c3aa7a 100644 --- a/tools/inc/tools/inetmsg.hxx +++ b/tools/inc/tools/inetmsg.hxx @@ -51,7 +51,7 @@ class INetMessageHeader ByteString m_aValue; public: - INetMessageHeader (void) + INetMessageHeader() {} INetMessageHeader ( @@ -64,7 +64,7 @@ public: : m_aName (rHdr.m_aName), m_aValue (rHdr.m_aValue) {} - ~INetMessageHeader (void) + ~INetMessageHeader() {} INetMessageHeader& operator= (const INetMessageHeader& rHdr) @@ -74,22 +74,22 @@ public: return *this; } - const ByteString& GetName (void) const { return m_aName; } - const ByteString& GetValue (void) const { return m_aValue; } + const ByteString& GetName() const { return m_aName; } + const ByteString& GetValue() const { return m_aValue; } friend SvStream& operator<< ( SvStream& rStrm, const INetMessageHeader& rHdr) { - rStrm.WriteByteString (rHdr.m_aName); - rStrm.WriteByteString (rHdr.m_aValue); + write_lenPrefixed_uInt8s_FromOString(rStrm, rHdr.m_aName); + write_lenPrefixed_uInt8s_FromOString(rStrm, rHdr.m_aValue); return rStrm; } friend SvStream& operator>> ( SvStream& rStrm, INetMessageHeader& rHdr) { - rStrm.ReadByteString (rHdr.m_aName); - rStrm.ReadByteString (rHdr.m_aValue); + rHdr.m_aName = read_lenPrefixed_uInt8s_ToOString(rStrm); + rHdr.m_aValue = read_lenPrefixed_uInt8s_ToOString(rStrm); return rStrm; } }; @@ -108,7 +108,7 @@ class INetMessage UniString m_aDocName; SvLockBytesRef m_xDocLB; - void ListCleanup_Impl (void); + void ListCleanup_Impl(); void ListCopy (const INetMessage& rMsg); protected: @@ -158,8 +158,8 @@ protected: virtual SvStream& operator>> (SvStream& rStrm); public: - INetMessage (void) : m_nDocSize(0) {} - virtual ~INetMessage (void); + INetMessage() : m_nDocSize(0) {} + virtual ~INetMessage(); INetMessage (const INetMessage& rMsg) : m_nDocSize (rMsg.m_nDocSize), @@ -178,7 +178,7 @@ public: return *this; } - sal_uIntPtr GetHeaderCount (void) const { return m_aHeaderList.size(); } + sal_uIntPtr GetHeaderCount() const { return m_aHeaderList.size(); } UniString GetHeaderName (sal_uIntPtr nIndex) const { @@ -204,13 +204,13 @@ public: sal_uIntPtr nIndex = ((sal_uIntPtr)-1) ); - sal_uIntPtr GetDocumentSize (void) const { return m_nDocSize; } + sal_uIntPtr GetDocumentSize() const { return m_nDocSize; } void SetDocumentSize (sal_uIntPtr nSize) { m_nDocSize = nSize; } - const UniString& GetDocumentName (void) const { return m_aDocName; } + const UniString& GetDocumentName() const { return m_aDocName; } void SetDocumentName (const UniString& rName) { m_aDocName = rName; } - SvLockBytes* GetDocumentLB (void) const { return m_xDocLB; } + SvLockBytes* GetDocumentLB() const { return m_xDocLB; } void SetDocumentLB (SvLockBytes *pDocLB) { m_xDocLB = pDocLB; } friend SvStream& operator<< ( @@ -260,9 +260,9 @@ protected: virtual SvStream& operator>> (SvStream& rStrm); public: - INetRFC822Message (void); + INetRFC822Message(); INetRFC822Message (const INetRFC822Message& rMsg); - virtual ~INetRFC822Message (void); + virtual ~INetRFC822Message(); INetRFC822Message& operator= (const INetRFC822Message& rMsg); @@ -277,105 +277,105 @@ public: /** Header fields. */ - UniString GetBCC (void) const + UniString GetBCC() const { return GetHeaderValue_Impl ( m_nIndex[INETMSG_RFC822_BCC], INetMIME::HEADER_FIELD_ADDRESS); } - UniString GetCC (void) const + UniString GetCC() const { return GetHeaderValue_Impl ( m_nIndex[INETMSG_RFC822_CC], INetMIME::HEADER_FIELD_ADDRESS); } - UniString GetComments (void) const + UniString GetComments() const { return GetHeaderValue_Impl ( m_nIndex[INETMSG_RFC822_COMMENTS], INetMIME::HEADER_FIELD_TEXT); } - UniString GetDate (void) const + UniString GetDate() const { return GetHeaderValue_Impl ( m_nIndex[INETMSG_RFC822_DATE], INetMIME::HEADER_FIELD_STRUCTURED); } - UniString GetFrom (void) const + UniString GetFrom() const { return GetHeaderValue_Impl ( m_nIndex[INETMSG_RFC822_FROM], INetMIME::HEADER_FIELD_ADDRESS); } - UniString GetInReplyTo (void) const + UniString GetInReplyTo() const { return GetHeaderValue_Impl ( m_nIndex[INETMSG_RFC822_IN_REPLY_TO], INetMIME::HEADER_FIELD_ADDRESS); // ??? MESSAGE_ID ??? } - UniString GetKeywords (void) const + UniString GetKeywords() const { return GetHeaderValue_Impl ( m_nIndex[INETMSG_RFC822_KEYWORDS], INetMIME::HEADER_FIELD_PHRASE); } - UniString GetMessageID (void) const + UniString GetMessageID() const { return GetHeaderValue_Impl ( m_nIndex[INETMSG_RFC822_MESSAGE_ID], INetMIME::HEADER_FIELD_MESSAGE_ID); } - UniString GetReferences (void) const + UniString GetReferences() const { return GetHeaderValue_Impl ( m_nIndex[INETMSG_RFC822_REFERENCES], INetMIME::HEADER_FIELD_ADDRESS); } - UniString GetReplyTo (void) const + UniString GetReplyTo() const { return GetHeaderValue_Impl ( m_nIndex[INETMSG_RFC822_REPLY_TO], INetMIME::HEADER_FIELD_ADDRESS); } - UniString GetReturnPath (void) const + UniString GetReturnPath() const { return GetHeaderValue_Impl ( m_nIndex[INETMSG_RFC822_RETURN_PATH], INetMIME::HEADER_FIELD_ADDRESS); } - UniString GetReturnReceiptTo (void) const + UniString GetReturnReceiptTo() const { return GetHeaderValue_Impl ( m_nIndex[INETMSG_RFC822_RETURN_RECEIPT_TO], INetMIME::HEADER_FIELD_ADDRESS); } - UniString GetSender (void) const + UniString GetSender() const { return GetHeaderValue_Impl ( m_nIndex[INETMSG_RFC822_SENDER], INetMIME::HEADER_FIELD_ADDRESS); } - UniString GetSubject (void) const + UniString GetSubject() const { return GetHeaderValue_Impl ( m_nIndex[INETMSG_RFC822_SUBJECT], INetMIME::HEADER_FIELD_TEXT); } - UniString GetTo (void) const + UniString GetTo() const { return GetHeaderValue_Impl ( m_nIndex[INETMSG_RFC822_TO], @@ -430,15 +430,15 @@ class TOOLS_DLLPUBLIC INetMIMEMessage : public INetRFC822Message INetMIMEMessage* pParent; INetMIMEMessgeList_impl aChildren; - ByteString m_aBoundary; + rtl::OString m_aBoundary; sal_Bool bHeaderParsed; friend class INetMIMEMessageStream; - const ByteString& GetMultipartBoundary (void) const { return m_aBoundary; } - void SetMultipartBoundary (const ByteString& rBnd) { m_aBoundary = rBnd; } + const rtl::OString& GetMultipartBoundary() const { return m_aBoundary; } + void SetMultipartBoundary (const rtl::OString& rBnd) { m_aBoundary = rBnd; } - void CleanupImp (void); + void CleanupImp(); void CopyImp (const INetMIMEMessage& rMsg); void SetHeaderParsed() { bHeaderParsed = sal_True; } @@ -447,9 +447,9 @@ protected: virtual SvStream& operator>> (SvStream& rStrm); public: - INetMIMEMessage (void); + INetMIMEMessage(); INetMIMEMessage (const INetMIMEMessage& rMsg); - virtual ~INetMIMEMessage (void); + virtual ~INetMIMEMessage(); INetMIMEMessage& operator= (const INetMIMEMessage& rMsg); @@ -467,35 +467,35 @@ public: /** Header fields. */ void SetMIMEVersion (const UniString& rVersion); - UniString GetMIMEVersion (void) const + UniString GetMIMEVersion() const { return GetHeaderValue (m_nIndex[INETMSG_MIME_VERSION]); } - UniString GetContentDescription (void) const + UniString GetContentDescription() const { return GetHeaderValue (m_nIndex[INETMSG_MIME_CONTENT_DESCRIPTION]); } void SetContentDisposition (const UniString& rDisposition); - UniString GetContentDisposition (void) const + UniString GetContentDisposition() const { return GetHeaderValue (m_nIndex[INETMSG_MIME_CONTENT_DISPOSITION]); } - UniString GetContentID (void) const + UniString GetContentID() const { return GetHeaderValue (m_nIndex[INETMSG_MIME_CONTENT_ID]); } void SetContentType (const UniString& rType); - UniString GetContentType (void) const + UniString GetContentType() const { return GetHeaderValue (m_nIndex[INETMSG_MIME_CONTENT_TYPE]); } void SetContentTransferEncoding (const UniString& rEncoding); - UniString GetContentTransferEncoding (void) const + UniString GetContentTransferEncoding() const { return GetHeaderValue (m_nIndex[INETMSG_MIME_CONTENT_TRANSFER_ENCODING]); } @@ -504,16 +504,16 @@ public: /** Message container methods. */ - sal_Bool IsContainer (void) const + sal_Bool IsContainer() const { return (IsMessage() || IsMultipart()); } - sal_Bool IsMessage (void) const + sal_Bool IsMessage() const { UniString aType (GetContentType()); return (aType.CompareIgnoreCaseToAscii("message/", 8) == 0); } - sal_Bool IsMultipart (void) const + sal_Bool IsMultipart() const { UniString aType (GetContentType()); return (aType.CompareIgnoreCaseToAscii("multipart/", 10) == 0); @@ -523,7 +523,7 @@ public: { return ( nIndex < aChildren.size() ) ? aChildren[ nIndex ] : NULL; } - INetMIMEMessage* GetParent (void) const { return pParent; } + INetMIMEMessage* GetParent() const { return pParent; } sal_Bool EnableAttachChild ( INetMessageContainerType eType = INETMSG_MULTIPART_MIXED); diff --git a/tools/inc/tools/stream.hxx b/tools/inc/tools/stream.hxx index 66312b76faaf..e6e939bbbd1b 100644 --- a/tools/inc/tools/stream.hxx +++ b/tools/inc/tools/stream.hxx @@ -28,6 +28,7 @@ #ifndef _STREAM_HXX #define _STREAM_HXX +#include #include "tools/toolsdllapi.h" #include #include @@ -364,10 +365,8 @@ public: SvStream& ReadByteString( UniString& rStr, rtl_TextEncoding eSrcCharSet ); SvStream& ReadByteString( UniString& rStr ) { return ReadByteString( rStr, GetStreamCharSet() ); } - SvStream& ReadByteString( ByteString& rStr ); SvStream& WriteByteString( const UniString& rStr, rtl_TextEncoding eDestCharSet ); SvStream& WriteByteString( const UniString& rStr ) { return WriteByteString( rStr, GetStreamCharSet() ); } - SvStream& WriteByteString( const ByteString& rStr ); SvStream& WriteNumber( sal_uInt32 nUInt32 ); SvStream& WriteNumber( sal_Int32 nInt32 ); @@ -546,22 +545,70 @@ TOOLS_DLLPUBLIC SvStream& endlub( SvStream& rStr ); //Attempt to read nLen 8bit units to an OString, returned rtl::OString's length //is number of units successfully read -TOOLS_DLLPUBLIC rtl::OString read_uInt8s_AsOString(SvStream& rStr, sal_Size nLen); +TOOLS_DLLPUBLIC rtl::OString read_uInt8s_ToOString(SvStream& rStrm, sal_Size nLen); //Attempt to read nLen little endian 16bit units to an OUString, returned //rtl::OUString's length is number of units successfully read -TOOLS_DLLPUBLIC rtl::OUString read_LEuInt16s_AsOUString(SvStream& rStr, sal_Size nLen); +TOOLS_DLLPUBLIC rtl::OUString read_LEuInt16s_ToOUString(SvStream& rStrm, sal_Size nLen); //Attempt to read 8bit units to an OString until a zero terminator is //encountered, returned rtl::OString's length is number of units *definitely* //successfully read, check SvStream::good() to see if null terminator was //sucessfully read -TOOLS_DLLPUBLIC rtl::OString read_zeroTerminated_uInt8s_AsOString(SvStream& rStr); +TOOLS_DLLPUBLIC rtl::OString read_zeroTerminated_uInt8s_ToOString(SvStream& rStrm); //Attempt to read 8bit units assuming source encoding eEnc to an OUString until //a zero terminator is encountered. Check SvStream::good() to see if null //terminator was sucessfully read -TOOLS_DLLPUBLIC rtl::OUString read_zeroTerminated_uInt8s_AsOUString(SvStream& rStr, rtl_TextEncoding eEnc); +TOOLS_DLLPUBLIC rtl::OUString read_zeroTerminated_uInt8s_ToOUString(SvStream& rStrm, rtl_TextEncoding eEnc); + +//Attempt to read a pascal-style length (of type prefix) prefixed sequence of +//8bit units to an OString, returned rtl::OString's length is number of units +//successfully read. +template rtl::OString read_lenPrefixed_uInt8s_ToOString(SvStream& rStrm) +{ + prefix nLen = 0; + rStrm >> nLen; + return read_uInt8s_ToOString(rStrm, nLen); +} + +//Attempt to read a pascal-style length (of type prefix) prefixed sequence of +//8bit units to an OUString +template rtl::OUString read_lenPrefixed_uInt8s_ToOUString(SvStream& rStrm, + rtl_TextEncoding eEnc) +{ + return rtl::OStringToOUString(read_lenPrefixed_uInt8s_ToOString(rStrm), eEnc); +} + +//Attempt to write a pascal-style length (of type prefix) prefixed sequence of +//8bit units from an OString, returned value is number of bytes written (including +//byte-count of prefix) +template sal_Size write_lenPrefixed_uInt8s_FromOString(SvStream& rStrm, + const rtl::OString &rStr) +{ + SAL_WARN_IF(rStr.getLength() > std::numeric_limits::max(), + "tools.stream", + "string too long for prefix count to fit in output type"); + + sal_Size nWritten = 0; + prefix nLen = std::min(rStr.getLength(), std::numeric_limits::max()); + rStrm << nLen; + if (rStrm.good()) + { + nWritten += sizeof(prefix); + nWritten += rStrm.Write(rStr.getStr(), nLen); + } + return nWritten; +} + +//Attempt to write a pascal-style length (of type prefix) prefixed sequence of +//8bit units from an OUString, returned value is number of bytes written (including +//byte-count of prefix) +template sal_Size write_lenPrefixed_uInt8s_FromOUString(SvStream& rStrm, + const rtl::OUString &rStr, rtl_TextEncoding eEnc) +{ + return write_lenPrefixed_uInt8s_FromOString(rStrm, rtl::OUStringToOString(rStr, eEnc)); +} // -------------- // - FileStream - diff --git a/tools/qa/cppunit/test_stream.cxx b/tools/qa/cppunit/test_stream.cxx index 77c2b9ed75ae..3e7580f40377 100644 --- a/tools/qa/cppunit/test_stream.cxx +++ b/tools/qa/cppunit/test_stream.cxx @@ -47,11 +47,13 @@ namespace void test_stdstream(); void test_fastostring(); void test_read_cstring(); + void test_read_pstring(); CPPUNIT_TEST_SUITE(Test); CPPUNIT_TEST(test_stdstream); CPPUNIT_TEST(test_fastostring); CPPUNIT_TEST(test_read_cstring); + CPPUNIT_TEST(test_read_pstring); CPPUNIT_TEST_SUITE_END(); }; @@ -67,7 +69,7 @@ namespace char tools_a(78); aMemStream >> tools_a; - CPPUNIT_ASSERT(std_a == 'f'); + CPPUNIT_ASSERT(tools_a == 'f'); iss.seekg(0, std::ios_base::end); //seeking to end doesn't set eof, reading past eof does @@ -98,7 +100,7 @@ namespace //a failed read doesn't change the data, it remains unchanged CPPUNIT_ASSERT(tools_a == 78); //nothing wrong with the stream, so not bad - CPPUNIT_ASSERT(!aMemStream.GetError()); + CPPUNIT_ASSERT(!aMemStream.bad()); //yet, the read didn't succeed CPPUNIT_ASSERT(!aMemStream.good()); @@ -133,18 +135,18 @@ namespace char foo[] = "foobar"; SvMemoryStream aMemStream(RTL_CONSTASCII_STRINGPARAM(foo), STREAM_READ); - rtl::OString aOne = read_uInt8s_AsOString(aMemStream, 3); + rtl::OString aOne = read_uInt8s_ToOString(aMemStream, 3); CPPUNIT_ASSERT(aOne.equalsL(RTL_CONSTASCII_STRINGPARAM("foo"))); - rtl::OString aTwo = read_uInt8s_AsOString(aMemStream, 3); + rtl::OString aTwo = read_uInt8s_ToOString(aMemStream, 3); CPPUNIT_ASSERT(aTwo.equalsL(RTL_CONSTASCII_STRINGPARAM("bar"))); - rtl::OString aThree = read_uInt8s_AsOString(aMemStream, 3); + rtl::OString aThree = read_uInt8s_ToOString(aMemStream, 3); CPPUNIT_ASSERT(!aThree.getLength()); aMemStream.Seek(0); - rtl::OString aFour = read_uInt8s_AsOString(aMemStream, 100); + rtl::OString aFour = read_uInt8s_ToOString(aMemStream, 100); CPPUNIT_ASSERT(aFour.equalsL(RTL_CONSTASCII_STRINGPARAM(foo))); } @@ -153,7 +155,7 @@ namespace char foo[] = "foobar"; SvMemoryStream aMemStream(RTL_CONSTASCII_STRINGPARAM(foo), STREAM_READ); - rtl::OString aOne = read_zeroTerminated_uInt8s_AsOString(aMemStream); + rtl::OString aOne = read_zeroTerminated_uInt8s_ToOString(aMemStream); CPPUNIT_ASSERT(aOne.equalsL(RTL_CONSTASCII_STRINGPARAM("foobar"))); CPPUNIT_ASSERT(!aMemStream.good()); CPPUNIT_ASSERT(!aMemStream.bad()); @@ -161,11 +163,52 @@ namespace aMemStream.Seek(0); foo[3] = 0; - rtl::OString aTwo = read_zeroTerminated_uInt8s_AsOString(aMemStream); + rtl::OString aTwo = read_zeroTerminated_uInt8s_ToOString(aMemStream); CPPUNIT_ASSERT(aTwo.equalsL(RTL_CONSTASCII_STRINGPARAM("foo"))); CPPUNIT_ASSERT(aMemStream.good()); } + void Test::test_read_pstring() + { + char foo[] = "\3foobar"; + SvMemoryStream aMemStream(RTL_CONSTASCII_STRINGPARAM(foo), STREAM_READ); + + rtl::OString aFoo = read_lenPrefixed_uInt8s_ToOString(aMemStream); + CPPUNIT_ASSERT(aFoo.equalsL(RTL_CONSTASCII_STRINGPARAM("foo"))); + CPPUNIT_ASSERT(aMemStream.good()); + CPPUNIT_ASSERT(!aMemStream.bad()); + CPPUNIT_ASSERT(!aMemStream.eof()); + + aMemStream.Seek(0); + foo[0] = 10; + aFoo = read_lenPrefixed_uInt8s_ToOString(aMemStream); + CPPUNIT_ASSERT(aFoo.equalsL(RTL_CONSTASCII_STRINGPARAM("foobar"))); + CPPUNIT_ASSERT(!aMemStream.good()); + CPPUNIT_ASSERT(!aMemStream.bad()); + CPPUNIT_ASSERT(aMemStream.eof()); + + aMemStream.SetNumberFormatInt(NUMBERFORMAT_INT_BIGENDIAN); + aMemStream.Seek(0); + foo[0] = 0; + foo[1] = 3; + aFoo = read_lenPrefixed_uInt8s_ToOString(aMemStream); + CPPUNIT_ASSERT(aFoo.equalsL(RTL_CONSTASCII_STRINGPARAM("oob"))); + CPPUNIT_ASSERT(aMemStream.good()); + CPPUNIT_ASSERT(!aMemStream.bad()); + CPPUNIT_ASSERT(!aMemStream.eof()); + + aMemStream.SetNumberFormatInt(NUMBERFORMAT_INT_LITTLEENDIAN); + aMemStream.Seek(0); + foo[0] = 3; + foo[1] = 0; + foo[2] = 0; + foo[3] = 0; + aFoo = read_lenPrefixed_uInt8s_ToOString(aMemStream); + CPPUNIT_ASSERT(aFoo.equalsL(RTL_CONSTASCII_STRINGPARAM("bar"))); + CPPUNIT_ASSERT(aMemStream.good()); + CPPUNIT_ASSERT(!aMemStream.bad()); + CPPUNIT_ASSERT(!aMemStream.eof()); + } CPPUNIT_TEST_SUITE_REGISTRATION(Test); } diff --git a/tools/source/inet/inetmsg.cxx b/tools/source/inet/inetmsg.cxx index f5fa071ad15a..f626dcccd508 100644 --- a/tools/source/inet/inetmsg.cxx +++ b/tools/source/inet/inetmsg.cxx @@ -66,7 +66,7 @@ inline sal_Unicode ascii_toLowerCase( sal_Unicode ch ) /* * ~INetMessage. */ -INetMessage::~INetMessage (void) +INetMessage::~INetMessage() { ListCleanup_Impl(); } @@ -74,7 +74,7 @@ INetMessage::~INetMessage (void) /* * ListCleanup_Impl. */ -void INetMessage::ListCleanup_Impl (void) +void INetMessage::ListCleanup_Impl() { // Cleanup. sal_uIntPtr i, n = m_aHeaderList.size(); @@ -243,7 +243,7 @@ enum _ImplINetRFC822MessageHeaderState /* * INetRFC822Message. */ -INetRFC822Message::INetRFC822Message (void) +INetRFC822Message::INetRFC822Message() : INetMessage() { for (sal_uInt16 i = 0; i < INETMSG_RFC822_NUMHDR; i++) @@ -275,7 +275,7 @@ INetRFC822Message& INetRFC822Message::operator= (const INetRFC822Message& rMsg) /* * ~INetRFC822Message. */ -INetRFC822Message::~INetRFC822Message (void) +INetRFC822Message::~INetRFC822Message() { } @@ -753,7 +753,7 @@ enum _ImplINetMIMEMessageHeaderState /* * INetMIMEMessage. */ -INetMIMEMessage::INetMIMEMessage (void) +INetMIMEMessage::INetMIMEMessage() : INetRFC822Message (), pParent (NULL), bHeaderParsed (sal_False) @@ -792,7 +792,7 @@ INetMIMEMessage& INetMIMEMessage::operator= ( /* * ~INetMIMEMessage. */ -INetMIMEMessage::~INetMIMEMessage (void) +INetMIMEMessage::~INetMIMEMessage() { // Cleanup. CleanupImp(); @@ -801,7 +801,7 @@ INetMIMEMessage::~INetMIMEMessage (void) /* * CleanupImp. */ -void INetMIMEMessage::CleanupImp (void) +void INetMIMEMessage::CleanupImp() { for( size_t i = 0, n = aChildren.size(); i < n; ++i ) { delete aChildren[ i ]; @@ -1161,7 +1161,7 @@ SvStream& INetMIMEMessage::operator<< (SvStream& rStrm) const for (sal_uInt16 i = 0; i < INETMSG_MIME_NUMHDR; i++) rStrm << static_cast(m_nIndex[i]); - rStrm.WriteByteString (m_aBoundary); + write_lenPrefixed_uInt8s_FromOString(rStrm, m_aBoundary); rStrm << static_cast(aChildren.size()); return rStrm; @@ -1181,7 +1181,7 @@ SvStream& INetMIMEMessage::operator>> (SvStream& rStrm) m_nIndex[i] = nTemp; } - rStrm.ReadByteString (m_aBoundary); + m_aBoundary = read_lenPrefixed_uInt8s_ToOString(rStrm); rStrm >> nTemp; diff --git a/tools/source/inet/inetstrm.cxx b/tools/source/inet/inetstrm.cxx index d70d84d2c30c..5345067aa0f8 100644 --- a/tools/source/inet/inetstrm.cxx +++ b/tools/source/inet/inetstrm.cxx @@ -1608,7 +1608,7 @@ int INetMIMEMessageStream::PutMsgLine (const sal_Char *pData, sal_uIntPtr nSize) // Multipart message body. Initialize multipart delimiters. // Multipart message. - if (pMsg->GetMultipartBoundary().Len() == 0) + if (pMsg->GetMultipartBoundary().getLength() == 0) { // Determine boundary. rtl::OString aType(rtl::OUStringToOString( diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx index 5fa5b0e43380..b70195978008 100644 --- a/tools/source/stream/stream.cxx +++ b/tools/source/stream/stream.cxx @@ -806,7 +806,7 @@ sal_Bool SvStream::ReadUniOrByteStringLine( String& rStr, rtl_TextEncoding eSrcC return ReadByteStringLine( rStr, eSrcCharSet ); } -rtl::OString read_zeroTerminated_uInt8s_AsOString(SvStream& rStream) +rtl::OString read_zeroTerminated_uInt8s_ToOString(SvStream& rStream) { rtl::OStringBuffer aOutput; @@ -839,10 +839,10 @@ rtl::OString read_zeroTerminated_uInt8s_AsOString(SvStream& rStream) return aOutput.makeStringAndClear(); } -rtl::OUString read_zeroTerminated_uInt8s_AsOUString(SvStream& rStream, rtl_TextEncoding eEnc) +rtl::OUString read_zeroTerminated_uInt8s_ToOUString(SvStream& rStream, rtl_TextEncoding eEnc) { return rtl::OStringToOUString( - read_zeroTerminated_uInt8s_AsOString(rStream), eEnc); + read_zeroTerminated_uInt8s_ToOString(rStream), eEnc); } /************************************************************************* @@ -1517,19 +1517,7 @@ SvStream& SvStream::ReadByteString( UniString& rStr, rtl_TextEncoding eSrcCharSe return *this; } - ByteString aStr; - ReadByteString( aStr ); - rStr = UniString( aStr, eSrcCharSet ); - return *this; -} - -// ----------------------------------------------------------------------- - -SvStream& SvStream::ReadByteString( ByteString& rStr ) -{ - sal_uInt16 nLen = 0; - operator>>( nLen ); - rStr = read_uInt8s_AsOString(*this, nLen); + rStr = read_lenPrefixed_uInt8s_ToOUString(*this, eSrcCharSet); return *this; } @@ -1563,17 +1551,7 @@ SvStream& SvStream::WriteByteString( const UniString& rStr, rtl_TextEncoding eDe return *this; } - return WriteByteString(rtl::OUStringToOString(rStr, eDestCharSet)); -} - -// ----------------------------------------------------------------------- - -SvStream& SvStream::WriteByteString( const ByteString& rStr) -{ - sal_uInt16 nLen = rStr.Len(); - operator<< ( nLen ); - if( nLen != 0 ) - Write( rStr.GetBuffer(), nLen ); + write_lenPrefixed_uInt8s_FromOUString(*this, rStr, eDestCharSet); return *this; } @@ -2454,7 +2432,7 @@ void SvDataCopyStream::Assign( const SvDataCopyStream& ) } //Create a OString of nLen bytes from rStream -rtl::OString read_uInt8s_AsOString(SvStream& rStrm, sal_Size nLen) +rtl::OString read_uInt8s_ToOString(SvStream& rStrm, sal_Size nLen) { using comphelper::string::rtl_string_alloc; @@ -2481,7 +2459,7 @@ rtl::OString read_uInt8s_AsOString(SvStream& rStrm, sal_Size nLen) } //Create a OUString of nLen little endian sal_Unicodes from rStream -rtl::OUString read_LEuInt16s_AsOUString(SvStream& rStrm, sal_Size nLen) +rtl::OUString read_LEuInt16s_ToOUString(SvStream& rStrm, sal_Size nLen) { using comphelper::string::rtl_uString_alloc; diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx index 30a23372661c..636df96a6c66 100644 --- a/vcl/source/gdi/animate.cxx +++ b/vcl/source/gdi/animate.cxx @@ -795,7 +795,6 @@ SvStream& operator<<( SvStream& rOStm, const Animation& rAnimation ) if( nCount ) { - const ByteString aDummyStr; const sal_uInt32 nDummy32 = 0UL; // Falls keine BitmapEx gesetzt wurde, schreiben wir @@ -825,7 +824,7 @@ SvStream& operator<<( SvStream& rOStm, const Animation& rAnimation ) rOStm << nDummy32; // unbenutzt rOStm << nDummy32; // unbenutzt rOStm << nDummy32; // unbenutzt - rOStm.WriteByteString(aDummyStr); // unbenutzt + write_lenPrefixed_uInt8s_FromOString(rOStm, rtl::OString()); // dummy rOStm << nRest; // Anzahl der Strukturen, die noch _folgen_ } } @@ -872,7 +871,6 @@ SvStream& operator>>( SvStream& rIStm, Animation& rAnimation ) { AnimationBitmap aAnimBmp; BitmapEx aBmpEx; - ByteString aDummyStr; sal_uInt32 nTmp32; sal_uInt16 nTmp16; sal_uInt8 cTmp; @@ -890,7 +888,7 @@ SvStream& operator>>( SvStream& rIStm, Animation& rAnimation ) rIStm >> nTmp32; // unbenutzt rIStm >> nTmp32; // unbenutzt rIStm >> nTmp32; // unbenutzt - rIStm.ReadByteString(aDummyStr); // unbenutzt + read_lenPrefixed_uInt8s_ToOString(rIStm); // unbenutzt rIStm >> nTmp16; // Rest zu lesen rAnimation.Insert( aAnimBmp ); diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx index 7efd1f6f6e82..738a5907172b 100644 --- a/vcl/source/gdi/cvtsvm.cxx +++ b/vcl/source/gdi/cvtsvm.cxx @@ -877,7 +877,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) rIStm >> aPt >> nIndex >> nLen >> nTmp; if ( nTmp && ( static_cast< sal_uInt32 >( nTmp ) < ( SAL_MAX_UINT16 - 1 ) ) ) { - rtl::OString aByteStr = read_uInt8s_AsOString(rIStm, nTmp); + rtl::OString aByteStr = read_uInt8s_ToOString(rIStm, nTmp); sal_uInt8 nTerminator = 0; rIStm >> nTerminator; DBG_ASSERT( nTerminator == 0, "expected string to be NULL terminated" ); @@ -899,7 +899,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) rIStm >> aPt >> nIndex >> nLen >> nTmp >> nAryLen; if ( nTmp && ( static_cast< sal_uInt32 >( nTmp ) < ( SAL_MAX_UINT16 - 1 ) ) ) { - rtl::OString aByteStr = read_uInt8s_AsOString(rIStm, nTmp); + rtl::OString aByteStr = read_uInt8s_ToOString(rIStm, nTmp); sal_uInt8 nTerminator = 0; rIStm >> nTerminator; DBG_ASSERT( nTerminator == 0, "expected string to be NULL terminated" ); @@ -962,7 +962,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) rIStm >> aPt >> nIndex >> nLen >> nTmp >> nWidth; if ( nTmp && ( static_cast< sal_uInt32 >( nTmp ) < ( SAL_MAX_INT16 - 1 ) ) ) { - rtl::OString aByteStr = read_uInt8s_AsOString(rIStm, nTmp); + rtl::OString aByteStr = read_uInt8s_ToOString(rIStm, nTmp); sal_uInt8 nTerminator = 0; rIStm >> nTerminator; DBG_ASSERT( nTerminator == 0, "expected string to be NULL terminated" ); @@ -1322,13 +1322,12 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) case( GDI_COMMENT_COMMENT ): { - ByteString aComment; sal_Int32 nValue; sal_uInt32 nDataSize; sal_uInt8* pData; sal_Int32 nFollowingActionCount; - rIStm.ReadByteString(aComment); + rtl::OString aComment = read_lenPrefixed_uInt8s_ToOString(rIStm); rIStm >> nValue >> nDataSize; if( nDataSize ) @@ -2413,7 +2412,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, rOStm.SeekRel( 4 ); // write data - rOStm.WriteByteString(pA->GetComment()); + write_lenPrefixed_uInt8s_FromOString(rOStm, pA->GetComment()); rOStm << pA->GetValue() << nDataSize; if( nDataSize ) diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx index 14b86b236068..796659cfdaa5 100644 --- a/vcl/source/gdi/jobset.cxx +++ b/vcl/source/gdi/jobset.cxx @@ -410,13 +410,21 @@ SvStream& operator<<( SvStream& rOStream, const JobSetup& rJobSetup ) rOStream.WriteByteString( it->first, RTL_TEXTENCODING_UTF8 ); rOStream.WriteByteString( it->second, RTL_TEXTENCODING_UTF8 ); } - rOStream.WriteByteString( "COMPAT_DUPLEX_MODE" ) ; + write_lenPrefixed_uInt8s_FromOString(rOStream, "COMPAT_DUPLEX_MODE"); switch( pJobData->meDuplexMode ) { - case DUPLEX_UNKNOWN: rOStream.WriteByteString( "DUPLEX_UNKNOWN" );break; - case DUPLEX_OFF: rOStream.WriteByteString( "DUPLEX_OFF" );break; - case DUPLEX_SHORTEDGE: rOStream.WriteByteString( "DUPLEX_SHORTEDGE" );break; - case DUPLEX_LONGEDGE: rOStream.WriteByteString( "DUPLEX_LONGEDGE" );break; + case DUPLEX_UNKNOWN: + write_lenPrefixed_uInt8s_FromOString(rOStream, "DUPLEX_UNKNOWN"); + break; + case DUPLEX_OFF: + write_lenPrefixed_uInt8s_FromOString(rOStream, "DUPLEX_OFF"); + break; + case DUPLEX_SHORTEDGE: + write_lenPrefixed_uInt8s_FromOString(rOStream, "DUPLEX_SHORTEDGE"); + break; + case DUPLEX_LONGEDGE: + write_lenPrefixed_uInt8s_FromOString(rOStream, "DUPLEX_LONGEDGE"); + break; } nLen = sal::static_int_cast(rOStream.Tell() - nPos); rOStream.Seek( nPos ); diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx index a0b6c3b27c6b..9961705cbb6c 100644 --- a/vcl/source/gdi/metaact.cxx +++ b/vcl/source/gdi/metaact.cxx @@ -4198,7 +4198,7 @@ sal_Bool MetaCommentAction::Compare( const MetaAction& rMetaAction ) const void MetaCommentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); - rOStm.WriteByteString(maComment); + write_lenPrefixed_uInt8s_FromOString(rOStm, maComment); rOStm << mnValue << mnDataSize; if ( mnDataSize ) @@ -4210,13 +4210,10 @@ void MetaCommentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) void MetaCommentAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); - ByteString sTmp; - rIStm.ReadByteString(sTmp); - maComment = sTmp; + maComment = read_lenPrefixed_uInt8s_ToOString(rIStm); rIStm >> mnValue >> mnDataSize; - if( mpData ) - delete[] mpData; + delete[] mpData; if( mnDataSize ) { -- cgit v1.2.3 From d00fc0e293852cfc019ffaffa65bee327397677b Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 19 Dec 2011 22:19:52 +0000 Subject: disentangle Read/WriteByteString OUString variants The ones which use a definite 8-bit encoding read/write pascal-style strings with a 16bit length prefix. The ones which use a definite 16-bit encoding read/write pascal-style UTF-16 strings with a 32bit length prefix, i.e. not ByteStrings at all The "I dunno" ones might be UTF-16 strings or 8-bit strings, depending on the charset. Rename to ReadUniOrByteString like the other similar horrors to flag this misery --- basic/source/basmgr/basmgr.cxx | 11 ++++--- basic/source/classes/image.cxx | 16 +++++----- basic/source/classes/sbxmod.cxx | 4 +-- basic/source/runtime/methods1.cxx | 4 +-- basic/source/sbx/sbxbase.cxx | 18 +++++++---- basic/source/sbx/sbxcoll.cxx | 6 ++-- basic/source/sbx/sbxobj.cxx | 14 +++++---- basic/source/sbx/sbxvalue.cxx | 23 +++++++------- basic/source/sbx/sbxvar.cxx | 19 +++++++----- dbaccess/source/ui/tabledesign/TableRow.cxx | 16 +++++----- editeng/source/editeng/editobj.cxx | 6 ++-- editeng/source/items/bulitem.cxx | 12 ++++---- editeng/source/items/flditem.cxx | 4 +-- editeng/source/items/frmitems.cxx | 8 ++--- editeng/source/items/numitem.cxx | 6 ++-- editeng/source/items/textitem.cxx | 16 +++++----- idl/source/objects/module.cxx | 8 ++--- sc/source/core/data/patattr.cxx | 8 ++--- sc/source/core/tool/autoform.cxx | 14 ++++++--- sc/source/core/tool/ddelink.cxx | 12 ++++---- sc/source/core/tool/zforauto.cxx | 4 +-- sd/source/filter/html/pubdlg.cxx | 48 +++++++++++++++++++---------- sfx2/source/appl/appmisc.cxx | 4 +-- sot/source/sdstor/ucbstorage.cxx | 2 +- svl/source/items/poolitem.cxx | 8 ++--- svl/source/numbers/zformat.cxx | 10 +++--- svtools/source/misc/templatefoldercache.cxx | 6 ++-- svtools/source/misc/transfer.cxx | 8 ++--- svx/source/items/hlnkitem.cxx | 32 +++++++++---------- svx/source/items/pageitem.cxx | 4 +-- sw/source/core/doc/tblafmt.cxx | 14 +++++---- sw/source/ui/config/uinums.cxx | 24 +++++++-------- tools/inc/tools/stream.hxx | 11 ++++--- tools/source/inet/inetmsg.cxx | 4 +-- tools/source/stream/stream.cxx | 4 +-- vcl/source/gdi/font.cxx | 8 ++--- vcl/source/gdi/jobset.cxx | 9 +++--- vcl/source/gdi/metaact.cxx | 16 +++++----- vcl/source/gdi/print.cxx | 21 +++++-------- vcl/source/gdi/rendergraphic.cxx | 6 ++-- vcl/win/source/gdi/salgdi3.cxx | 13 ++++---- 41 files changed, 257 insertions(+), 224 deletions(-) (limited to 'sd') diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx index e6c829adbe2c..9052458e84db 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -643,17 +643,17 @@ BasicLibInfo* BasicLibInfo::Create( SotStorageStream& rSStream ) // The name of the lib... String aName; - rSStream.ReadByteString(aName); + rSStream.ReadUniOrByteString(aName, rSStream.GetStreamCharSet()); pInfo->SetLibName( aName ); // Absolute path... String aStorageName; - rSStream.ReadByteString(aStorageName); + rSStream.ReadUniOrByteString(aStorageName, rSStream.GetStreamCharSet()); pInfo->SetStorageName( aStorageName ); // Relative path... String aRelStorageName; - rSStream.ReadByteString(aRelStorageName); + rSStream.ReadUniOrByteString(aRelStorageName, rSStream.GetStreamCharSet()); pInfo->SetRelStorageName( aRelStorageName ); if ( nVer >= 2 ) @@ -1041,7 +1041,7 @@ void BasicManager::LoadOldBasicManager( SotStorage& rStorage ) } xManagerStream->Seek( nBasicEndOff+1 ); // +1: 0x00 as separator String aLibs; - xManagerStream->ReadByteString(aLibs); + xManagerStream->ReadUniOrByteString(aLibs, xManagerStream->GetStreamCharSet()); xManagerStream->SetBufferSize( 0 ); xManagerStream.Clear(); // Close stream @@ -1235,7 +1235,8 @@ sal_Bool BasicManager::ImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* pCurSt if ( ( nPasswordMarker == PASSWORD_MARKER ) && !xBasicStream->IsEof() ) { String aPassword; - xBasicStream->ReadByteString(aPassword); + xBasicStream->ReadUniOrByteString(aPassword, + xBasicStream->GetStreamCharSet()); pLibInfo->SetPassword( aPassword ); } xBasicStream->SetCryptMaskKey(rtl::OString()); diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx index 1208184b5672..79b3765fa1fc 100644 --- a/basic/source/classes/image.cxx +++ b/basic/source/classes/image.cxx @@ -147,15 +147,15 @@ sal_Bool SbiImage::Load( SvStream& r, sal_uInt32& nVersion ) switch( nSign ) { case B_NAME: - r.ReadByteString( aName, eCharSet ); + r.ReadUniOrByteString( aName, eCharSet ); break; case B_COMMENT: - r.ReadByteString( aComment, eCharSet ); + r.ReadUniOrByteString( aComment, eCharSet ); break; case B_SOURCE: { String aTmp; - r.ReadByteString( aTmp, eCharSet ); + r.ReadUniOrByteString( aTmp, eCharSet ); aOUSource = aTmp; break; } @@ -164,7 +164,7 @@ sal_Bool SbiImage::Load( SvStream& r, sal_uInt32& nVersion ) for( sal_uInt16 j = 0 ; j < nCount ; j++ ) { String aTmp; - r.ReadByteString( aTmp, eCharSet ); + r.ReadUniOrByteString( aTmp, eCharSet ); aOUSource += aTmp; } break; @@ -274,14 +274,14 @@ sal_Bool SbiImage::Save( SvStream& r, sal_uInt32 nVer ) if( aName.Len() && SbiGood( r ) ) { nPos = SbiOpenRecord( r, B_NAME, 1 ); - r.WriteByteString( aName, eCharSet ); + r.WriteUniOrByteString( aName, eCharSet ); SbiCloseRecord( r, nPos ); } // Comment? if( aComment.Len() && SbiGood( r ) ) { nPos = SbiOpenRecord( r, B_COMMENT, 1 ); - r.WriteByteString( aComment, eCharSet ); + r.WriteUniOrByteString( aComment, eCharSet ); SbiCloseRecord( r, nPos ); } // Source? @@ -295,7 +295,7 @@ sal_Bool SbiImage::Save( SvStream& r, sal_uInt32 nVer ) aTmp = aOUSource.copy( 0, nMaxUnitSize ); else aTmp = aOUSource; - r.WriteByteString( aTmp, eCharSet ); + r.WriteUniOrByteString( aTmp, eCharSet ); SbiCloseRecord( r, nPos ); if( nLen > STRING_MAXLEN ) @@ -309,7 +309,7 @@ sal_Bool SbiImage::Save( SvStream& r, sal_uInt32 nVer ) (nRemainingLen > nMaxUnitSize) ? nMaxUnitSize : nRemainingLen; String aTmp2 = aOUSource.copy( (i+1) * nMaxUnitSize, nCopyLen ); nRemainingLen -= nCopyLen; - r.WriteByteString( aTmp2, eCharSet ); + r.WriteUniOrByteString( aTmp2, eCharSet ); } SbiCloseRecord( r, nPos ); } diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index 07194fafc966..975ecc20a0a2 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -2002,7 +2002,7 @@ sal_Bool SbJScriptModule::LoadData( SvStream& rStrm, sal_uInt16 nVer ) // Get the source string String aTmp; - rStrm.ReadByteString( aTmp, osl_getThreadTextEncoding() ); + rStrm.ReadUniOrByteString( aTmp, osl_getThreadTextEncoding() ); aOUSource = aTmp; return sal_True; } @@ -2014,7 +2014,7 @@ sal_Bool SbJScriptModule::StoreData( SvStream& rStrm ) const // Write the source string String aTmp = aOUSource; - rStrm.WriteByteString( aTmp, osl_getThreadTextEncoding() ); + rStrm.WriteUniOrByteString( aTmp, osl_getThreadTextEncoding() ); return sal_True; } diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx index 2ff6990e215d..5b25252a780d 100644 --- a/basic/source/runtime/methods1.cxx +++ b/basic/source/runtime/methods1.cxx @@ -991,7 +991,7 @@ sal_Bool lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm, { if( bIsVariant ) *pStrm << (sal_uInt16)SbxSTRING; - pStrm->WriteByteString( rStr, osl_getThreadTextEncoding() ); + pStrm->WriteUniOrByteString( rStr, osl_getThreadTextEncoding() ); } else { @@ -1107,7 +1107,7 @@ sal_Bool lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm, case SbxLPSTR: { String aStr; - pStrm->ReadByteString( aStr, osl_getThreadTextEncoding() ); + pStrm->ReadUniOrByteString( aStr, osl_getThreadTextEncoding() ); rVar.PutString( aStr ); } break; diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx index 711efdcb5afc..7ab2d6c15b37 100644 --- a/basic/source/sbx/sbxbase.cxx +++ b/basic/source/sbx/sbxbase.cxx @@ -383,15 +383,18 @@ sal_Bool SbxInfo::LoadData( SvStream& rStrm, sal_uInt16 nVer ) { aParams.Remove( 0, aParams.Count() ); sal_uInt16 nParam; - rStrm.ReadByteString( aComment, RTL_TEXTENCODING_ASCII_US ); - rStrm.ReadByteString( aHelpFile, RTL_TEXTENCODING_ASCII_US ); + aComment = read_lenPrefixed_uInt8s_ToOUString(rStrm, + RTL_TEXTENCODING_ASCII_US); + aHelpFile = read_lenPrefixed_uInt8s_ToOUString(rStrm, + RTL_TEXTENCODING_ASCII_US); rStrm >> nHelpId >> nParam; while( nParam-- ) { XubString aName; sal_uInt16 nType, nFlags; sal_uInt32 nUserData = 0; - rStrm.ReadByteString( aName, RTL_TEXTENCODING_ASCII_US ); + aName = read_lenPrefixed_uInt8s_ToOUString(rStrm, + RTL_TEXTENCODING_ASCII_US); rStrm >> nType >> nFlags; if( nVer > 1 ) rStrm >> nUserData; @@ -404,13 +407,16 @@ sal_Bool SbxInfo::LoadData( SvStream& rStrm, sal_uInt16 nVer ) sal_Bool SbxInfo::StoreData( SvStream& rStrm ) const { - rStrm.WriteByteString( aComment, RTL_TEXTENCODING_ASCII_US ); - rStrm.WriteByteString( aHelpFile, RTL_TEXTENCODING_ASCII_US ); + write_lenPrefixed_uInt8s_FromOUString(rStrm, aComment, + RTL_TEXTENCODING_ASCII_US ); + write_lenPrefixed_uInt8s_FromOUString(rStrm, aHelpFile, + RTL_TEXTENCODING_ASCII_US); rStrm << nHelpId << aParams.Count(); for( sal_uInt16 i = 0; i < aParams.Count(); i++ ) { SbxParamInfo* p = aParams.GetObject( i ); - rStrm.WriteByteString( p->aName, RTL_TEXTENCODING_ASCII_US ); + write_lenPrefixed_uInt8s_FromOUString(rStrm, p->aName, + RTL_TEXTENCODING_ASCII_US); rStrm << (sal_uInt16) p->eType << (sal_uInt16) p->nFlags << (sal_uInt32) p->nUserData; diff --git a/basic/source/sbx/sbxcoll.cxx b/basic/source/sbx/sbxcoll.cxx index 7803ee013b2f..97573876064c 100644 --- a/basic/source/sbx/sbxcoll.cxx +++ b/basic/source/sbx/sbxcoll.cxx @@ -279,7 +279,8 @@ sal_Bool SbxStdCollection::LoadData( SvStream& rStrm, sal_uInt16 nVer ) sal_Bool bRes = SbxCollection::LoadData( rStrm, nVer ); if( bRes ) { - rStrm.ReadByteString( aElemClass, RTL_TEXTENCODING_ASCII_US ); + aElemClass = read_lenPrefixed_uInt8s_ToOUString(rStrm, + RTL_TEXTENCODING_ASCII_US); rStrm >> bAddRemoveOk; } return bRes; @@ -290,7 +291,8 @@ sal_Bool SbxStdCollection::StoreData( SvStream& rStrm ) const sal_Bool bRes = SbxCollection::StoreData( rStrm ); if( bRes ) { - rStrm.WriteByteString( aElemClass, RTL_TEXTENCODING_ASCII_US ); + write_lenPrefixed_uInt8s_FromOUString(rStrm, aElemClass, + RTL_TEXTENCODING_ASCII_US); rStrm << bAddRemoveOk; } return bRes; diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx index 81574efd0fba..0c98fca20049 100644 --- a/basic/source/sbx/sbxobj.cxx +++ b/basic/source/sbx/sbxobj.cxx @@ -591,8 +591,10 @@ sal_Bool SbxObject::LoadData( SvStream& rStrm, sal_uInt16 nVer ) aData.pObj = this; sal_uInt32 nSize; XubString aDfltProp; - rStrm.ReadByteString( aClassName, RTL_TEXTENCODING_ASCII_US ); - rStrm.ReadByteString( aDfltProp, RTL_TEXTENCODING_ASCII_US ); + aClassName = read_lenPrefixed_uInt8s_ToOUString(rStrm, + RTL_TEXTENCODING_ASCII_US); + aDfltProp = read_lenPrefixed_uInt8s_ToOUString(rStrm, + RTL_TEXTENCODING_ASCII_US); sal_uIntPtr nPos = rStrm.Tell(); rStrm >> nSize; if( !LoadPrivateData( rStrm, nVer ) ) @@ -620,8 +622,8 @@ sal_Bool SbxObject::StoreData( SvStream& rStrm ) const XubString aDfltProp; if( pDfltProp ) aDfltProp = pDfltProp->GetName(); - rStrm.WriteByteString( aClassName, RTL_TEXTENCODING_ASCII_US ); - rStrm.WriteByteString( aDfltProp, RTL_TEXTENCODING_ASCII_US ); + write_lenPrefixed_uInt8s_FromOUString(rStrm, aClassName, RTL_TEXTENCODING_ASCII_US); + write_lenPrefixed_uInt8s_FromOUString(rStrm, aDfltProp, RTL_TEXTENCODING_ASCII_US); sal_uIntPtr nPos = rStrm.Tell(); rStrm << (sal_uInt32) 0L; if( !StorePrivateData( rStrm ) ) @@ -797,7 +799,7 @@ void SbxObject::Dump( SvStream& rStrm, sal_Bool bFill ) aLine += aAttrs2; if( !pVar->IsA( TYPE(SbxMethod) ) ) aLine.AppendAscii( " !! Not a Method !!" ); - rStrm.WriteByteString( aLine, RTL_TEXTENCODING_ASCII_US ); + write_lenPrefixed_uInt8s_FromOUString(rStrm, aLine, RTL_TEXTENCODING_ASCII_US); // Output also the object at object-methods if ( pVar->GetValues_Impl().eType == SbxOBJECT && @@ -830,7 +832,7 @@ void SbxObject::Dump( SvStream& rStrm, sal_Bool bFill ) aLine += aAttrs3; if( !pVar->IsA( TYPE(SbxProperty) ) ) aLine.AppendAscii( " !! Not a Property !!" ); - rStrm.WriteByteString( aLine, RTL_TEXTENCODING_ASCII_US ); + write_lenPrefixed_uInt8s_FromOUString(rStrm, aLine, RTL_TEXTENCODING_ASCII_US); // output also the object at object properties if ( pVar->GetValues_Impl().eType == SbxOBJECT && diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx index 0d6aa84e19c7..692959aa9c18 100644 --- a/basic/source/sbx/sbxvalue.cxx +++ b/basic/source/sbx/sbxvalue.cxx @@ -1479,8 +1479,8 @@ sal_Bool SbxValue::LoadData( SvStream& r, sal_uInt16 ) case SbxSINGLE: { // Floats as ASCII - XubString aVal; - r.ReadByteString( aVal, RTL_TEXTENCODING_ASCII_US ); + XubString aVal = read_lenPrefixed_uInt8s_ToOUString(r, + RTL_TEXTENCODING_ASCII_US); double d; SbxDataType t; if( ImpScan( aVal, d, t, NULL ) != SbxERR_OK || t == SbxDOUBLE ) @@ -1495,8 +1495,8 @@ sal_Bool SbxValue::LoadData( SvStream& r, sal_uInt16 ) case SbxDOUBLE: { // Floats as ASCII - XubString aVal; - r.ReadByteString( aVal, RTL_TEXTENCODING_ASCII_US ); + XubString aVal = read_lenPrefixed_uInt8s_ToOUString(r, + RTL_TEXTENCODING_ASCII_US); SbxDataType t; if( ImpScan( aVal, aData.nDouble, t, NULL ) != SbxERR_OK ) { @@ -1524,9 +1524,9 @@ sal_Bool SbxValue::LoadData( SvStream& r, sal_uInt16 ) } case SbxSTRING: { - XubString aVal; - r.ReadByteString( aVal, RTL_TEXTENCODING_ASCII_US ); - if( aVal.Len() ) + rtl::OUString aVal = read_lenPrefixed_uInt8s_ToOUString(r, + RTL_TEXTENCODING_ASCII_US); + if( aVal.getLength() ) aData.pOUString = new ::rtl::OUString( aVal ); else aData.pOUString = NULL; // JSM 1995-09-22 @@ -1621,12 +1621,12 @@ sal_Bool SbxValue::StoreData( SvStream& r ) const case SbxDATE: // #49935: Save as double, elsewise an error during the read in ((SbxValue*)this)->aData.eType = (SbxDataType)( ( nType & 0xF000 ) | SbxDOUBLE ); - r.WriteByteString( GetCoreString(), RTL_TEXTENCODING_ASCII_US ); + write_lenPrefixed_uInt8s_FromOUString(r, GetCoreString(), RTL_TEXTENCODING_ASCII_US); ((SbxValue*)this)->aData.eType = (SbxDataType)nType; break; case SbxSINGLE: case SbxDOUBLE: - r.WriteByteString( GetCoreString(), RTL_TEXTENCODING_ASCII_US ); + write_lenPrefixed_uInt8s_FromOUString(r, GetCoreString(), RTL_TEXTENCODING_ASCII_US); break; case SbxSALUINT64: case SbxSALINT64: @@ -1643,12 +1643,11 @@ sal_Bool SbxValue::StoreData( SvStream& r ) const case SbxSTRING: if( aData.pOUString ) { - r.WriteByteString( *aData.pOUString, RTL_TEXTENCODING_ASCII_US ); + write_lenPrefixed_uInt8s_FromOUString(r, *aData.pOUString, RTL_TEXTENCODING_ASCII_US); } else { - String aEmpty; - r.WriteByteString( aEmpty, RTL_TEXTENCODING_ASCII_US ); + write_lenPrefixed_uInt8s_FromOUString(r, rtl::OUString(), RTL_TEXTENCODING_ASCII_US); } break; case SbxERROR: diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx index 58b3cb73f9d4..6ca253355603 100644 --- a/basic/source/sbx/sbxvar.cxx +++ b/basic/source/sbx/sbxvar.cxx @@ -445,7 +445,8 @@ sal_Bool SbxVariable::LoadData( SvStream& rStrm, sal_uInt16 nVer ) { if( !SbxValue::LoadData( rStrm, nVer ) ) return sal_False; - rStrm.ReadByteString( maName, RTL_TEXTENCODING_ASCII_US ); + maName = read_lenPrefixed_uInt8s_ToOUString(rStrm, + RTL_TEXTENCODING_ASCII_US); sal_uInt32 nTemp; rStrm >> nTemp; nUserData = nTemp; @@ -454,7 +455,8 @@ sal_Bool SbxVariable::LoadData( SvStream& rStrm, sal_uInt16 nVer ) { rStrm.SeekRel( -1L ); rStrm >> nType; - rStrm.ReadByteString( maName, RTL_TEXTENCODING_ASCII_US ); + maName = read_lenPrefixed_uInt8s_ToOUString(rStrm, + RTL_TEXTENCODING_ASCII_US); sal_uInt32 nTemp; rStrm >> nTemp; nUserData = nTemp; @@ -477,7 +479,8 @@ sal_Bool SbxVariable::LoadData( SvStream& rStrm, sal_uInt16 nVer ) case SbxSINGLE: { // Floats as ASCII - rStrm.ReadByteString( aTmpString, RTL_TEXTENCODING_ASCII_US ); + aTmpString = read_lenPrefixed_uInt8s_ToOUString( + rStrm, RTL_TEXTENCODING_ASCII_US); double d; SbxDataType t; if( ImpScan( aTmpString, d, t, NULL ) != SbxERR_OK || t == SbxDOUBLE ) @@ -492,7 +495,8 @@ sal_Bool SbxVariable::LoadData( SvStream& rStrm, sal_uInt16 nVer ) case SbxDOUBLE: { // Floats as ASCII - rStrm.ReadByteString( aTmpString, RTL_TEXTENCODING_ASCII_US ); + aTmpString = read_lenPrefixed_uInt8s_ToOUString(rStrm, + RTL_TEXTENCODING_ASCII_US); SbxDataType t; if( ImpScan( aTmpString, aTmp.nDouble, t, NULL ) != SbxERR_OK ) { @@ -502,8 +506,8 @@ sal_Bool SbxVariable::LoadData( SvStream& rStrm, sal_uInt16 nVer ) break; } case SbxSTRING: - rStrm.ReadByteString( aTmpString, RTL_TEXTENCODING_ASCII_US ); - aVal = aTmpString; + aVal = read_lenPrefixed_uInt8s_ToOUString(rStrm, + RTL_TEXTENCODING_ASCII_US); break; case SbxEMPTY: case SbxNULL: @@ -561,7 +565,8 @@ sal_Bool SbxVariable::StoreData( SvStream& rStrm ) const bValStore = SbxValue::StoreData( rStrm ); if( !bValStore ) return sal_False; - rStrm.WriteByteString( maName, RTL_TEXTENCODING_ASCII_US ); + write_lenPrefixed_uInt8s_FromOUString(rStrm, maName, + RTL_TEXTENCODING_ASCII_US); rStrm << (sal_uInt32)nUserData; if( pInfo.Is() ) { diff --git a/dbaccess/source/ui/tabledesign/TableRow.cxx b/dbaccess/source/ui/tabledesign/TableRow.cxx index b4ed28a4f0f4..35be52c28521 100644 --- a/dbaccess/source/ui/tabledesign/TableRow.cxx +++ b/dbaccess/source/ui/tabledesign/TableRow.cxx @@ -128,9 +128,9 @@ namespace dbaui if(pFieldDesc) { _rStr << (sal_Int32)1; - _rStr.WriteByteString(pFieldDesc->GetName()); - _rStr.WriteByteString(pFieldDesc->GetDescription()); - _rStr.WriteByteString(pFieldDesc->GetHelpText()); + _rStr.WriteUniOrByteString(pFieldDesc->GetName(), _rStr.GetStreamCharSet()); + _rStr.WriteUniOrByteString(pFieldDesc->GetDescription(), _rStr.GetStreamCharSet()); + _rStr.WriteUniOrByteString(pFieldDesc->GetHelpText(), _rStr.GetStreamCharSet()); double nValue = 0.0; Any aValue = pFieldDesc->GetControlDefault(); if ( aValue >>= nValue ) @@ -141,7 +141,7 @@ namespace dbaui else { _rStr << sal_Int32(2); - _rStr.WriteByteString(::comphelper::getString(aValue)); + _rStr.WriteUniOrByteString(::comphelper::getString(aValue), _rStr.GetStreamCharSet()); } _rStr << pFieldDesc->GetType(); @@ -170,12 +170,12 @@ namespace dbaui OFieldDescription* pFieldDesc = new OFieldDescription(); _rRow.m_pActFieldDescr = pFieldDesc; String sValue; - _rStr.ReadByteString(sValue); + _rStr.ReadUniOrByteString(sValue, _rStr.GetStreamCharSet()); pFieldDesc->SetName(sValue); - _rStr.ReadByteString(sValue); + _rStr.ReadUniOrByteString(sValue, _rStr.GetStreamCharSet()); pFieldDesc->SetDescription(sValue); - _rStr.ReadByteString(sValue); + _rStr.ReadUniOrByteString(sValue, _rStr.GetStreamCharSet()); pFieldDesc->SetHelpText(sValue); _rStr >> nValue; @@ -190,7 +190,7 @@ namespace dbaui break; } case 2: - _rStr.ReadByteString(sValue); + _rStr.ReadUniOrByteString(sValue, _rStr.GetStreamCharSet()); aControlDefault <<= ::rtl::OUString(sValue); break; } diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx index 0fd144b42514..8435e66d923f 100644 --- a/editeng/source/editeng/editobj.cxx +++ b/editeng/source/editeng/editobj.cxx @@ -1230,7 +1230,7 @@ void BinTextObject::CreateData( SvStream& rIStream ) pC->GetText() = rtl::OStringToOUString(aByteString, eSrcEncoding); // StyleName and Family... - rIStream.ReadByteString( pC->GetStyle(), eSrcEncoding ); + rIStream.ReadUniOrByteString( pC->GetStyle(), eSrcEncoding ); sal_uInt16 nStyleFamily; rIStream >> nStyleFamily; pC->GetFamily() = (SfxStyleFamily)nStyleFamily; @@ -1522,10 +1522,10 @@ void BinTextObject::CreateData300( SvStream& rIStream ) ContentInfo* pC = CreateAndInsertContent(); // The Text... - rIStream.ReadByteString( pC->GetText() ); + rIStream.ReadUniOrByteString( pC->GetText(), rIStream.GetStreamCharSet() ); // StyleName and Family... - rIStream.ReadByteString( pC->GetStyle() ); + rIStream.ReadUniOrByteString( pC->GetStyle(), rIStream.GetStreamCharSet() ); sal_uInt16 nStyleFamily; rIStream >> nStyleFamily; pC->GetFamily() = (SfxStyleFamily)nStyleFamily; diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx index 2d0e066e4091..caca392a6d18 100644 --- a/editeng/source/items/bulitem.cxx +++ b/editeng/source/items/bulitem.cxx @@ -64,7 +64,7 @@ void SvxBulletItem::StoreFont( SvStream& rStream, const Font& rFont ) nTemp = (sal_uInt16)rFont.GetItalic(); rStream << nTemp; // UNICODE: rStream << rFont.GetName(); - rStream.WriteByteString(rFont.GetName()); + rStream.WriteUniOrByteString(rFont.GetName(), rStream.GetStreamCharSet()); rStream << rFont.IsOutline(); rStream << rFont.IsShadow(); @@ -94,7 +94,7 @@ Font SvxBulletItem::CreateFont( SvStream& rStream, sal_uInt16 nVer ) // UNICODE: rStream >> aName; aFont.SetName( aName ); String aName; - rStream.ReadByteString(aName); + rStream.ReadUniOrByteString(aName, rStream.GetStreamCharSet()); aFont.SetName( aName ); if( nVer == 1 ) @@ -217,10 +217,10 @@ SvxBulletItem::SvxBulletItem( SvStream& rStrm, sal_uInt16 _nWhich ) : rStrm >> nScale; // UNICODE: rStrm >> aPrevText; - rStrm.ReadByteString(aPrevText); + rStrm.ReadUniOrByteString(aPrevText, rStrm.GetStreamCharSet()); // UNICODE: rStrm >> aFollowText; - rStrm.ReadByteString(aFollowText); + rStrm.ReadUniOrByteString(aFollowText, rStrm.GetStreamCharSet()); nValidMask = 0xFFFF; } @@ -416,10 +416,10 @@ SvStream& SvxBulletItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) c rStrm << nScale; // UNICODE: rStrm << aPrevText; - rStrm.WriteByteString(aPrevText); + rStrm.WriteUniOrByteString(aPrevText, rStrm.GetStreamCharSet()); // UNICODE: rStrm << aFollowText; - rStrm.WriteByteString(aFollowText); + rStrm.WriteUniOrByteString(aFollowText, rStrm.GetStreamCharSet()); return rStrm; } diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx index 56b2d71f68fa..bafb976f057b 100644 --- a/editeng/source/items/flditem.cxx +++ b/editeng/source/items/flditem.cxx @@ -735,7 +735,7 @@ void SvxExtFileField::Load( SvPersistStream & rStm ) sal_uInt16 nType, nFormat; // UNICODE: rStm >> aFile; - rStm.ReadByteString(aFile); + rStm.ReadUniOrByteString(aFile, rStm.GetStreamCharSet()); rStm >> nType; rStm >> nFormat; @@ -749,7 +749,7 @@ void SvxExtFileField::Load( SvPersistStream & rStm ) void SvxExtFileField::Save( SvPersistStream & rStm ) { // UNICODE: rStm << aFile; - rStm.WriteByteString(aFile); + rStm.WriteUniOrByteString(aFile, rStm.GetStreamCharSet()); rStm << (sal_uInt16) eType; rStm << (sal_uInt16) eFormat; diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index addb3f630a68..18af4a61ec7b 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -3443,7 +3443,7 @@ SvxBrushItem::SvxBrushItem( SvStream& rStream, sal_uInt16 nVersion, { String aRel; // UNICODE: rStream >> aRel; - rStream.ReadByteString(aRel); + rStream.ReadUniOrByteString(aRel, rStream.GetStreamCharSet()); // TODO/MBA: how can we get a BaseURL here?! OSL_FAIL("No BaseURL!"); @@ -3456,7 +3456,7 @@ SvxBrushItem::SvxBrushItem( SvStream& rStream, sal_uInt16 nVersion, { pStrFilter = new String; // UNICODE: rStream >> *pStrFilter; - rStream.ReadByteString(*pStrFilter); + rStream.ReadUniOrByteString(*pStrFilter, rStream.GetStreamCharSet()); } rStream >> nPos; @@ -3834,12 +3834,12 @@ SvStream& SvxBrushItem::Store( SvStream& rStream , sal_uInt16 /*nItemVersion*/ ) // TODO/MBA: how to get a BaseURL?! String aRel = INetURLObject::GetRelURL( String(), *pStrLink ); // UNICODE: rStream << aRel; - rStream.WriteByteString(aRel); + rStream.WriteUniOrByteString(aRel, rStream.GetStreamCharSet()); } if ( pStrFilter ) { // UNICODE: rStream << *pStrFilter; - rStream.WriteByteString(*pStrFilter); + rStream.WriteUniOrByteString(*pStrFilter, rStream.GetStreamCharSet()); } rStream << (sal_Int8)eGraphicPos; return rStream; diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx index 8f71ff238b11..01fc4630ff23 100644 --- a/editeng/source/items/numitem.cxx +++ b/editeng/source/items/numitem.cxx @@ -219,9 +219,9 @@ SvStream& SvxNumberFormat::Store(SvStream &rStream, FontToSubsFontConverter pC rStream << nCharTextDistance; rtl_TextEncoding eEnc = osl_getThreadTextEncoding(); - rStream.WriteByteString(sPrefix, eEnc); - rStream.WriteByteString(sSuffix, eEnc); - rStream.WriteByteString(sCharStyleName, eEnc); + rStream.WriteUniOrByteString(sPrefix, eEnc); + rStream.WriteUniOrByteString(sSuffix, eEnc); + rStream.WriteUniOrByteString(sCharStyleName, eEnc); if(pGraphicBrush) { rStream << (sal_uInt16)1; diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index 4f5dc8dc29e6..e3069074573a 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -398,16 +398,16 @@ SvStream& SvxFontItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) co String aStoreFamilyName( GetFamilyName() ); if( bToBats ) aStoreFamilyName = String( "StarBats", sizeof("StarBats")-1, RTL_TEXTENCODING_ASCII_US ); - rStrm.WriteByteString(aStoreFamilyName); - rStrm.WriteByteString(GetStyleName()); + rStrm.WriteUniOrByteString(aStoreFamilyName, rStrm.GetStreamCharSet()); + rStrm.WriteUniOrByteString(GetStyleName(), rStrm.GetStreamCharSet()); // cach for EditEngine, only set while creating clipboard stream. if ( bEnableStoreUnicodeNames ) { sal_uInt32 nMagic = STORE_UNICODE_MAGIC_MARKER; rStrm << nMagic; - rStrm.WriteByteString( aStoreFamilyName, RTL_TEXTENCODING_UNICODE ); - rStrm.WriteByteString( GetStyleName(), RTL_TEXTENCODING_UNICODE ); + rStrm.WriteUniOrByteString( aStoreFamilyName, RTL_TEXTENCODING_UNICODE ); + rStrm.WriteUniOrByteString( GetStyleName(), RTL_TEXTENCODING_UNICODE ); } return rStrm; @@ -424,10 +424,10 @@ SfxPoolItem* SvxFontItem::Create(SvStream& rStrm, sal_uInt16) const rStrm >> eFontTextEncoding; // UNICODE: rStrm >> aName; - rStrm.ReadByteString(aName); + rStrm.ReadUniOrByteString(aName, rStrm.GetStreamCharSet()); // UNICODE: rStrm >> aStyle; - rStrm.ReadByteString(aStyle); + rStrm.ReadUniOrByteString(aStyle, rStrm.GetStreamCharSet()); // Set the "correct" textencoding eFontTextEncoding = (sal_uInt8)GetSOLoadTextEncoding( eFontTextEncoding, (sal_uInt16)rStrm.GetVersion() ); @@ -442,8 +442,8 @@ SfxPoolItem* SvxFontItem::Create(SvStream& rStrm, sal_uInt16) const rStrm >> nMagic; if ( nMagic == STORE_UNICODE_MAGIC_MARKER ) { - rStrm.ReadByteString( aName, RTL_TEXTENCODING_UNICODE ); - rStrm.ReadByteString( aStyle, RTL_TEXTENCODING_UNICODE ); + rStrm.ReadUniOrByteString( aName, RTL_TEXTENCODING_UNICODE ); + rStrm.ReadUniOrByteString( aStyle, RTL_TEXTENCODING_UNICODE ); } else { diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx index 4fd5c78f7f6f..e8e6542eb1b0 100644 --- a/idl/source/objects/module.cxx +++ b/idl/source/objects/module.cxx @@ -65,7 +65,7 @@ void SvMetaModule::Load( SvPersistStream & rStm ) rStm >> aTypeList; rStm >> aAttrList; // browser - rStm.ReadByteString( aIdlFileName ); + rStm.ReadUniOrByteString( aIdlFileName, rStm.GetStreamCharSet() ); aHelpFileName = read_lenPrefixed_uInt8s_ToOString(rStm); aSlotIdFile = read_lenPrefixed_uInt8s_ToOString(rStm); aModulePrefix = read_lenPrefixed_uInt8s_ToOString(rStm); @@ -90,7 +90,7 @@ void SvMetaModule::Save( SvPersistStream & rStm ) rStm << aTypeList; rStm << aAttrList; // browser - rStm.WriteByteString( aIdlFileName ); + rStm.WriteUniOrByteString( aIdlFileName, rStm.GetStreamCharSet() ); write_lenPrefixed_uInt8s_FromOString(rStm, aHelpFileName); write_lenPrefixed_uInt8s_FromOString(rStm, aSlotIdFile); write_lenPrefixed_uInt8s_FromOString(rStm, aModulePrefix); @@ -368,9 +368,9 @@ void SvMetaModule::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, { rOutStm << SvHash_module()->GetName().GetBuffer() << endl << '\"'; - rOutStm.WriteByteString( aBeginName.GetHexName() ); + rOutStm.WriteUniOrByteString( aBeginName.GetHexName(), rOutStm.GetStreamCharSet() ); rOutStm << '\"' << endl << '\"'; - rOutStm.WriteByteString( aEndName.GetHexName() ); + rOutStm.WriteUniOrByteString( aEndName.GetHexName(), rOutStm.GetStreamCharSet() ); rOutStm << '\"' << endl; SvMetaExtern::WriteSvIdl( rBase, rOutStm, nTab ); } diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx index fbd982db364a..93adcfeea75e 100644 --- a/sc/source/core/data/patattr.cxx +++ b/sc/source/core/data/patattr.cxx @@ -172,7 +172,7 @@ SfxPoolItem* ScPatternAttr::Create( SvStream& rStream, sal_uInt16 /* nVersion */ { short eFamDummy; pStr = new String; - rStream.ReadByteString( *pStr, rStream.GetStreamCharSet() ); + rStream.ReadUniOrByteString( *pStr, rStream.GetStreamCharSet() ); rStream >> eFamDummy; // wg. altem Dateiformat } else @@ -194,11 +194,11 @@ SvStream& ScPatternAttr::Store(SvStream& rStream, sal_uInt16 /* nItemVersion */) rStream << (sal_Bool)sal_True; if ( pStyle ) - rStream.WriteByteString( pStyle->GetName(), rStream.GetStreamCharSet() ); + rStream.WriteUniOrByteString( pStyle->GetName(), rStream.GetStreamCharSet() ); else if ( pName ) // wenn Style geloescht ist/war - rStream.WriteByteString( *pName, rStream.GetStreamCharSet() ); + rStream.WriteUniOrByteString( *pName, rStream.GetStreamCharSet() ); else - rStream.WriteByteString( ScGlobal::GetRscString(STR_STYLENAME_STANDARD), + rStream.WriteUniOrByteString( ScGlobal::GetRscString(STR_STYLENAME_STANDARD), rStream.GetStreamCharSet() ); rStream << (short)SFX_STYLE_FAMILY_PARA; // wg. altem Dateiformat diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx index fa7836bc604a..61b8355826f8 100644 --- a/sc/source/core/tool/autoform.cxx +++ b/sc/source/core/tool/autoform.cxx @@ -797,8 +797,14 @@ sal_Bool ScAutoFormatData::Load( SvStream& rStream, const ScAfVersions& rVersion (AUTOFORMAT_DATA_ID_504 <= nVer && nVer <= AUTOFORMAT_DATA_ID)) ) { // --- from 680/dr25 on: store strings as UTF-8 - CharSet eCharSet = (nVer >= AUTOFORMAT_ID_680DR25) ? RTL_TEXTENCODING_UTF8 : rStream.GetStreamCharSet(); - rStream.ReadByteString( aName, eCharSet ); + if (nVer >= AUTOFORMAT_ID_680DR25) + { + aName = read_lenPrefixed_uInt8s_ToOUString(rStream, + RTL_TEXTENCODING_UTF8); + } + else + rStream.ReadUniOrByteString( aName, rStream.GetStreamCharSet() ); + if( AUTOFORMAT_DATA_ID_552 <= nVer ) { rStream >> nStrResId; @@ -838,7 +844,7 @@ sal_Bool ScAutoFormatData::LoadOld( SvStream& rStream, const ScAfVersions& rVers bRet = (rStream.GetError() == 0); if (bRet && (nVal == AUTOFORMAT_OLD_DATA_ID)) { - rStream.ReadByteString( aName, rStream.GetStreamCharSet() ); + rStream.ReadUniOrByteString( aName, rStream.GetStreamCharSet() ); sal_Bool b; rStream >> b; bIncludeFont = b; rStream >> b; bIncludeJustify = b; @@ -863,7 +869,7 @@ sal_Bool ScAutoFormatData::Save(SvStream& rStream) sal_Bool b; rStream << nVal; // --- from 680/dr25 on: store strings as UTF-8 - rStream.WriteByteString( aName, RTL_TEXTENCODING_UTF8 ); + write_lenPrefixed_uInt8s_FromOUString(rStream, aName, RTL_TEXTENCODING_UTF8); rStream << nStrResId; rStream << ( b = bIncludeFont ); diff --git a/sc/source/core/tool/ddelink.cxx b/sc/source/core/tool/ddelink.cxx index 7fbb58b0ea4f..ca956813697b 100644 --- a/sc/source/core/tool/ddelink.cxx +++ b/sc/source/core/tool/ddelink.cxx @@ -92,9 +92,9 @@ ScDdeLink::ScDdeLink( ScDocument* pD, SvStream& rStream, ScMultipleReadHeader& r rHdr.StartEntry(); rtl_TextEncoding eCharSet = rStream.GetStreamCharSet(); - rStream.ReadByteString( aAppl, eCharSet ); - rStream.ReadByteString( aTopic, eCharSet ); - rStream.ReadByteString( aItem, eCharSet ); + rStream.ReadUniOrByteString( aAppl, eCharSet ); + rStream.ReadUniOrByteString( aTopic, eCharSet ); + rStream.ReadUniOrByteString( aItem, eCharSet ); sal_Bool bHasValue; rStream >> bHasValue; @@ -114,9 +114,9 @@ void ScDdeLink::Store( SvStream& rStream, ScMultipleWriteHeader& rHdr ) const rHdr.StartEntry(); rtl_TextEncoding eCharSet = rStream.GetStreamCharSet(); - rStream.WriteByteString( aAppl, eCharSet ); - rStream.WriteByteString( aTopic, eCharSet ); - rStream.WriteByteString( aItem, eCharSet ); + rStream.WriteUniOrByteString( aAppl, eCharSet ); + rStream.WriteUniOrByteString( aTopic, eCharSet ); + rStream.WriteUniOrByteString( aItem, eCharSet ); sal_Bool bHasValue = ( pResult != NULL ); rStream << bHasValue; diff --git a/sc/source/core/tool/zforauto.cxx b/sc/source/core/tool/zforauto.cxx index 4ebbee3551c0..048c981df3bf 100644 --- a/sc/source/core/tool/zforauto.cxx +++ b/sc/source/core/tool/zforauto.cxx @@ -61,7 +61,7 @@ ScNumFormatAbbrev::ScNumFormatAbbrev(sal_uLong nFormat, void ScNumFormatAbbrev::Load( SvStream& rStream, CharSet eByteStrSet ) { sal_uInt16 nSysLang, nLang; - rStream.ReadByteString( sFormatstring, eByteStrSet ); + rStream.ReadUniOrByteString( sFormatstring, eByteStrSet ); rStream >> nSysLang >> nLang; eLnge = (LanguageType) nLang; eSysLnge = (LanguageType) nSysLang; @@ -71,7 +71,7 @@ void ScNumFormatAbbrev::Load( SvStream& rStream, CharSet eByteStrSet ) void ScNumFormatAbbrev::Save( SvStream& rStream, CharSet eByteStrSet ) const { - rStream.WriteByteString( sFormatstring, eByteStrSet ); + rStream.WriteUniOrByteString( sFormatstring, eByteStrSet ); rStream << (sal_uInt16) eSysLnge << (sal_uInt16) eLnge; } diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index 6a9515d4f540..55714612b2df 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -267,19 +267,25 @@ SvStream& operator >> (SvStream& rIn, SdPublishingDesign& rDesign) sal_uInt16 nTemp16; - rIn.ReadByteString( rDesign.m_aDesignName, RTL_TEXTENCODING_UTF8 ); + rDesign.m_aDesignName = read_lenPrefixed_uInt8s_ToOUString(rIn, + RTL_TEXTENCODING_UTF8); rIn >> nTemp16; rDesign.m_eMode = (HtmlPublishMode)nTemp16; rIn >> rDesign.m_bContentPage; rIn >> rDesign.m_bNotes; rIn >> rDesign.m_nResolution; - rIn.ReadByteString( rDesign.m_aCompression, RTL_TEXTENCODING_UTF8 ); + rDesign.m_aCompression = read_lenPrefixed_uInt8s_ToOUString(rIn, + RTL_TEXTENCODING_UTF8); rIn >> nTemp16; rDesign.m_eFormat = (PublishingFormat)nTemp16; - rIn.ReadByteString( rDesign.m_aAuthor, RTL_TEXTENCODING_UTF8 ); - rIn.ReadByteString( rDesign.m_aEMail, RTL_TEXTENCODING_UTF8 ); - rIn.ReadByteString( rDesign.m_aWWW, RTL_TEXTENCODING_UTF8 ); - rIn.ReadByteString( rDesign.m_aMisc, RTL_TEXTENCODING_UTF8 ); + rDesign.m_aAuthor = read_lenPrefixed_uInt8s_ToOUString(rIn, + RTL_TEXTENCODING_UTF8); + rDesign.m_aEMail = read_lenPrefixed_uInt8s_ToOUString(rIn, + RTL_TEXTENCODING_UTF8); + rDesign.m_aWWW = read_lenPrefixed_uInt8s_ToOUString(rIn, + RTL_TEXTENCODING_UTF8); + rDesign.m_aMisc = read_lenPrefixed_uInt8s_ToOUString(rIn, + RTL_TEXTENCODING_UTF8); rIn >> rDesign.m_bDownload; rIn >> rDesign.m_bCreated; // not used rIn >> rDesign.m_nButtonThema; @@ -294,8 +300,10 @@ SvStream& operator >> (SvStream& rIn, SdPublishingDesign& rDesign) rIn >> nTemp16; rDesign.m_eScript = (PublishingScript)nTemp16; - rIn.ReadByteString( rDesign.m_aURL, RTL_TEXTENCODING_UTF8 ); - rIn.ReadByteString( rDesign.m_aCGI, RTL_TEXTENCODING_UTF8 ); + rDesign.m_aURL = read_lenPrefixed_uInt8s_ToOUString(rIn, + RTL_TEXTENCODING_UTF8); + rDesign.m_aCGI = read_lenPrefixed_uInt8s_ToOUString(rIn, + RTL_TEXTENCODING_UTF8); rIn >> rDesign.m_bAutoSlide; rIn >> rDesign.m_nSlideDuration; @@ -315,18 +323,24 @@ SvStream& operator << (SvStream& rOut, const SdPublishingDesign& rDesign) SdIOCompat aIO(rOut, STREAM_WRITE, 0); // Name - rOut.WriteByteString( rDesign.m_aDesignName, RTL_TEXTENCODING_UTF8 ); + write_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aDesignName, + RTL_TEXTENCODING_UTF8); rOut << (sal_uInt16)rDesign.m_eMode; rOut << rDesign.m_bContentPage; rOut << rDesign.m_bNotes; rOut << rDesign.m_nResolution; - rOut.WriteByteString( rDesign.m_aCompression, RTL_TEXTENCODING_UTF8 ); + write_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aCompression, + RTL_TEXTENCODING_UTF8); rOut << (sal_uInt16)rDesign.m_eFormat; - rOut.WriteByteString( rDesign.m_aAuthor, RTL_TEXTENCODING_UTF8 ); - rOut.WriteByteString( rDesign.m_aEMail, RTL_TEXTENCODING_UTF8 ); - rOut.WriteByteString( rDesign.m_aWWW, RTL_TEXTENCODING_UTF8 ); - rOut.WriteByteString( rDesign.m_aMisc, RTL_TEXTENCODING_UTF8 ); + write_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aAuthor, + RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aEMail, + RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aWWW, + RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aMisc, + RTL_TEXTENCODING_UTF8); rOut << rDesign.m_bDownload; rOut << rDesign.m_bCreated; // not used rOut << rDesign.m_nButtonThema; @@ -340,8 +354,10 @@ SvStream& operator << (SvStream& rOut, const SdPublishingDesign& rDesign) rOut << rDesign.m_bUseColor; rOut << (sal_uInt16)rDesign.m_eScript; - rOut.WriteByteString( rDesign.m_aURL, RTL_TEXTENCODING_UTF8 ); - rOut.WriteByteString( rDesign.m_aCGI, RTL_TEXTENCODING_UTF8 ); + write_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aURL, + RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aCGI, + RTL_TEXTENCODING_UTF8); rOut << rDesign.m_bAutoSlide; rOut << rDesign.m_nSlideDuration; diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx index e323361ed09c..eaef4b41ce49 100644 --- a/sfx2/source/appl/appmisc.cxx +++ b/sfx2/source/appl/appmisc.cxx @@ -192,7 +192,7 @@ std::vector* SfxApplication::GetDisabledSlotList_Impl() { // Read Slot file String aTitle; - pStream->ReadByteString(aTitle); + pStream->ReadUniOrByteString(aTitle, pStream->GetStreamCharSet()); if ( aTitle.CompareToAscii("SfxSlotFile" ) == COMPARE_EQUAL ) { sal_uInt16 nCount; @@ -207,7 +207,7 @@ std::vector* SfxApplication::GetDisabledSlotList_Impl() pList->push_back( nSlot ); } - pStream->ReadByteString(aTitle); + pStream->ReadUniOrByteString(aTitle, pStream->GetStreamCharSet()); if ( aTitle.CompareToAscii("END" ) != COMPARE_EQUAL || pStream->GetError() ) { // Read failed diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx index f1cf5c0c3127..49c7bd3cdcc6 100644 --- a/sot/source/sdstor/ucbstorage.cxx +++ b/sot/source/sdstor/ucbstorage.cxx @@ -3375,7 +3375,7 @@ String UCBStorage::CreateLinkFile( const String& rName ) // store it as key/value pair String aLink = String::CreateFromAscii("ContentURL="); aLink += aURL; - pStream->WriteByteString( aLink, RTL_TEXTENCODING_UTF8 ); + write_lenPrefixed_uInt8s_FromOUString(*pStream, aLink, RTL_TEXTENCODING_UTF8); pStream->Flush(); // move the stream to its desired location diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx index e6dab39b6706..8970688be602 100644 --- a/svl/source/items/poolitem.cxx +++ b/svl/source/items/poolitem.cxx @@ -187,7 +187,7 @@ SvStream& SfxPoolItem::Store(SvStream &rStream, sal_uInt16 ) const // static bool SfxPoolItem::readByteString(SvStream & rStream, UniString & rString) { - rStream.ReadByteString(rString); + rStream.ReadUniOrByteString(rString, rStream.GetStreamCharSet()); return rStream.GetError() == ERRCODE_NONE; } @@ -196,7 +196,7 @@ bool SfxPoolItem::readByteString(SvStream & rStream, UniString & rString) void SfxPoolItem::writeByteString(SvStream & rStream, UniString const & rString) { - rStream.WriteByteString(rString); + rStream.WriteUniOrByteString(rString, rStream.GetStreamCharSet()); } //============================================================================ @@ -204,7 +204,7 @@ void SfxPoolItem::writeByteString(SvStream & rStream, bool SfxPoolItem::readUnicodeString(SvStream & rStream, UniString & rString, bool bUnicode) { - rStream.ReadByteString(rString, + rStream.ReadUniOrByteString(rString, bUnicode ? RTL_TEXTENCODING_UCS2 : rStream.GetStreamCharSet()); return rStream.GetError() == ERRCODE_NONE; @@ -215,7 +215,7 @@ bool SfxPoolItem::readUnicodeString(SvStream & rStream, UniString & rString, void SfxPoolItem::writeUnicodeString(SvStream & rStream, UniString const & rString) { - rStream.WriteByteString(rString, RTL_TEXTENCODING_UCS2); + rStream.WriteUniOrByteString(rString, RTL_TEXTENCODING_UCS2); } // ------------------------------------------------------------------------ diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index 424aaa0204ce..852e16d32487 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -154,7 +154,7 @@ void ImpSvNumberformatInfo::Save(SvStream& rStream, sal_uInt16 nAnz) const { for (sal_uInt16 i = 0; i < nAnz; i++) { - rStream.WriteByteString( sStrArray[i], rStream.GetStreamCharSet() ); + rStream.WriteUniOrByteString( sStrArray[i], rStream.GetStreamCharSet() ); short nType = nTypeArray[i]; switch ( nType ) { // der Krampf fuer Versionen vor SV_NUMBERFORMATTER_VERSION_NEW_CURR @@ -392,7 +392,7 @@ void ImpSvNumFor::Save(SvStream& rStream) const { rStream << nAnzStrings; aI.Save(rStream, nAnzStrings); - rStream.WriteByteString( sColorName, rStream.GetStreamCharSet() ); + rStream.WriteUniOrByteString( sColorName, rStream.GetStreamCharSet() ); } void ImpSvNumFor::Load(SvStream& rStream, ImpSvNumberformatScan& rSc, @@ -402,7 +402,7 @@ void ImpSvNumFor::Load(SvStream& rStream, ImpSvNumberformatScan& rSc, rStream >> nAnz; //! noch nicht direkt nAnzStrings wg. Enlarge Enlarge( nAnz ); aI.Load( rStream, nAnz ); - rStream.ReadByteString( sColorName, rStream.GetStreamCharSet() ); + rStream.ReadUniOrByteString( sColorName, rStream.GetStreamCharSet() ); rLoadedColorName = sColorName; pColor = rSc.GetColor(sColorName); } @@ -1828,13 +1828,13 @@ void SvNumberformat::Save( SvStream& rStream, ImpSvNumMultipleWriteHeader& rHdr } rHdr.StartEntry(); - rStream.WriteByteString( aFormatstring, rStream.GetStreamCharSet() ); + rStream.WriteUniOrByteString( aFormatstring, rStream.GetStreamCharSet() ); rStream << eType << fLimit1 << fLimit2 << (sal_uInt16) eOp1 << (sal_uInt16) eOp2 << sal_Bool(bOldStandard) << sal_Bool(bIsUsed); for (sal_uInt16 i = 0; i < 4; i++) NumFor[i].Save(rStream); // ab SV_NUMBERFORMATTER_VERSION_NEWSTANDARD - rStream.WriteByteString( aComment, rStream.GetStreamCharSet() ); + rStream.WriteUniOrByteString( aComment, rStream.GetStreamCharSet() ); rStream << nNewStandardDefined; // ab SV_NUMBERFORMATTER_VERSION_NEW_CURR rStream << nNewCurrencyVersionId; diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx index 41f0af0839cd..e2a340a8291b 100644 --- a/svtools/source/misc/templatefoldercache.cxx +++ b/svtools/source/misc/templatefoldercache.cxx @@ -292,7 +292,7 @@ namespace svt void operator() ( const String& _rString ) const { - m_rStorage.WriteByteString( _rString ); + m_rStorage.WriteUniOrByteString( _rString, m_rStorage.GetStreamCharSet() ); } }; @@ -418,7 +418,7 @@ namespace svt while ( nChildren-- ) { String sURL; - m_rStorage.ReadByteString( sURL ); + m_rStorage.ReadUniOrByteString( sURL, m_rStorage.GetStreamCharSet() ); sURL = m_xOfficeInstDirs->makeAbsoluteURL( sURL ); INetURLObject aChildURL( sURL ); rChildren.push_back( new TemplateContent( aChildURL ) ); @@ -736,7 +736,7 @@ namespace svt while ( nRootDirectories-- ) { String sURL; - m_pCacheStream->ReadByteString( sURL ); + m_pCacheStream->ReadUniOrByteString( sURL, m_pCacheStream->GetStreamCharSet() ); // #116281# Keep office installtion relocatable. Never store // any direct references to office installation directory. sURL = getOfficeInstDirs()->makeAbsoluteURL( sURL ); diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index aac712644d95..c8158d19b52a 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -96,8 +96,8 @@ SvStream& operator>>( SvStream& rIStm, TransferableObjectDescriptor& rObjDesc ) rIStm >> rObjDesc.maSize.Height(); rIStm >> rObjDesc.maDragStartPos.X(); rIStm >> rObjDesc.maDragStartPos.Y(); - rIStm.ReadByteString( rObjDesc.maTypeName, osl_getThreadTextEncoding() ); - rIStm.ReadByteString( rObjDesc.maDisplayName, osl_getThreadTextEncoding() ); + rIStm.ReadUniOrByteString( rObjDesc.maTypeName, osl_getThreadTextEncoding() ); + rIStm.ReadUniOrByteString( rObjDesc.maDisplayName, osl_getThreadTextEncoding() ); rIStm >> nSig1 >> nSig2; rObjDesc.mnViewAspect = static_cast< sal_uInt16 >( nViewAspect ); @@ -126,8 +126,8 @@ SvStream& operator<<( SvStream& rOStm, const TransferableObjectDescriptor& rObjD rOStm << rObjDesc.maSize.Height(); rOStm << rObjDesc.maDragStartPos.X(); rOStm << rObjDesc.maDragStartPos.Y(); - rOStm.WriteByteString( rObjDesc.maTypeName, osl_getThreadTextEncoding() ); - rOStm.WriteByteString( rObjDesc.maDisplayName, osl_getThreadTextEncoding() ); + rOStm.WriteUniOrByteString( rObjDesc.maTypeName, osl_getThreadTextEncoding() ); + rOStm.WriteUniOrByteString( rObjDesc.maDisplayName, osl_getThreadTextEncoding() ); rOStm << nSig1 << nSig2; const sal_uInt32 nLastPos = rOStm.Tell(); diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx index 11a26aa04d49..1f6dfa83a794 100644 --- a/svx/source/items/hlnkitem.cxx +++ b/svx/source/items/hlnkitem.cxx @@ -49,13 +49,13 @@ SvStream& SvxHyperlinkItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ { // store 'simple' data // UNICODE: rStrm << sName; - rStrm.WriteByteString(sName); + rStrm.WriteUniOrByteString(sName, rStrm.GetStreamCharSet()); // UNICODE: rStrm << sURL; - rStrm.WriteByteString(sURL); + rStrm.WriteUniOrByteString(sURL, rStrm.GetStreamCharSet()); // UNICODE: rStrm << sTarget; - rStrm.WriteByteString(sTarget); + rStrm.WriteUniOrByteString(sTarget, rStrm.GetStreamCharSet()); rStrm << (sal_uInt32) eType; @@ -64,7 +64,7 @@ SvStream& SvxHyperlinkItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ // new data // UNICODE: rStrm << sIntName; - rStrm.WriteByteString(sIntName); + rStrm.WriteUniOrByteString(sIntName, rStrm.GetStreamCharSet()); // macro-events rStrm << nMacroEvents; @@ -91,10 +91,10 @@ SvStream& SvxHyperlinkItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ rStrm << (sal_uInt16)pMacroTable->GetCurKey(); // UNICODE: rStrm << pMac->GetLibName(); - rStrm.WriteByteString(pMac->GetLibName()); + rStrm.WriteUniOrByteString(pMac->GetLibName(), rStrm.GetStreamCharSet()); // UNICODE: rStrm << pMac->GetMacName(); - rStrm.WriteByteString(pMac->GetMacName()); + rStrm.WriteUniOrByteString(pMac->GetMacName(), rStrm.GetStreamCharSet()); } } } @@ -111,10 +111,10 @@ SvStream& SvxHyperlinkItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ rStrm << (sal_uInt16)pMacroTable->GetCurKey(); // UNICODE: rStrm << pMac->GetLibName(); - rStrm.WriteByteString(pMac->GetLibName()); + rStrm.WriteUniOrByteString(pMac->GetLibName(), rStrm.GetStreamCharSet()); // UNICODE: rStrm << pMac->GetMacName(); - rStrm.WriteByteString(pMac->GetMacName()); + rStrm.WriteUniOrByteString(pMac->GetMacName(), rStrm.GetStreamCharSet()); rStrm << (sal_uInt16)pMac->GetScriptType(); } @@ -131,13 +131,13 @@ SfxPoolItem* SvxHyperlinkItem::Create( SvStream &rStrm, sal_uInt16 /*nItemVer // simple data-types // UNICODE: rStrm >> pNew->sName; - rStrm.ReadByteString(pNew->sName); + rStrm.ReadUniOrByteString(pNew->sName, rStrm.GetStreamCharSet()); // UNICODE: rStrm >> pNew->sURL; - rStrm.ReadByteString(pNew->sURL); + rStrm.ReadUniOrByteString(pNew->sURL, rStrm.GetStreamCharSet()); // UNICODE: rStrm >> pNew->sTarget; - rStrm.ReadByteString(pNew->sTarget); + rStrm.ReadUniOrByteString(pNew->sTarget, rStrm.GetStreamCharSet()); rStrm >> nType; pNew->eType = (SvxLinkInsertMode) nType; @@ -149,7 +149,7 @@ SfxPoolItem* SvxHyperlinkItem::Create( SvStream &rStrm, sal_uInt16 /*nItemVer { // new data // UNICODE: rStrm >> pNew->sIntName; - rStrm.ReadByteString(pNew->sIntName); + rStrm.ReadUniOrByteString(pNew->sIntName, rStrm.GetStreamCharSet()); // macro-events rStrm >> pNew->nMacroEvents; @@ -164,10 +164,10 @@ SfxPoolItem* SvxHyperlinkItem::Create( SvStream &rStrm, sal_uInt16 /*nItemVer rStrm >> nCurKey; // UNICODE: rStrm >> aLibName; - rStrm.ReadByteString(aLibName); + rStrm.ReadUniOrByteString(aLibName, rStrm.GetStreamCharSet()); // UNICODE: rStrm >> aMacName; - rStrm.ReadByteString(aMacName); + rStrm.ReadUniOrByteString(aMacName, rStrm.GetStreamCharSet()); pNew->SetMacro( nCurKey, SvxMacro( aMacName, aLibName, STARBASIC ) ); } @@ -181,10 +181,10 @@ SfxPoolItem* SvxHyperlinkItem::Create( SvStream &rStrm, sal_uInt16 /*nItemVer rStrm >> nCurKey; // UNICODE: rStrm >> aLibName; - rStrm.ReadByteString(aLibName); + rStrm.ReadUniOrByteString(aLibName, rStrm.GetStreamCharSet()); // UNICODE: rStrm >> aMacName; - rStrm.ReadByteString(aMacName); + rStrm.ReadUniOrByteString(aMacName, rStrm.GetStreamCharSet()); rStrm >> nScriptType; diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx index 0ac676debe0a..7dcffd0c9dd4 100644 --- a/svx/source/items/pageitem.cxx +++ b/svx/source/items/pageitem.cxx @@ -251,7 +251,7 @@ SfxPoolItem* SvxPageItem::Create( SvStream& rStream, sal_uInt16 ) const sal_uInt16 nUse; // UNICODE: rStream >> sStr; - rStream.ReadByteString( sStr ); + rStream.ReadUniOrByteString( sStr, rStream.GetStreamCharSet() ); rStream >> eType; rStream >> bLand; @@ -270,7 +270,7 @@ SfxPoolItem* SvxPageItem::Create( SvStream& rStream, sal_uInt16 ) const SvStream& SvxPageItem::Store( SvStream &rStrm, sal_uInt16 /*nItemVersion*/ ) const { // UNICODE: rStrm << aDescName; - rStrm.WriteByteString(aDescName); + rStrm.WriteUniOrByteString(aDescName, rStrm.GetStreamCharSet()); rStrm << (sal_uInt8)eNumType << bLandscape << eUse; return rStrm; diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx index d9c3a010eccd..be2d325aef8f 100644 --- a/sw/source/core/doc/tblafmt.cxx +++ b/sw/source/core/doc/tblafmt.cxx @@ -401,7 +401,7 @@ sal_Bool SwBoxAutoFmt::Load( SvStream& rStream, const SwAfVersions& rVersions, s sal_uInt16 eSys, eLge; // --- from 680/dr25 on: store strings as UTF-8 CharSet eCharSet = (nVer >= AUTOFORMAT_ID_680DR25) ? RTL_TEXTENCODING_UTF8 : rStream.GetStreamCharSet(); - rStream.ReadByteString( sNumFmtString, eCharSet ) + rStream.ReadUniOrByteString( sNumFmtString, eCharSet ) >> eSys >> eLge; eSysLanguage = (LanguageType) eSys; eNumFmtLanguage = (LanguageType) eLge; @@ -486,8 +486,9 @@ sal_Bool SwBoxAutoFmt::Save( SvStream& rStream ) const aRotateMode.Store( rStream, aRotateMode.GetVersion(SOFFICE_FILEFORMAT_40) ); // --- from 680/dr25 on: store strings as UTF-8 - rStream.WriteByteString( sNumFmtString, RTL_TEXTENCODING_UTF8 ) - << (sal_uInt16)eSysLanguage << (sal_uInt16)eNumFmtLanguage; + write_lenPrefixed_uInt8s_FromOUString(rStream, sNumFmtString, + RTL_TEXTENCODING_UTF8); + rStream << (sal_uInt16)eSysLanguage << (sal_uInt16)eNumFmtLanguage; return 0 == rStream.GetError(); } @@ -779,7 +780,7 @@ sal_Bool SwTableAutoFmt::Load( SvStream& rStream, const SwAfVersions& rVersions sal_Bool b; // --- from 680/dr25 on: store strings as UTF-8 CharSet eCharSet = (nVal >= AUTOFORMAT_ID_680DR25) ? RTL_TEXTENCODING_UTF8 : rStream.GetStreamCharSet(); - rStream.ReadByteString( aName, eCharSet ); + rStream.ReadUniOrByteString( aName, eCharSet ); if( AUTOFORMAT_DATA_ID_552 <= nVal ) { rStream >> nStrResId; @@ -829,7 +830,7 @@ sal_Bool SwTableAutoFmt::LoadOld( SvStream& rStream, sal_uInt16 aLoadVer[] ) if( bRet && ( AUTOFORMAT_OLD_DATA_ID == nVal )) { sal_Bool b; - rStream.ReadByteString( aName, rStream.GetStreamCharSet() ); + rStream.ReadUniOrByteString( aName, rStream.GetStreamCharSet() ); rStream >> b; bInclFont = b; rStream >> b; bInclJustify = b; rStream >> b; bInclFrame = b; @@ -860,7 +861,8 @@ sal_Bool SwTableAutoFmt::Save( SvStream& rStream ) const sal_Bool b; rStream << nVal; // --- from 680/dr25 on: store strings as UTF-8 - rStream.WriteByteString( aName, RTL_TEXTENCODING_UTF8 ); + write_lenPrefixed_uInt8s_FromOUString(rStream, aName, + RTL_TEXTENCODING_UTF8 ); rStream << nStrResId; rStream << ( b = bInclFont ); rStream << ( b = bInclJustify ); diff --git a/sw/source/ui/config/uinums.cxx b/sw/source/ui/config/uinums.cxx index b521578f605b..c43a2f4ed99b 100644 --- a/sw/source/ui/config/uinums.cxx +++ b/sw/source/ui/config/uinums.cxx @@ -235,7 +235,7 @@ const SwNumRulesWithName& SwNumRulesWithName::operator=(const SwNumRulesWithName SwNumRulesWithName::SwNumRulesWithName( SvStream &rStream, sal_uInt16 nVersion ) { CharSet eEncoding = osl_getThreadTextEncoding(); - rStream.ReadByteString(aName, eEncoding); + rStream.ReadUniOrByteString(aName, eEncoding); char c; for(sal_uInt16 n = 0; n < MAXLEVEL; ++n ) @@ -274,7 +274,7 @@ void SwNumRulesWithName::MakeNumRule( SwWrtShell& rSh, SwNumRule& rChg ) const void SwNumRulesWithName::Store( SvStream &rStream ) { CharSet eEncoding = osl_getThreadTextEncoding(); - rStream.WriteByteString(aName, eEncoding); + rStream.WriteUniOrByteString(aName, eEncoding); for( sal_uInt16 n = 0; n < MAXLEVEL; ++n ) { @@ -354,9 +354,9 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( SvStream& rStream, long nL; rStream >> cChar; aFmt.SetStart( (sal_uInt16)cChar ); - rStream.ReadByteString(sStr, eEncoding); + rStream.ReadUniOrByteString(sStr, eEncoding); aFmt.SetPrefix( sStr ); - rStream.ReadByteString(sStr, eEncoding); + rStream.ReadUniOrByteString(sStr, eEncoding); aFmt.SetSuffix( sStr ); rStream >> nUS; aFmt.SetNumAdjust( SvxAdjust( nUS ) ); rStream >> nL; aFmt.SetLSpace( lNumIndent ); @@ -366,9 +366,9 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( SvStream& rStream, { short nShort; rStream >> nUS; aFmt.SetStart( nUS ); - rStream.ReadByteString(sStr, eEncoding); + rStream.ReadUniOrByteString(sStr, eEncoding); aFmt.SetPrefix( sStr ); - rStream.ReadByteString(sStr, eEncoding); + rStream.ReadUniOrByteString(sStr, eEncoding); aFmt.SetSuffix( sStr ); rStream >> nUS; aFmt.SetNumAdjust( SvxAdjust( nUS ) ); rStream >> nUS; aFmt.SetAbsLSpace( nUS ); @@ -385,7 +385,7 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( SvStream& rStream, sal_uInt16 nPitch; String aName; - rStream.ReadByteString(aName, eEncoding); + rStream.ReadUniOrByteString(aName, eEncoding); rStream >> nFamily >> nCharSet >> nWidth >> nHeight >> nPitch; if( aName.Len() ) @@ -411,7 +411,7 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( SvStream& rStream, { sal_uInt16 nItemCount; rStream >> nCharPoolId; - rStream.ReadByteString(sCharFmtName, eEncoding); + rStream.ReadUniOrByteString(sCharFmtName, eEncoding); rStream >> nItemCount; while( nItemCount-- ) @@ -485,15 +485,15 @@ void SwNumRulesWithName::_SwNumFmtGlobal::Store( SvStream& rStream ) << aFmt.GetBulletChar() << static_cast(aFmt.GetIncludeUpperLevels() > 0) << aFmt.GetStart(); - rStream.WriteByteString( aFmt.GetPrefix(), eEncoding ); - rStream.WriteByteString( aFmt.GetSuffix(), eEncoding ); + rStream.WriteUniOrByteString( aFmt.GetPrefix(), eEncoding ); + rStream.WriteUniOrByteString( aFmt.GetSuffix(), eEncoding ); rStream << sal_uInt16( aFmt.GetNumAdjust() ) << aFmt.GetAbsLSpace() << aFmt.GetFirstLineOffset() << aFmt.GetCharTextDistance() << aFmt.GetLSpace() << sal_False;//aFmt.IsRelLSpace(); - rStream.WriteByteString( aName, eEncoding ); + rStream.WriteUniOrByteString( aName, eEncoding ); rStream << nFamily << nCharSet << nWidth @@ -501,7 +501,7 @@ void SwNumRulesWithName::_SwNumFmtGlobal::Store( SvStream& rStream ) << nPitch; } rStream << nCharPoolId; - rStream.WriteByteString( sCharFmtName, eEncoding ); + rStream.WriteUniOrByteString( sCharFmtName, eEncoding ); rStream << aItems.Count(); for( sal_uInt16 n = aItems.Count(); n; ) diff --git a/tools/inc/tools/stream.hxx b/tools/inc/tools/stream.hxx index e6e939bbbd1b..4d316708b152 100644 --- a/tools/inc/tools/stream.hxx +++ b/tools/inc/tools/stream.hxx @@ -363,11 +363,6 @@ public: SvStream& operator<<( const unsigned char* pBuf ); SvStream& operator<<( SvStream& rStream ); - SvStream& ReadByteString( UniString& rStr, rtl_TextEncoding eSrcCharSet ); - SvStream& ReadByteString( UniString& rStr ) { return ReadByteString( rStr, GetStreamCharSet() ); } - SvStream& WriteByteString( const UniString& rStr, rtl_TextEncoding eDestCharSet ); - SvStream& WriteByteString( const UniString& rStr ) { return WriteByteString( rStr, GetStreamCharSet() ); } - SvStream& WriteNumber( sal_uInt32 nUInt32 ); SvStream& WriteNumber( sal_Int32 nInt32 ); @@ -412,6 +407,12 @@ public: /// Read a line of Unicode sal_Bool ReadUniStringLine( String& rStr ); + /// Read a 32bit length prefixed sequence of utf-16 if eSrcCharSet==RTL_TEXTENCODING_UNICODE, + /// otherwise read a 16bit length prefixed sequence of bytes and convert from eSrcCharSet + SvStream& ReadUniOrByteString( UniString& rStr, rtl_TextEncoding eSrcCharSet ); + /// Write a 32bit length prefixed sequence of utf-16 if eSrcCharSet==RTL_TEXTENCODING_UNICODE, + /// otherwise convert to eSrcCharSet and write a 16bit length prefixed sequence of bytes + SvStream& WriteUniOrByteString( const UniString& rStr, rtl_TextEncoding eDestCharSet ); /// 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 ); diff --git a/tools/source/inet/inetmsg.cxx b/tools/source/inet/inetmsg.cxx index f626dcccd508..a49d382ef158 100644 --- a/tools/source/inet/inetmsg.cxx +++ b/tools/source/inet/inetmsg.cxx @@ -137,7 +137,7 @@ sal_uIntPtr INetMessage::SetHeaderField ( SvStream& INetMessage::operator<< (SvStream& rStrm) const { rStrm << static_cast(m_nDocSize); - rStrm.WriteByteString (m_aDocName, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString(rStrm, m_aDocName, RTL_TEXTENCODING_UTF8); sal_uIntPtr i, n = m_aHeaderList.size(); rStrm << static_cast(n); @@ -163,7 +163,7 @@ SvStream& INetMessage::operator>> (SvStream& rStrm) // Copy. rStrm >> nTemp; m_nDocSize = nTemp; - rStrm.ReadByteString (m_aDocName, RTL_TEXTENCODING_UTF8); + m_aDocName = read_lenPrefixed_uInt8s_ToOUString(rStrm, RTL_TEXTENCODING_UTF8); sal_uIntPtr i, n = 0; rStrm >> nTemp; diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx index b70195978008..aab11a6ffc51 100644 --- a/tools/source/stream/stream.cxx +++ b/tools/source/stream/stream.cxx @@ -1489,7 +1489,7 @@ SvStream& SvStream::operator<< ( SvStream& rStream ) // ----------------------------------------------------------------------- -SvStream& SvStream::ReadByteString( UniString& rStr, rtl_TextEncoding eSrcCharSet ) +SvStream& SvStream::ReadUniOrByteString( UniString& rStr, rtl_TextEncoding eSrcCharSet ) { // read UTF-16 string directly from stream ? if (eSrcCharSet == RTL_TEXTENCODING_UNICODE) @@ -1523,7 +1523,7 @@ SvStream& SvStream::ReadByteString( UniString& rStr, rtl_TextEncoding eSrcCharSe // ----------------------------------------------------------------------- -SvStream& SvStream::WriteByteString( const UniString& rStr, rtl_TextEncoding eDestCharSet ) +SvStream& SvStream::WriteUniOrByteString( const UniString& rStr, rtl_TextEncoding eDestCharSet ) { // write UTF-16 string directly into stream ? if (eDestCharSet == RTL_TEXTENCODING_UNICODE) diff --git a/vcl/source/gdi/font.cxx b/vcl/source/gdi/font.cxx index 017042692225..059b1fe85320 100644 --- a/vcl/source/gdi/font.cxx +++ b/vcl/source/gdi/font.cxx @@ -780,8 +780,8 @@ SvStream& operator>>( SvStream& rIStm, Impl_Font& rImpl_Font ) sal_Bool bTmp; sal_uInt8 nTmp8; - rIStm.ReadByteString( rImpl_Font.maFamilyName, rIStm.GetStreamCharSet() ); - rIStm.ReadByteString( rImpl_Font.maStyleName, rIStm.GetStreamCharSet() ); + rIStm.ReadUniOrByteString( rImpl_Font.maFamilyName, rIStm.GetStreamCharSet() ); + rIStm.ReadUniOrByteString( rImpl_Font.maStyleName, rIStm.GetStreamCharSet() ); rIStm >> rImpl_Font.maSize; rIStm >> nTmp16; rImpl_Font.meCharSet = (rtl_TextEncoding) nTmp16; @@ -823,8 +823,8 @@ SvStream& operator>>( SvStream& rIStm, Impl_Font& rImpl_Font ) SvStream& operator<<( SvStream& rOStm, const Impl_Font& rImpl_Font ) { VersionCompat aCompat( rOStm, STREAM_WRITE, 3 ); - rOStm.WriteByteString( rImpl_Font.maFamilyName, rOStm.GetStreamCharSet() ); - rOStm.WriteByteString( rImpl_Font.maStyleName, rOStm.GetStreamCharSet() ); + rOStm.WriteUniOrByteString( rImpl_Font.maFamilyName, rOStm.GetStreamCharSet() ); + rOStm.WriteUniOrByteString( rImpl_Font.maStyleName, rOStm.GetStreamCharSet() ); rOStm << rImpl_Font.maSize; rOStm << (sal_uInt16) GetStoreCharSet( rImpl_Font.meCharSet ); diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx index 796659cfdaa5..8d3ef576690e 100644 --- a/vcl/source/gdi/jobset.cxx +++ b/vcl/source/gdi/jobset.cxx @@ -334,9 +334,8 @@ SvStream& operator>>( SvStream& rIStream, JobSetup& rJobSetup ) rIStream.Seek( nFirstPos + sizeof( ImplOldJobSetupData ) + 4 + sizeof( Impl364JobSetupData ) + pJobData->mnDriverDataLen ); while( rIStream.Tell() < nFirstPos + nLen ) { - String aKey, aValue; - rIStream.ReadByteString( aKey, RTL_TEXTENCODING_UTF8 ); - rIStream.ReadByteString( aValue, RTL_TEXTENCODING_UTF8 ); + String aKey = read_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8); + String aValue = read_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8); if( aKey.EqualsAscii( "COMPAT_DUPLEX_MODE" ) ) { if( aValue.EqualsAscii( "DUPLEX_UNKNOWN" ) ) @@ -407,8 +406,8 @@ SvStream& operator<<( SvStream& rOStream, const JobSetup& rJobSetup ) ::boost::unordered_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash >::const_iterator it; for( it = pJobData->maValueMap.begin(); it != pJobData->maValueMap.end(); ++it ) { - rOStream.WriteByteString( it->first, RTL_TEXTENCODING_UTF8 ); - rOStream.WriteByteString( it->second, RTL_TEXTENCODING_UTF8 ); + write_lenPrefixed_uInt8s_FromOUString(rOStream, it->first, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString(rOStream, it->second, RTL_TEXTENCODING_UTF8); } write_lenPrefixed_uInt8s_FromOString(rOStream, "COMPAT_DUPLEX_MODE"); switch( pJobData->meDuplexMode ) diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx index 9961705cbb6c..2fd96e835910 100644 --- a/vcl/source/gdi/metaact.cxx +++ b/vcl/source/gdi/metaact.cxx @@ -1259,7 +1259,7 @@ void MetaTextAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 2, pData ); rOStm << maPt; - rOStm.WriteByteString( maStr, pData->meActualCharSet ); + rOStm.WriteUniOrByteString( maStr, pData->meActualCharSet ); rOStm << mnIndex; rOStm << mnLen; @@ -1278,7 +1278,7 @@ void MetaTextAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) { COMPAT( rIStm ); rIStm >> maPt; - rIStm.ReadByteString( maStr, pData->meActualCharSet ); + rIStm.ReadUniOrByteString( maStr, pData->meActualCharSet ); rIStm >> mnIndex; rIStm >> mnLen; @@ -1408,7 +1408,7 @@ void MetaTextArrayAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) WRITE_BASE_COMPAT( rOStm, 2, pData ); rOStm << maStartPt; - rOStm.WriteByteString( maStr, pData->meActualCharSet ); + rOStm.WriteUniOrByteString( maStr, pData->meActualCharSet ); rOStm << mnIndex; rOStm << mnLen; rOStm << nAryLen; @@ -1435,7 +1435,7 @@ void MetaTextArrayAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) COMPAT( rIStm ); rIStm >> maStartPt; - rIStm.ReadByteString( maStr, pData->meActualCharSet ); + rIStm.ReadUniOrByteString( maStr, pData->meActualCharSet ); rIStm >> mnIndex; rIStm >> mnLen; rIStm >> nAryLen; @@ -1555,7 +1555,7 @@ void MetaStretchTextAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 2, pData ); rOStm << maPt; - rOStm.WriteByteString( maStr, pData->meActualCharSet ); + rOStm.WriteUniOrByteString( maStr, pData->meActualCharSet ); rOStm << mnWidth; rOStm << mnIndex; rOStm << mnLen; @@ -1575,7 +1575,7 @@ void MetaStretchTextAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) { COMPAT( rIStm ); rIStm >> maPt; - rIStm.ReadByteString( maStr, pData->meActualCharSet ); + rIStm.ReadUniOrByteString( maStr, pData->meActualCharSet ); rIStm >> mnWidth; rIStm >> mnIndex; rIStm >> mnLen; @@ -1650,7 +1650,7 @@ void MetaTextRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 2, pData ); rOStm << maRect; - rOStm.WriteByteString( maStr, pData->meActualCharSet ); + rOStm.WriteUniOrByteString( maStr, pData->meActualCharSet ); rOStm << mnStyle; sal_uInt16 i, nLen = maStr.Len(); // version 2 @@ -1668,7 +1668,7 @@ void MetaTextRectAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) { COMPAT( rIStm ); rIStm >> maRect; - rIStm.ReadByteString( maStr, pData->meActualCharSet ); + rIStm.ReadUniOrByteString( maStr, pData->meActualCharSet ); rIStm >> mnStyle; if ( aCompat.GetVersion() >= 2 ) // Version 2 diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index 6a4cabaecbfe..9cede2527aaa 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -280,10 +280,10 @@ SvStream& operator<<( SvStream& rOStream, const QueueInfo& rInfo ) { VersionCompat aCompat( rOStream, STREAM_WRITE, 1 ); - rOStream.WriteByteString( rInfo.maPrinterName, RTL_TEXTENCODING_UTF8 ); - rOStream.WriteByteString( rInfo.maDriver, RTL_TEXTENCODING_UTF8 ); - rOStream.WriteByteString( rInfo.maLocation, RTL_TEXTENCODING_UTF8 ); - rOStream.WriteByteString( rInfo.maComment, RTL_TEXTENCODING_UTF8 ); + write_lenPrefixed_uInt8s_FromOUString(rOStream, rInfo.maPrinterName, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString(rOStream, rInfo.maDriver, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString(rOStream, rInfo.maLocation, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString(rOStream, rInfo.maComment, RTL_TEXTENCODING_UTF8); rOStream << rInfo.mnStatus; rOStream << rInfo.mnJobs; @@ -296,15 +296,10 @@ SvStream& operator>>( SvStream& rIStream, QueueInfo& rInfo ) { VersionCompat aCompat( rIStream, STREAM_READ ); - String aTmp; - rIStream.ReadByteString( aTmp, RTL_TEXTENCODING_UTF8 ); - rInfo.maPrinterName = aTmp; - rIStream.ReadByteString( aTmp, RTL_TEXTENCODING_UTF8 ); - rInfo.maDriver = aTmp; - rIStream.ReadByteString( aTmp, RTL_TEXTENCODING_UTF8 ); - rInfo.maLocation = aTmp; - rIStream.ReadByteString( aTmp, RTL_TEXTENCODING_UTF8 ); - rInfo.maComment = aTmp; + rInfo.maPrinterName = read_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8); + rInfo.maDriver = read_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8); + rInfo.maLocation = read_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8); + rInfo.maComment = read_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8); rIStream >> rInfo.mnStatus; rIStream >> rInfo.mnJobs; diff --git a/vcl/source/gdi/rendergraphic.cxx b/vcl/source/gdi/rendergraphic.cxx index 2077eedc4acd..16b08c4de17a 100644 --- a/vcl/source/gdi/rendergraphic.cxx +++ b/vcl/source/gdi/rendergraphic.cxx @@ -192,10 +192,9 @@ void RenderGraphic::ImplGetDefaults() const ::SvStream& operator>>( ::SvStream& rIStm, RenderGraphic& rRenderGraphic ) { ::VersionCompat aVCompat( rIStm, STREAM_READ ); - String aGraphicDataMimeType; sal_uInt32 nGraphicDataLength = 0; - rIStm.ReadByteString( aGraphicDataMimeType, RTL_TEXTENCODING_ASCII_US ); + rtl::OUString aGraphicDataMimeType = read_lenPrefixed_uInt8s_ToOUString(rIStm, RTL_TEXTENCODING_ASCII_US); rIStm >> nGraphicDataLength; rRenderGraphic = RenderGraphic( aGraphicDataMimeType, nGraphicDataLength ); @@ -215,7 +214,8 @@ void RenderGraphic::ImplGetDefaults() const ::VersionCompat aVCompat( rOStm, STREAM_WRITE, 1 ); const sal_uInt32 nGraphicDataLength = rRenderGraphic.GetGraphicDataLength(); - rOStm.WriteByteString( rRenderGraphic.GetGraphicDataMimeType(), RTL_TEXTENCODING_ASCII_US ); + write_lenPrefixed_uInt8s_FromOUString(rOStm, rRenderGraphic.GetGraphicDataMimeType(), + RTL_TEXTENCODING_ASCII_US); rOStm << nGraphicDataLength; if( nGraphicDataLength ) diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index cf7941e67805..44ca911f6987 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -160,10 +160,10 @@ ImplFontAttrCache::ImplFontAttrCache( const String& rFileNameURL, const String& ImplDevFontAttributes aDFA; for(;;) { - aCacheFile.ReadByteString( aFontFileURL, RTL_TEXTENCODING_UTF8 ); + aFontFileURL = read_lenPrefixed_uInt8s_ToOUString(aCacheFile, RTL_TEXTENCODING_UTF8); if( !aFontFileURL.Len() ) break; - aCacheFile.ReadByteString( aDFA.maName, RTL_TEXTENCODING_UTF8 ); + aDFA.maName = read_lenPrefixed_uInt8s_ToOUString(aCacheFile, RTL_TEXTENCODING_UTF8); short n; aCacheFile >> n; aDFA.meWeight = static_cast(n); @@ -195,8 +195,8 @@ ImplFontAttrCache::~ImplFontAttrCache() { const String rFontFileURL( (*aIter).first ); const ImplDevFontAttributes& rDFA( (*aIter).second ); - aCacheFile.WriteByteString( rFontFileURL, RTL_TEXTENCODING_UTF8 ); - aCacheFile.WriteByteString( rDFA.maName, RTL_TEXTENCODING_UTF8 ); + write_lenPrefixed_uInt8s_FromOUString(aCacheFile, rFontFileURL, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString(aCacheFile, rDFA.maName, RTL_TEXTENCODING_UTF8); aCacheFile << static_cast(rDFA.meWeight); aCacheFile << static_cast(rDFA.meItalic); @@ -205,13 +205,12 @@ ImplFontAttrCache::~ImplFontAttrCache() aCacheFile << static_cast(rDFA.meFamily); aCacheFile << static_cast(rDFA.mbSymbolFlag != false); - aCacheFile.WriteByteStringLine( rDFA.maStyleName, RTL_TEXTENCODING_UTF8 ); + write_lenPrefixed_uInt8s_FromOUString(aCacheFile, rDFA.maStyleName, RTL_TEXTENCODING_UTF8); ++aIter; } // EOF Marker - String aEmptyStr; - aCacheFile.WriteByteString( aEmptyStr, RTL_TEXTENCODING_UTF8 ); + write_lenPrefixed_uInt8s_FromOString(aCacheFile, rtl::OString(), RTL_TEXTENCODING_UTF8); } } } -- cgit v1.2.3 From fffae28952f20fed693df4de8b8645cf0aedabfa Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 21 Dec 2011 10:29:33 +0000 Subject: bah, need to tweak for pre c++0x This reverts commit d00fc0e293852cfc019ffaffa65bee327397677b. --- basic/source/basmgr/basmgr.cxx | 11 +++---- basic/source/classes/image.cxx | 16 +++++----- basic/source/classes/sbxmod.cxx | 4 +-- basic/source/runtime/methods1.cxx | 4 +-- basic/source/sbx/sbxbase.cxx | 18 ++++------- basic/source/sbx/sbxcoll.cxx | 6 ++-- basic/source/sbx/sbxobj.cxx | 14 ++++----- basic/source/sbx/sbxvalue.cxx | 23 +++++++------- basic/source/sbx/sbxvar.cxx | 19 +++++------- dbaccess/source/ui/tabledesign/TableRow.cxx | 16 +++++----- editeng/source/editeng/editobj.cxx | 6 ++-- editeng/source/items/bulitem.cxx | 12 ++++---- editeng/source/items/flditem.cxx | 4 +-- editeng/source/items/frmitems.cxx | 8 ++--- editeng/source/items/numitem.cxx | 6 ++-- editeng/source/items/textitem.cxx | 16 +++++----- idl/source/objects/module.cxx | 8 ++--- sc/source/core/data/patattr.cxx | 8 ++--- sc/source/core/tool/autoform.cxx | 14 +++------ sc/source/core/tool/ddelink.cxx | 12 ++++---- sc/source/core/tool/zforauto.cxx | 4 +-- sd/source/filter/html/pubdlg.cxx | 48 ++++++++++------------------- sfx2/source/appl/appmisc.cxx | 4 +-- sot/source/sdstor/ucbstorage.cxx | 2 +- svl/source/items/poolitem.cxx | 8 ++--- svl/source/numbers/zformat.cxx | 10 +++--- svtools/source/misc/templatefoldercache.cxx | 6 ++-- svtools/source/misc/transfer.cxx | 8 ++--- svx/source/items/hlnkitem.cxx | 32 +++++++++---------- svx/source/items/pageitem.cxx | 4 +-- sw/source/core/doc/tblafmt.cxx | 14 ++++----- sw/source/ui/config/uinums.cxx | 24 +++++++-------- tools/inc/tools/stream.hxx | 11 +++---- tools/source/inet/inetmsg.cxx | 4 +-- tools/source/stream/stream.cxx | 4 +-- vcl/source/gdi/font.cxx | 8 ++--- vcl/source/gdi/jobset.cxx | 9 +++--- vcl/source/gdi/metaact.cxx | 16 +++++----- vcl/source/gdi/print.cxx | 21 ++++++++----- vcl/source/gdi/rendergraphic.cxx | 6 ++-- vcl/win/source/gdi/salgdi3.cxx | 13 ++++---- 41 files changed, 224 insertions(+), 257 deletions(-) (limited to 'sd') diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx index 9052458e84db..e6c829adbe2c 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -643,17 +643,17 @@ BasicLibInfo* BasicLibInfo::Create( SotStorageStream& rSStream ) // The name of the lib... String aName; - rSStream.ReadUniOrByteString(aName, rSStream.GetStreamCharSet()); + rSStream.ReadByteString(aName); pInfo->SetLibName( aName ); // Absolute path... String aStorageName; - rSStream.ReadUniOrByteString(aStorageName, rSStream.GetStreamCharSet()); + rSStream.ReadByteString(aStorageName); pInfo->SetStorageName( aStorageName ); // Relative path... String aRelStorageName; - rSStream.ReadUniOrByteString(aRelStorageName, rSStream.GetStreamCharSet()); + rSStream.ReadByteString(aRelStorageName); pInfo->SetRelStorageName( aRelStorageName ); if ( nVer >= 2 ) @@ -1041,7 +1041,7 @@ void BasicManager::LoadOldBasicManager( SotStorage& rStorage ) } xManagerStream->Seek( nBasicEndOff+1 ); // +1: 0x00 as separator String aLibs; - xManagerStream->ReadUniOrByteString(aLibs, xManagerStream->GetStreamCharSet()); + xManagerStream->ReadByteString(aLibs); xManagerStream->SetBufferSize( 0 ); xManagerStream.Clear(); // Close stream @@ -1235,8 +1235,7 @@ sal_Bool BasicManager::ImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* pCurSt if ( ( nPasswordMarker == PASSWORD_MARKER ) && !xBasicStream->IsEof() ) { String aPassword; - xBasicStream->ReadUniOrByteString(aPassword, - xBasicStream->GetStreamCharSet()); + xBasicStream->ReadByteString(aPassword); pLibInfo->SetPassword( aPassword ); } xBasicStream->SetCryptMaskKey(rtl::OString()); diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx index 79b3765fa1fc..1208184b5672 100644 --- a/basic/source/classes/image.cxx +++ b/basic/source/classes/image.cxx @@ -147,15 +147,15 @@ sal_Bool SbiImage::Load( SvStream& r, sal_uInt32& nVersion ) switch( nSign ) { case B_NAME: - r.ReadUniOrByteString( aName, eCharSet ); + r.ReadByteString( aName, eCharSet ); break; case B_COMMENT: - r.ReadUniOrByteString( aComment, eCharSet ); + r.ReadByteString( aComment, eCharSet ); break; case B_SOURCE: { String aTmp; - r.ReadUniOrByteString( aTmp, eCharSet ); + r.ReadByteString( aTmp, eCharSet ); aOUSource = aTmp; break; } @@ -164,7 +164,7 @@ sal_Bool SbiImage::Load( SvStream& r, sal_uInt32& nVersion ) for( sal_uInt16 j = 0 ; j < nCount ; j++ ) { String aTmp; - r.ReadUniOrByteString( aTmp, eCharSet ); + r.ReadByteString( aTmp, eCharSet ); aOUSource += aTmp; } break; @@ -274,14 +274,14 @@ sal_Bool SbiImage::Save( SvStream& r, sal_uInt32 nVer ) if( aName.Len() && SbiGood( r ) ) { nPos = SbiOpenRecord( r, B_NAME, 1 ); - r.WriteUniOrByteString( aName, eCharSet ); + r.WriteByteString( aName, eCharSet ); SbiCloseRecord( r, nPos ); } // Comment? if( aComment.Len() && SbiGood( r ) ) { nPos = SbiOpenRecord( r, B_COMMENT, 1 ); - r.WriteUniOrByteString( aComment, eCharSet ); + r.WriteByteString( aComment, eCharSet ); SbiCloseRecord( r, nPos ); } // Source? @@ -295,7 +295,7 @@ sal_Bool SbiImage::Save( SvStream& r, sal_uInt32 nVer ) aTmp = aOUSource.copy( 0, nMaxUnitSize ); else aTmp = aOUSource; - r.WriteUniOrByteString( aTmp, eCharSet ); + r.WriteByteString( aTmp, eCharSet ); SbiCloseRecord( r, nPos ); if( nLen > STRING_MAXLEN ) @@ -309,7 +309,7 @@ sal_Bool SbiImage::Save( SvStream& r, sal_uInt32 nVer ) (nRemainingLen > nMaxUnitSize) ? nMaxUnitSize : nRemainingLen; String aTmp2 = aOUSource.copy( (i+1) * nMaxUnitSize, nCopyLen ); nRemainingLen -= nCopyLen; - r.WriteUniOrByteString( aTmp2, eCharSet ); + r.WriteByteString( aTmp2, eCharSet ); } SbiCloseRecord( r, nPos ); } diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index 975ecc20a0a2..07194fafc966 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -2002,7 +2002,7 @@ sal_Bool SbJScriptModule::LoadData( SvStream& rStrm, sal_uInt16 nVer ) // Get the source string String aTmp; - rStrm.ReadUniOrByteString( aTmp, osl_getThreadTextEncoding() ); + rStrm.ReadByteString( aTmp, osl_getThreadTextEncoding() ); aOUSource = aTmp; return sal_True; } @@ -2014,7 +2014,7 @@ sal_Bool SbJScriptModule::StoreData( SvStream& rStrm ) const // Write the source string String aTmp = aOUSource; - rStrm.WriteUniOrByteString( aTmp, osl_getThreadTextEncoding() ); + rStrm.WriteByteString( aTmp, osl_getThreadTextEncoding() ); return sal_True; } diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx index 5b25252a780d..2ff6990e215d 100644 --- a/basic/source/runtime/methods1.cxx +++ b/basic/source/runtime/methods1.cxx @@ -991,7 +991,7 @@ sal_Bool lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm, { if( bIsVariant ) *pStrm << (sal_uInt16)SbxSTRING; - pStrm->WriteUniOrByteString( rStr, osl_getThreadTextEncoding() ); + pStrm->WriteByteString( rStr, osl_getThreadTextEncoding() ); } else { @@ -1107,7 +1107,7 @@ sal_Bool lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm, case SbxLPSTR: { String aStr; - pStrm->ReadUniOrByteString( aStr, osl_getThreadTextEncoding() ); + pStrm->ReadByteString( aStr, osl_getThreadTextEncoding() ); rVar.PutString( aStr ); } break; diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx index 7ab2d6c15b37..711efdcb5afc 100644 --- a/basic/source/sbx/sbxbase.cxx +++ b/basic/source/sbx/sbxbase.cxx @@ -383,18 +383,15 @@ sal_Bool SbxInfo::LoadData( SvStream& rStrm, sal_uInt16 nVer ) { aParams.Remove( 0, aParams.Count() ); sal_uInt16 nParam; - aComment = read_lenPrefixed_uInt8s_ToOUString(rStrm, - RTL_TEXTENCODING_ASCII_US); - aHelpFile = read_lenPrefixed_uInt8s_ToOUString(rStrm, - RTL_TEXTENCODING_ASCII_US); + rStrm.ReadByteString( aComment, RTL_TEXTENCODING_ASCII_US ); + rStrm.ReadByteString( aHelpFile, RTL_TEXTENCODING_ASCII_US ); rStrm >> nHelpId >> nParam; while( nParam-- ) { XubString aName; sal_uInt16 nType, nFlags; sal_uInt32 nUserData = 0; - aName = read_lenPrefixed_uInt8s_ToOUString(rStrm, - RTL_TEXTENCODING_ASCII_US); + rStrm.ReadByteString( aName, RTL_TEXTENCODING_ASCII_US ); rStrm >> nType >> nFlags; if( nVer > 1 ) rStrm >> nUserData; @@ -407,16 +404,13 @@ sal_Bool SbxInfo::LoadData( SvStream& rStrm, sal_uInt16 nVer ) sal_Bool SbxInfo::StoreData( SvStream& rStrm ) const { - write_lenPrefixed_uInt8s_FromOUString(rStrm, aComment, - RTL_TEXTENCODING_ASCII_US ); - write_lenPrefixed_uInt8s_FromOUString(rStrm, aHelpFile, - RTL_TEXTENCODING_ASCII_US); + rStrm.WriteByteString( aComment, RTL_TEXTENCODING_ASCII_US ); + rStrm.WriteByteString( aHelpFile, RTL_TEXTENCODING_ASCII_US ); rStrm << nHelpId << aParams.Count(); for( sal_uInt16 i = 0; i < aParams.Count(); i++ ) { SbxParamInfo* p = aParams.GetObject( i ); - write_lenPrefixed_uInt8s_FromOUString(rStrm, p->aName, - RTL_TEXTENCODING_ASCII_US); + rStrm.WriteByteString( p->aName, RTL_TEXTENCODING_ASCII_US ); rStrm << (sal_uInt16) p->eType << (sal_uInt16) p->nFlags << (sal_uInt32) p->nUserData; diff --git a/basic/source/sbx/sbxcoll.cxx b/basic/source/sbx/sbxcoll.cxx index 97573876064c..7803ee013b2f 100644 --- a/basic/source/sbx/sbxcoll.cxx +++ b/basic/source/sbx/sbxcoll.cxx @@ -279,8 +279,7 @@ sal_Bool SbxStdCollection::LoadData( SvStream& rStrm, sal_uInt16 nVer ) sal_Bool bRes = SbxCollection::LoadData( rStrm, nVer ); if( bRes ) { - aElemClass = read_lenPrefixed_uInt8s_ToOUString(rStrm, - RTL_TEXTENCODING_ASCII_US); + rStrm.ReadByteString( aElemClass, RTL_TEXTENCODING_ASCII_US ); rStrm >> bAddRemoveOk; } return bRes; @@ -291,8 +290,7 @@ sal_Bool SbxStdCollection::StoreData( SvStream& rStrm ) const sal_Bool bRes = SbxCollection::StoreData( rStrm ); if( bRes ) { - write_lenPrefixed_uInt8s_FromOUString(rStrm, aElemClass, - RTL_TEXTENCODING_ASCII_US); + rStrm.WriteByteString( aElemClass, RTL_TEXTENCODING_ASCII_US ); rStrm << bAddRemoveOk; } return bRes; diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx index 0c98fca20049..81574efd0fba 100644 --- a/basic/source/sbx/sbxobj.cxx +++ b/basic/source/sbx/sbxobj.cxx @@ -591,10 +591,8 @@ sal_Bool SbxObject::LoadData( SvStream& rStrm, sal_uInt16 nVer ) aData.pObj = this; sal_uInt32 nSize; XubString aDfltProp; - aClassName = read_lenPrefixed_uInt8s_ToOUString(rStrm, - RTL_TEXTENCODING_ASCII_US); - aDfltProp = read_lenPrefixed_uInt8s_ToOUString(rStrm, - RTL_TEXTENCODING_ASCII_US); + rStrm.ReadByteString( aClassName, RTL_TEXTENCODING_ASCII_US ); + rStrm.ReadByteString( aDfltProp, RTL_TEXTENCODING_ASCII_US ); sal_uIntPtr nPos = rStrm.Tell(); rStrm >> nSize; if( !LoadPrivateData( rStrm, nVer ) ) @@ -622,8 +620,8 @@ sal_Bool SbxObject::StoreData( SvStream& rStrm ) const XubString aDfltProp; if( pDfltProp ) aDfltProp = pDfltProp->GetName(); - write_lenPrefixed_uInt8s_FromOUString(rStrm, aClassName, RTL_TEXTENCODING_ASCII_US); - write_lenPrefixed_uInt8s_FromOUString(rStrm, aDfltProp, RTL_TEXTENCODING_ASCII_US); + rStrm.WriteByteString( aClassName, RTL_TEXTENCODING_ASCII_US ); + rStrm.WriteByteString( aDfltProp, RTL_TEXTENCODING_ASCII_US ); sal_uIntPtr nPos = rStrm.Tell(); rStrm << (sal_uInt32) 0L; if( !StorePrivateData( rStrm ) ) @@ -799,7 +797,7 @@ void SbxObject::Dump( SvStream& rStrm, sal_Bool bFill ) aLine += aAttrs2; if( !pVar->IsA( TYPE(SbxMethod) ) ) aLine.AppendAscii( " !! Not a Method !!" ); - write_lenPrefixed_uInt8s_FromOUString(rStrm, aLine, RTL_TEXTENCODING_ASCII_US); + rStrm.WriteByteString( aLine, RTL_TEXTENCODING_ASCII_US ); // Output also the object at object-methods if ( pVar->GetValues_Impl().eType == SbxOBJECT && @@ -832,7 +830,7 @@ void SbxObject::Dump( SvStream& rStrm, sal_Bool bFill ) aLine += aAttrs3; if( !pVar->IsA( TYPE(SbxProperty) ) ) aLine.AppendAscii( " !! Not a Property !!" ); - write_lenPrefixed_uInt8s_FromOUString(rStrm, aLine, RTL_TEXTENCODING_ASCII_US); + rStrm.WriteByteString( aLine, RTL_TEXTENCODING_ASCII_US ); // output also the object at object properties if ( pVar->GetValues_Impl().eType == SbxOBJECT && diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx index 692959aa9c18..0d6aa84e19c7 100644 --- a/basic/source/sbx/sbxvalue.cxx +++ b/basic/source/sbx/sbxvalue.cxx @@ -1479,8 +1479,8 @@ sal_Bool SbxValue::LoadData( SvStream& r, sal_uInt16 ) case SbxSINGLE: { // Floats as ASCII - XubString aVal = read_lenPrefixed_uInt8s_ToOUString(r, - RTL_TEXTENCODING_ASCII_US); + XubString aVal; + r.ReadByteString( aVal, RTL_TEXTENCODING_ASCII_US ); double d; SbxDataType t; if( ImpScan( aVal, d, t, NULL ) != SbxERR_OK || t == SbxDOUBLE ) @@ -1495,8 +1495,8 @@ sal_Bool SbxValue::LoadData( SvStream& r, sal_uInt16 ) case SbxDOUBLE: { // Floats as ASCII - XubString aVal = read_lenPrefixed_uInt8s_ToOUString(r, - RTL_TEXTENCODING_ASCII_US); + XubString aVal; + r.ReadByteString( aVal, RTL_TEXTENCODING_ASCII_US ); SbxDataType t; if( ImpScan( aVal, aData.nDouble, t, NULL ) != SbxERR_OK ) { @@ -1524,9 +1524,9 @@ sal_Bool SbxValue::LoadData( SvStream& r, sal_uInt16 ) } case SbxSTRING: { - rtl::OUString aVal = read_lenPrefixed_uInt8s_ToOUString(r, - RTL_TEXTENCODING_ASCII_US); - if( aVal.getLength() ) + XubString aVal; + r.ReadByteString( aVal, RTL_TEXTENCODING_ASCII_US ); + if( aVal.Len() ) aData.pOUString = new ::rtl::OUString( aVal ); else aData.pOUString = NULL; // JSM 1995-09-22 @@ -1621,12 +1621,12 @@ sal_Bool SbxValue::StoreData( SvStream& r ) const case SbxDATE: // #49935: Save as double, elsewise an error during the read in ((SbxValue*)this)->aData.eType = (SbxDataType)( ( nType & 0xF000 ) | SbxDOUBLE ); - write_lenPrefixed_uInt8s_FromOUString(r, GetCoreString(), RTL_TEXTENCODING_ASCII_US); + r.WriteByteString( GetCoreString(), RTL_TEXTENCODING_ASCII_US ); ((SbxValue*)this)->aData.eType = (SbxDataType)nType; break; case SbxSINGLE: case SbxDOUBLE: - write_lenPrefixed_uInt8s_FromOUString(r, GetCoreString(), RTL_TEXTENCODING_ASCII_US); + r.WriteByteString( GetCoreString(), RTL_TEXTENCODING_ASCII_US ); break; case SbxSALUINT64: case SbxSALINT64: @@ -1643,11 +1643,12 @@ sal_Bool SbxValue::StoreData( SvStream& r ) const case SbxSTRING: if( aData.pOUString ) { - write_lenPrefixed_uInt8s_FromOUString(r, *aData.pOUString, RTL_TEXTENCODING_ASCII_US); + r.WriteByteString( *aData.pOUString, RTL_TEXTENCODING_ASCII_US ); } else { - write_lenPrefixed_uInt8s_FromOUString(r, rtl::OUString(), RTL_TEXTENCODING_ASCII_US); + String aEmpty; + r.WriteByteString( aEmpty, RTL_TEXTENCODING_ASCII_US ); } break; case SbxERROR: diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx index 6ca253355603..58b3cb73f9d4 100644 --- a/basic/source/sbx/sbxvar.cxx +++ b/basic/source/sbx/sbxvar.cxx @@ -445,8 +445,7 @@ sal_Bool SbxVariable::LoadData( SvStream& rStrm, sal_uInt16 nVer ) { if( !SbxValue::LoadData( rStrm, nVer ) ) return sal_False; - maName = read_lenPrefixed_uInt8s_ToOUString(rStrm, - RTL_TEXTENCODING_ASCII_US); + rStrm.ReadByteString( maName, RTL_TEXTENCODING_ASCII_US ); sal_uInt32 nTemp; rStrm >> nTemp; nUserData = nTemp; @@ -455,8 +454,7 @@ sal_Bool SbxVariable::LoadData( SvStream& rStrm, sal_uInt16 nVer ) { rStrm.SeekRel( -1L ); rStrm >> nType; - maName = read_lenPrefixed_uInt8s_ToOUString(rStrm, - RTL_TEXTENCODING_ASCII_US); + rStrm.ReadByteString( maName, RTL_TEXTENCODING_ASCII_US ); sal_uInt32 nTemp; rStrm >> nTemp; nUserData = nTemp; @@ -479,8 +477,7 @@ sal_Bool SbxVariable::LoadData( SvStream& rStrm, sal_uInt16 nVer ) case SbxSINGLE: { // Floats as ASCII - aTmpString = read_lenPrefixed_uInt8s_ToOUString( - rStrm, RTL_TEXTENCODING_ASCII_US); + rStrm.ReadByteString( aTmpString, RTL_TEXTENCODING_ASCII_US ); double d; SbxDataType t; if( ImpScan( aTmpString, d, t, NULL ) != SbxERR_OK || t == SbxDOUBLE ) @@ -495,8 +492,7 @@ sal_Bool SbxVariable::LoadData( SvStream& rStrm, sal_uInt16 nVer ) case SbxDOUBLE: { // Floats as ASCII - aTmpString = read_lenPrefixed_uInt8s_ToOUString(rStrm, - RTL_TEXTENCODING_ASCII_US); + rStrm.ReadByteString( aTmpString, RTL_TEXTENCODING_ASCII_US ); SbxDataType t; if( ImpScan( aTmpString, aTmp.nDouble, t, NULL ) != SbxERR_OK ) { @@ -506,8 +502,8 @@ sal_Bool SbxVariable::LoadData( SvStream& rStrm, sal_uInt16 nVer ) break; } case SbxSTRING: - aVal = read_lenPrefixed_uInt8s_ToOUString(rStrm, - RTL_TEXTENCODING_ASCII_US); + rStrm.ReadByteString( aTmpString, RTL_TEXTENCODING_ASCII_US ); + aVal = aTmpString; break; case SbxEMPTY: case SbxNULL: @@ -565,8 +561,7 @@ sal_Bool SbxVariable::StoreData( SvStream& rStrm ) const bValStore = SbxValue::StoreData( rStrm ); if( !bValStore ) return sal_False; - write_lenPrefixed_uInt8s_FromOUString(rStrm, maName, - RTL_TEXTENCODING_ASCII_US); + rStrm.WriteByteString( maName, RTL_TEXTENCODING_ASCII_US ); rStrm << (sal_uInt32)nUserData; if( pInfo.Is() ) { diff --git a/dbaccess/source/ui/tabledesign/TableRow.cxx b/dbaccess/source/ui/tabledesign/TableRow.cxx index 35be52c28521..b4ed28a4f0f4 100644 --- a/dbaccess/source/ui/tabledesign/TableRow.cxx +++ b/dbaccess/source/ui/tabledesign/TableRow.cxx @@ -128,9 +128,9 @@ namespace dbaui if(pFieldDesc) { _rStr << (sal_Int32)1; - _rStr.WriteUniOrByteString(pFieldDesc->GetName(), _rStr.GetStreamCharSet()); - _rStr.WriteUniOrByteString(pFieldDesc->GetDescription(), _rStr.GetStreamCharSet()); - _rStr.WriteUniOrByteString(pFieldDesc->GetHelpText(), _rStr.GetStreamCharSet()); + _rStr.WriteByteString(pFieldDesc->GetName()); + _rStr.WriteByteString(pFieldDesc->GetDescription()); + _rStr.WriteByteString(pFieldDesc->GetHelpText()); double nValue = 0.0; Any aValue = pFieldDesc->GetControlDefault(); if ( aValue >>= nValue ) @@ -141,7 +141,7 @@ namespace dbaui else { _rStr << sal_Int32(2); - _rStr.WriteUniOrByteString(::comphelper::getString(aValue), _rStr.GetStreamCharSet()); + _rStr.WriteByteString(::comphelper::getString(aValue)); } _rStr << pFieldDesc->GetType(); @@ -170,12 +170,12 @@ namespace dbaui OFieldDescription* pFieldDesc = new OFieldDescription(); _rRow.m_pActFieldDescr = pFieldDesc; String sValue; - _rStr.ReadUniOrByteString(sValue, _rStr.GetStreamCharSet()); + _rStr.ReadByteString(sValue); pFieldDesc->SetName(sValue); - _rStr.ReadUniOrByteString(sValue, _rStr.GetStreamCharSet()); + _rStr.ReadByteString(sValue); pFieldDesc->SetDescription(sValue); - _rStr.ReadUniOrByteString(sValue, _rStr.GetStreamCharSet()); + _rStr.ReadByteString(sValue); pFieldDesc->SetHelpText(sValue); _rStr >> nValue; @@ -190,7 +190,7 @@ namespace dbaui break; } case 2: - _rStr.ReadUniOrByteString(sValue, _rStr.GetStreamCharSet()); + _rStr.ReadByteString(sValue); aControlDefault <<= ::rtl::OUString(sValue); break; } diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx index 8435e66d923f..0fd144b42514 100644 --- a/editeng/source/editeng/editobj.cxx +++ b/editeng/source/editeng/editobj.cxx @@ -1230,7 +1230,7 @@ void BinTextObject::CreateData( SvStream& rIStream ) pC->GetText() = rtl::OStringToOUString(aByteString, eSrcEncoding); // StyleName and Family... - rIStream.ReadUniOrByteString( pC->GetStyle(), eSrcEncoding ); + rIStream.ReadByteString( pC->GetStyle(), eSrcEncoding ); sal_uInt16 nStyleFamily; rIStream >> nStyleFamily; pC->GetFamily() = (SfxStyleFamily)nStyleFamily; @@ -1522,10 +1522,10 @@ void BinTextObject::CreateData300( SvStream& rIStream ) ContentInfo* pC = CreateAndInsertContent(); // The Text... - rIStream.ReadUniOrByteString( pC->GetText(), rIStream.GetStreamCharSet() ); + rIStream.ReadByteString( pC->GetText() ); // StyleName and Family... - rIStream.ReadUniOrByteString( pC->GetStyle(), rIStream.GetStreamCharSet() ); + rIStream.ReadByteString( pC->GetStyle() ); sal_uInt16 nStyleFamily; rIStream >> nStyleFamily; pC->GetFamily() = (SfxStyleFamily)nStyleFamily; diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx index caca392a6d18..2d0e066e4091 100644 --- a/editeng/source/items/bulitem.cxx +++ b/editeng/source/items/bulitem.cxx @@ -64,7 +64,7 @@ void SvxBulletItem::StoreFont( SvStream& rStream, const Font& rFont ) nTemp = (sal_uInt16)rFont.GetItalic(); rStream << nTemp; // UNICODE: rStream << rFont.GetName(); - rStream.WriteUniOrByteString(rFont.GetName(), rStream.GetStreamCharSet()); + rStream.WriteByteString(rFont.GetName()); rStream << rFont.IsOutline(); rStream << rFont.IsShadow(); @@ -94,7 +94,7 @@ Font SvxBulletItem::CreateFont( SvStream& rStream, sal_uInt16 nVer ) // UNICODE: rStream >> aName; aFont.SetName( aName ); String aName; - rStream.ReadUniOrByteString(aName, rStream.GetStreamCharSet()); + rStream.ReadByteString(aName); aFont.SetName( aName ); if( nVer == 1 ) @@ -217,10 +217,10 @@ SvxBulletItem::SvxBulletItem( SvStream& rStrm, sal_uInt16 _nWhich ) : rStrm >> nScale; // UNICODE: rStrm >> aPrevText; - rStrm.ReadUniOrByteString(aPrevText, rStrm.GetStreamCharSet()); + rStrm.ReadByteString(aPrevText); // UNICODE: rStrm >> aFollowText; - rStrm.ReadUniOrByteString(aFollowText, rStrm.GetStreamCharSet()); + rStrm.ReadByteString(aFollowText); nValidMask = 0xFFFF; } @@ -416,10 +416,10 @@ SvStream& SvxBulletItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) c rStrm << nScale; // UNICODE: rStrm << aPrevText; - rStrm.WriteUniOrByteString(aPrevText, rStrm.GetStreamCharSet()); + rStrm.WriteByteString(aPrevText); // UNICODE: rStrm << aFollowText; - rStrm.WriteUniOrByteString(aFollowText, rStrm.GetStreamCharSet()); + rStrm.WriteByteString(aFollowText); return rStrm; } diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx index bafb976f057b..56b2d71f68fa 100644 --- a/editeng/source/items/flditem.cxx +++ b/editeng/source/items/flditem.cxx @@ -735,7 +735,7 @@ void SvxExtFileField::Load( SvPersistStream & rStm ) sal_uInt16 nType, nFormat; // UNICODE: rStm >> aFile; - rStm.ReadUniOrByteString(aFile, rStm.GetStreamCharSet()); + rStm.ReadByteString(aFile); rStm >> nType; rStm >> nFormat; @@ -749,7 +749,7 @@ void SvxExtFileField::Load( SvPersistStream & rStm ) void SvxExtFileField::Save( SvPersistStream & rStm ) { // UNICODE: rStm << aFile; - rStm.WriteUniOrByteString(aFile, rStm.GetStreamCharSet()); + rStm.WriteByteString(aFile); rStm << (sal_uInt16) eType; rStm << (sal_uInt16) eFormat; diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index 18af4a61ec7b..addb3f630a68 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -3443,7 +3443,7 @@ SvxBrushItem::SvxBrushItem( SvStream& rStream, sal_uInt16 nVersion, { String aRel; // UNICODE: rStream >> aRel; - rStream.ReadUniOrByteString(aRel, rStream.GetStreamCharSet()); + rStream.ReadByteString(aRel); // TODO/MBA: how can we get a BaseURL here?! OSL_FAIL("No BaseURL!"); @@ -3456,7 +3456,7 @@ SvxBrushItem::SvxBrushItem( SvStream& rStream, sal_uInt16 nVersion, { pStrFilter = new String; // UNICODE: rStream >> *pStrFilter; - rStream.ReadUniOrByteString(*pStrFilter, rStream.GetStreamCharSet()); + rStream.ReadByteString(*pStrFilter); } rStream >> nPos; @@ -3834,12 +3834,12 @@ SvStream& SvxBrushItem::Store( SvStream& rStream , sal_uInt16 /*nItemVersion*/ ) // TODO/MBA: how to get a BaseURL?! String aRel = INetURLObject::GetRelURL( String(), *pStrLink ); // UNICODE: rStream << aRel; - rStream.WriteUniOrByteString(aRel, rStream.GetStreamCharSet()); + rStream.WriteByteString(aRel); } if ( pStrFilter ) { // UNICODE: rStream << *pStrFilter; - rStream.WriteUniOrByteString(*pStrFilter, rStream.GetStreamCharSet()); + rStream.WriteByteString(*pStrFilter); } rStream << (sal_Int8)eGraphicPos; return rStream; diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx index 01fc4630ff23..8f71ff238b11 100644 --- a/editeng/source/items/numitem.cxx +++ b/editeng/source/items/numitem.cxx @@ -219,9 +219,9 @@ SvStream& SvxNumberFormat::Store(SvStream &rStream, FontToSubsFontConverter pC rStream << nCharTextDistance; rtl_TextEncoding eEnc = osl_getThreadTextEncoding(); - rStream.WriteUniOrByteString(sPrefix, eEnc); - rStream.WriteUniOrByteString(sSuffix, eEnc); - rStream.WriteUniOrByteString(sCharStyleName, eEnc); + rStream.WriteByteString(sPrefix, eEnc); + rStream.WriteByteString(sSuffix, eEnc); + rStream.WriteByteString(sCharStyleName, eEnc); if(pGraphicBrush) { rStream << (sal_uInt16)1; diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index e3069074573a..4f5dc8dc29e6 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -398,16 +398,16 @@ SvStream& SvxFontItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) co String aStoreFamilyName( GetFamilyName() ); if( bToBats ) aStoreFamilyName = String( "StarBats", sizeof("StarBats")-1, RTL_TEXTENCODING_ASCII_US ); - rStrm.WriteUniOrByteString(aStoreFamilyName, rStrm.GetStreamCharSet()); - rStrm.WriteUniOrByteString(GetStyleName(), rStrm.GetStreamCharSet()); + rStrm.WriteByteString(aStoreFamilyName); + rStrm.WriteByteString(GetStyleName()); // cach for EditEngine, only set while creating clipboard stream. if ( bEnableStoreUnicodeNames ) { sal_uInt32 nMagic = STORE_UNICODE_MAGIC_MARKER; rStrm << nMagic; - rStrm.WriteUniOrByteString( aStoreFamilyName, RTL_TEXTENCODING_UNICODE ); - rStrm.WriteUniOrByteString( GetStyleName(), RTL_TEXTENCODING_UNICODE ); + rStrm.WriteByteString( aStoreFamilyName, RTL_TEXTENCODING_UNICODE ); + rStrm.WriteByteString( GetStyleName(), RTL_TEXTENCODING_UNICODE ); } return rStrm; @@ -424,10 +424,10 @@ SfxPoolItem* SvxFontItem::Create(SvStream& rStrm, sal_uInt16) const rStrm >> eFontTextEncoding; // UNICODE: rStrm >> aName; - rStrm.ReadUniOrByteString(aName, rStrm.GetStreamCharSet()); + rStrm.ReadByteString(aName); // UNICODE: rStrm >> aStyle; - rStrm.ReadUniOrByteString(aStyle, rStrm.GetStreamCharSet()); + rStrm.ReadByteString(aStyle); // Set the "correct" textencoding eFontTextEncoding = (sal_uInt8)GetSOLoadTextEncoding( eFontTextEncoding, (sal_uInt16)rStrm.GetVersion() ); @@ -442,8 +442,8 @@ SfxPoolItem* SvxFontItem::Create(SvStream& rStrm, sal_uInt16) const rStrm >> nMagic; if ( nMagic == STORE_UNICODE_MAGIC_MARKER ) { - rStrm.ReadUniOrByteString( aName, RTL_TEXTENCODING_UNICODE ); - rStrm.ReadUniOrByteString( aStyle, RTL_TEXTENCODING_UNICODE ); + rStrm.ReadByteString( aName, RTL_TEXTENCODING_UNICODE ); + rStrm.ReadByteString( aStyle, RTL_TEXTENCODING_UNICODE ); } else { diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx index e8e6542eb1b0..4fd5c78f7f6f 100644 --- a/idl/source/objects/module.cxx +++ b/idl/source/objects/module.cxx @@ -65,7 +65,7 @@ void SvMetaModule::Load( SvPersistStream & rStm ) rStm >> aTypeList; rStm >> aAttrList; // browser - rStm.ReadUniOrByteString( aIdlFileName, rStm.GetStreamCharSet() ); + rStm.ReadByteString( aIdlFileName ); aHelpFileName = read_lenPrefixed_uInt8s_ToOString(rStm); aSlotIdFile = read_lenPrefixed_uInt8s_ToOString(rStm); aModulePrefix = read_lenPrefixed_uInt8s_ToOString(rStm); @@ -90,7 +90,7 @@ void SvMetaModule::Save( SvPersistStream & rStm ) rStm << aTypeList; rStm << aAttrList; // browser - rStm.WriteUniOrByteString( aIdlFileName, rStm.GetStreamCharSet() ); + rStm.WriteByteString( aIdlFileName ); write_lenPrefixed_uInt8s_FromOString(rStm, aHelpFileName); write_lenPrefixed_uInt8s_FromOString(rStm, aSlotIdFile); write_lenPrefixed_uInt8s_FromOString(rStm, aModulePrefix); @@ -368,9 +368,9 @@ void SvMetaModule::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, { rOutStm << SvHash_module()->GetName().GetBuffer() << endl << '\"'; - rOutStm.WriteUniOrByteString( aBeginName.GetHexName(), rOutStm.GetStreamCharSet() ); + rOutStm.WriteByteString( aBeginName.GetHexName() ); rOutStm << '\"' << endl << '\"'; - rOutStm.WriteUniOrByteString( aEndName.GetHexName(), rOutStm.GetStreamCharSet() ); + rOutStm.WriteByteString( aEndName.GetHexName() ); rOutStm << '\"' << endl; SvMetaExtern::WriteSvIdl( rBase, rOutStm, nTab ); } diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx index 93adcfeea75e..fbd982db364a 100644 --- a/sc/source/core/data/patattr.cxx +++ b/sc/source/core/data/patattr.cxx @@ -172,7 +172,7 @@ SfxPoolItem* ScPatternAttr::Create( SvStream& rStream, sal_uInt16 /* nVersion */ { short eFamDummy; pStr = new String; - rStream.ReadUniOrByteString( *pStr, rStream.GetStreamCharSet() ); + rStream.ReadByteString( *pStr, rStream.GetStreamCharSet() ); rStream >> eFamDummy; // wg. altem Dateiformat } else @@ -194,11 +194,11 @@ SvStream& ScPatternAttr::Store(SvStream& rStream, sal_uInt16 /* nItemVersion */) rStream << (sal_Bool)sal_True; if ( pStyle ) - rStream.WriteUniOrByteString( pStyle->GetName(), rStream.GetStreamCharSet() ); + rStream.WriteByteString( pStyle->GetName(), rStream.GetStreamCharSet() ); else if ( pName ) // wenn Style geloescht ist/war - rStream.WriteUniOrByteString( *pName, rStream.GetStreamCharSet() ); + rStream.WriteByteString( *pName, rStream.GetStreamCharSet() ); else - rStream.WriteUniOrByteString( ScGlobal::GetRscString(STR_STYLENAME_STANDARD), + rStream.WriteByteString( ScGlobal::GetRscString(STR_STYLENAME_STANDARD), rStream.GetStreamCharSet() ); rStream << (short)SFX_STYLE_FAMILY_PARA; // wg. altem Dateiformat diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx index 61b8355826f8..fa7836bc604a 100644 --- a/sc/source/core/tool/autoform.cxx +++ b/sc/source/core/tool/autoform.cxx @@ -797,14 +797,8 @@ sal_Bool ScAutoFormatData::Load( SvStream& rStream, const ScAfVersions& rVersion (AUTOFORMAT_DATA_ID_504 <= nVer && nVer <= AUTOFORMAT_DATA_ID)) ) { // --- from 680/dr25 on: store strings as UTF-8 - if (nVer >= AUTOFORMAT_ID_680DR25) - { - aName = read_lenPrefixed_uInt8s_ToOUString(rStream, - RTL_TEXTENCODING_UTF8); - } - else - rStream.ReadUniOrByteString( aName, rStream.GetStreamCharSet() ); - + CharSet eCharSet = (nVer >= AUTOFORMAT_ID_680DR25) ? RTL_TEXTENCODING_UTF8 : rStream.GetStreamCharSet(); + rStream.ReadByteString( aName, eCharSet ); if( AUTOFORMAT_DATA_ID_552 <= nVer ) { rStream >> nStrResId; @@ -844,7 +838,7 @@ sal_Bool ScAutoFormatData::LoadOld( SvStream& rStream, const ScAfVersions& rVers bRet = (rStream.GetError() == 0); if (bRet && (nVal == AUTOFORMAT_OLD_DATA_ID)) { - rStream.ReadUniOrByteString( aName, rStream.GetStreamCharSet() ); + rStream.ReadByteString( aName, rStream.GetStreamCharSet() ); sal_Bool b; rStream >> b; bIncludeFont = b; rStream >> b; bIncludeJustify = b; @@ -869,7 +863,7 @@ sal_Bool ScAutoFormatData::Save(SvStream& rStream) sal_Bool b; rStream << nVal; // --- from 680/dr25 on: store strings as UTF-8 - write_lenPrefixed_uInt8s_FromOUString(rStream, aName, RTL_TEXTENCODING_UTF8); + rStream.WriteByteString( aName, RTL_TEXTENCODING_UTF8 ); rStream << nStrResId; rStream << ( b = bIncludeFont ); diff --git a/sc/source/core/tool/ddelink.cxx b/sc/source/core/tool/ddelink.cxx index ca956813697b..7fbb58b0ea4f 100644 --- a/sc/source/core/tool/ddelink.cxx +++ b/sc/source/core/tool/ddelink.cxx @@ -92,9 +92,9 @@ ScDdeLink::ScDdeLink( ScDocument* pD, SvStream& rStream, ScMultipleReadHeader& r rHdr.StartEntry(); rtl_TextEncoding eCharSet = rStream.GetStreamCharSet(); - rStream.ReadUniOrByteString( aAppl, eCharSet ); - rStream.ReadUniOrByteString( aTopic, eCharSet ); - rStream.ReadUniOrByteString( aItem, eCharSet ); + rStream.ReadByteString( aAppl, eCharSet ); + rStream.ReadByteString( aTopic, eCharSet ); + rStream.ReadByteString( aItem, eCharSet ); sal_Bool bHasValue; rStream >> bHasValue; @@ -114,9 +114,9 @@ void ScDdeLink::Store( SvStream& rStream, ScMultipleWriteHeader& rHdr ) const rHdr.StartEntry(); rtl_TextEncoding eCharSet = rStream.GetStreamCharSet(); - rStream.WriteUniOrByteString( aAppl, eCharSet ); - rStream.WriteUniOrByteString( aTopic, eCharSet ); - rStream.WriteUniOrByteString( aItem, eCharSet ); + rStream.WriteByteString( aAppl, eCharSet ); + rStream.WriteByteString( aTopic, eCharSet ); + rStream.WriteByteString( aItem, eCharSet ); sal_Bool bHasValue = ( pResult != NULL ); rStream << bHasValue; diff --git a/sc/source/core/tool/zforauto.cxx b/sc/source/core/tool/zforauto.cxx index 048c981df3bf..4ebbee3551c0 100644 --- a/sc/source/core/tool/zforauto.cxx +++ b/sc/source/core/tool/zforauto.cxx @@ -61,7 +61,7 @@ ScNumFormatAbbrev::ScNumFormatAbbrev(sal_uLong nFormat, void ScNumFormatAbbrev::Load( SvStream& rStream, CharSet eByteStrSet ) { sal_uInt16 nSysLang, nLang; - rStream.ReadUniOrByteString( sFormatstring, eByteStrSet ); + rStream.ReadByteString( sFormatstring, eByteStrSet ); rStream >> nSysLang >> nLang; eLnge = (LanguageType) nLang; eSysLnge = (LanguageType) nSysLang; @@ -71,7 +71,7 @@ void ScNumFormatAbbrev::Load( SvStream& rStream, CharSet eByteStrSet ) void ScNumFormatAbbrev::Save( SvStream& rStream, CharSet eByteStrSet ) const { - rStream.WriteUniOrByteString( sFormatstring, eByteStrSet ); + rStream.WriteByteString( sFormatstring, eByteStrSet ); rStream << (sal_uInt16) eSysLnge << (sal_uInt16) eLnge; } diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index 55714612b2df..6a9515d4f540 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -267,25 +267,19 @@ SvStream& operator >> (SvStream& rIn, SdPublishingDesign& rDesign) sal_uInt16 nTemp16; - rDesign.m_aDesignName = read_lenPrefixed_uInt8s_ToOUString(rIn, - RTL_TEXTENCODING_UTF8); + rIn.ReadByteString( rDesign.m_aDesignName, RTL_TEXTENCODING_UTF8 ); rIn >> nTemp16; rDesign.m_eMode = (HtmlPublishMode)nTemp16; rIn >> rDesign.m_bContentPage; rIn >> rDesign.m_bNotes; rIn >> rDesign.m_nResolution; - rDesign.m_aCompression = read_lenPrefixed_uInt8s_ToOUString(rIn, - RTL_TEXTENCODING_UTF8); + rIn.ReadByteString( rDesign.m_aCompression, RTL_TEXTENCODING_UTF8 ); rIn >> nTemp16; rDesign.m_eFormat = (PublishingFormat)nTemp16; - rDesign.m_aAuthor = read_lenPrefixed_uInt8s_ToOUString(rIn, - RTL_TEXTENCODING_UTF8); - rDesign.m_aEMail = read_lenPrefixed_uInt8s_ToOUString(rIn, - RTL_TEXTENCODING_UTF8); - rDesign.m_aWWW = read_lenPrefixed_uInt8s_ToOUString(rIn, - RTL_TEXTENCODING_UTF8); - rDesign.m_aMisc = read_lenPrefixed_uInt8s_ToOUString(rIn, - RTL_TEXTENCODING_UTF8); + rIn.ReadByteString( rDesign.m_aAuthor, RTL_TEXTENCODING_UTF8 ); + rIn.ReadByteString( rDesign.m_aEMail, RTL_TEXTENCODING_UTF8 ); + rIn.ReadByteString( rDesign.m_aWWW, RTL_TEXTENCODING_UTF8 ); + rIn.ReadByteString( rDesign.m_aMisc, RTL_TEXTENCODING_UTF8 ); rIn >> rDesign.m_bDownload; rIn >> rDesign.m_bCreated; // not used rIn >> rDesign.m_nButtonThema; @@ -300,10 +294,8 @@ SvStream& operator >> (SvStream& rIn, SdPublishingDesign& rDesign) rIn >> nTemp16; rDesign.m_eScript = (PublishingScript)nTemp16; - rDesign.m_aURL = read_lenPrefixed_uInt8s_ToOUString(rIn, - RTL_TEXTENCODING_UTF8); - rDesign.m_aCGI = read_lenPrefixed_uInt8s_ToOUString(rIn, - RTL_TEXTENCODING_UTF8); + rIn.ReadByteString( rDesign.m_aURL, RTL_TEXTENCODING_UTF8 ); + rIn.ReadByteString( rDesign.m_aCGI, RTL_TEXTENCODING_UTF8 ); rIn >> rDesign.m_bAutoSlide; rIn >> rDesign.m_nSlideDuration; @@ -323,24 +315,18 @@ SvStream& operator << (SvStream& rOut, const SdPublishingDesign& rDesign) SdIOCompat aIO(rOut, STREAM_WRITE, 0); // Name - write_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aDesignName, - RTL_TEXTENCODING_UTF8); + rOut.WriteByteString( rDesign.m_aDesignName, RTL_TEXTENCODING_UTF8 ); rOut << (sal_uInt16)rDesign.m_eMode; rOut << rDesign.m_bContentPage; rOut << rDesign.m_bNotes; rOut << rDesign.m_nResolution; - write_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aCompression, - RTL_TEXTENCODING_UTF8); + rOut.WriteByteString( rDesign.m_aCompression, RTL_TEXTENCODING_UTF8 ); rOut << (sal_uInt16)rDesign.m_eFormat; - write_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aAuthor, - RTL_TEXTENCODING_UTF8); - write_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aEMail, - RTL_TEXTENCODING_UTF8); - write_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aWWW, - RTL_TEXTENCODING_UTF8); - write_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aMisc, - RTL_TEXTENCODING_UTF8); + rOut.WriteByteString( rDesign.m_aAuthor, RTL_TEXTENCODING_UTF8 ); + rOut.WriteByteString( rDesign.m_aEMail, RTL_TEXTENCODING_UTF8 ); + rOut.WriteByteString( rDesign.m_aWWW, RTL_TEXTENCODING_UTF8 ); + rOut.WriteByteString( rDesign.m_aMisc, RTL_TEXTENCODING_UTF8 ); rOut << rDesign.m_bDownload; rOut << rDesign.m_bCreated; // not used rOut << rDesign.m_nButtonThema; @@ -354,10 +340,8 @@ SvStream& operator << (SvStream& rOut, const SdPublishingDesign& rDesign) rOut << rDesign.m_bUseColor; rOut << (sal_uInt16)rDesign.m_eScript; - write_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aURL, - RTL_TEXTENCODING_UTF8); - write_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aCGI, - RTL_TEXTENCODING_UTF8); + rOut.WriteByteString( rDesign.m_aURL, RTL_TEXTENCODING_UTF8 ); + rOut.WriteByteString( rDesign.m_aCGI, RTL_TEXTENCODING_UTF8 ); rOut << rDesign.m_bAutoSlide; rOut << rDesign.m_nSlideDuration; diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx index eaef4b41ce49..e323361ed09c 100644 --- a/sfx2/source/appl/appmisc.cxx +++ b/sfx2/source/appl/appmisc.cxx @@ -192,7 +192,7 @@ std::vector* SfxApplication::GetDisabledSlotList_Impl() { // Read Slot file String aTitle; - pStream->ReadUniOrByteString(aTitle, pStream->GetStreamCharSet()); + pStream->ReadByteString(aTitle); if ( aTitle.CompareToAscii("SfxSlotFile" ) == COMPARE_EQUAL ) { sal_uInt16 nCount; @@ -207,7 +207,7 @@ std::vector* SfxApplication::GetDisabledSlotList_Impl() pList->push_back( nSlot ); } - pStream->ReadUniOrByteString(aTitle, pStream->GetStreamCharSet()); + pStream->ReadByteString(aTitle); if ( aTitle.CompareToAscii("END" ) != COMPARE_EQUAL || pStream->GetError() ) { // Read failed diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx index 49c7bd3cdcc6..f1cf5c0c3127 100644 --- a/sot/source/sdstor/ucbstorage.cxx +++ b/sot/source/sdstor/ucbstorage.cxx @@ -3375,7 +3375,7 @@ String UCBStorage::CreateLinkFile( const String& rName ) // store it as key/value pair String aLink = String::CreateFromAscii("ContentURL="); aLink += aURL; - write_lenPrefixed_uInt8s_FromOUString(*pStream, aLink, RTL_TEXTENCODING_UTF8); + pStream->WriteByteString( aLink, RTL_TEXTENCODING_UTF8 ); pStream->Flush(); // move the stream to its desired location diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx index 8970688be602..e6dab39b6706 100644 --- a/svl/source/items/poolitem.cxx +++ b/svl/source/items/poolitem.cxx @@ -187,7 +187,7 @@ SvStream& SfxPoolItem::Store(SvStream &rStream, sal_uInt16 ) const // static bool SfxPoolItem::readByteString(SvStream & rStream, UniString & rString) { - rStream.ReadUniOrByteString(rString, rStream.GetStreamCharSet()); + rStream.ReadByteString(rString); return rStream.GetError() == ERRCODE_NONE; } @@ -196,7 +196,7 @@ bool SfxPoolItem::readByteString(SvStream & rStream, UniString & rString) void SfxPoolItem::writeByteString(SvStream & rStream, UniString const & rString) { - rStream.WriteUniOrByteString(rString, rStream.GetStreamCharSet()); + rStream.WriteByteString(rString); } //============================================================================ @@ -204,7 +204,7 @@ void SfxPoolItem::writeByteString(SvStream & rStream, bool SfxPoolItem::readUnicodeString(SvStream & rStream, UniString & rString, bool bUnicode) { - rStream.ReadUniOrByteString(rString, + rStream.ReadByteString(rString, bUnicode ? RTL_TEXTENCODING_UCS2 : rStream.GetStreamCharSet()); return rStream.GetError() == ERRCODE_NONE; @@ -215,7 +215,7 @@ bool SfxPoolItem::readUnicodeString(SvStream & rStream, UniString & rString, void SfxPoolItem::writeUnicodeString(SvStream & rStream, UniString const & rString) { - rStream.WriteUniOrByteString(rString, RTL_TEXTENCODING_UCS2); + rStream.WriteByteString(rString, RTL_TEXTENCODING_UCS2); } // ------------------------------------------------------------------------ diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index 852e16d32487..424aaa0204ce 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -154,7 +154,7 @@ void ImpSvNumberformatInfo::Save(SvStream& rStream, sal_uInt16 nAnz) const { for (sal_uInt16 i = 0; i < nAnz; i++) { - rStream.WriteUniOrByteString( sStrArray[i], rStream.GetStreamCharSet() ); + rStream.WriteByteString( sStrArray[i], rStream.GetStreamCharSet() ); short nType = nTypeArray[i]; switch ( nType ) { // der Krampf fuer Versionen vor SV_NUMBERFORMATTER_VERSION_NEW_CURR @@ -392,7 +392,7 @@ void ImpSvNumFor::Save(SvStream& rStream) const { rStream << nAnzStrings; aI.Save(rStream, nAnzStrings); - rStream.WriteUniOrByteString( sColorName, rStream.GetStreamCharSet() ); + rStream.WriteByteString( sColorName, rStream.GetStreamCharSet() ); } void ImpSvNumFor::Load(SvStream& rStream, ImpSvNumberformatScan& rSc, @@ -402,7 +402,7 @@ void ImpSvNumFor::Load(SvStream& rStream, ImpSvNumberformatScan& rSc, rStream >> nAnz; //! noch nicht direkt nAnzStrings wg. Enlarge Enlarge( nAnz ); aI.Load( rStream, nAnz ); - rStream.ReadUniOrByteString( sColorName, rStream.GetStreamCharSet() ); + rStream.ReadByteString( sColorName, rStream.GetStreamCharSet() ); rLoadedColorName = sColorName; pColor = rSc.GetColor(sColorName); } @@ -1828,13 +1828,13 @@ void SvNumberformat::Save( SvStream& rStream, ImpSvNumMultipleWriteHeader& rHdr } rHdr.StartEntry(); - rStream.WriteUniOrByteString( aFormatstring, rStream.GetStreamCharSet() ); + rStream.WriteByteString( aFormatstring, rStream.GetStreamCharSet() ); rStream << eType << fLimit1 << fLimit2 << (sal_uInt16) eOp1 << (sal_uInt16) eOp2 << sal_Bool(bOldStandard) << sal_Bool(bIsUsed); for (sal_uInt16 i = 0; i < 4; i++) NumFor[i].Save(rStream); // ab SV_NUMBERFORMATTER_VERSION_NEWSTANDARD - rStream.WriteUniOrByteString( aComment, rStream.GetStreamCharSet() ); + rStream.WriteByteString( aComment, rStream.GetStreamCharSet() ); rStream << nNewStandardDefined; // ab SV_NUMBERFORMATTER_VERSION_NEW_CURR rStream << nNewCurrencyVersionId; diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx index e2a340a8291b..41f0af0839cd 100644 --- a/svtools/source/misc/templatefoldercache.cxx +++ b/svtools/source/misc/templatefoldercache.cxx @@ -292,7 +292,7 @@ namespace svt void operator() ( const String& _rString ) const { - m_rStorage.WriteUniOrByteString( _rString, m_rStorage.GetStreamCharSet() ); + m_rStorage.WriteByteString( _rString ); } }; @@ -418,7 +418,7 @@ namespace svt while ( nChildren-- ) { String sURL; - m_rStorage.ReadUniOrByteString( sURL, m_rStorage.GetStreamCharSet() ); + m_rStorage.ReadByteString( sURL ); sURL = m_xOfficeInstDirs->makeAbsoluteURL( sURL ); INetURLObject aChildURL( sURL ); rChildren.push_back( new TemplateContent( aChildURL ) ); @@ -736,7 +736,7 @@ namespace svt while ( nRootDirectories-- ) { String sURL; - m_pCacheStream->ReadUniOrByteString( sURL, m_pCacheStream->GetStreamCharSet() ); + m_pCacheStream->ReadByteString( sURL ); // #116281# Keep office installtion relocatable. Never store // any direct references to office installation directory. sURL = getOfficeInstDirs()->makeAbsoluteURL( sURL ); diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index c8158d19b52a..aac712644d95 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -96,8 +96,8 @@ SvStream& operator>>( SvStream& rIStm, TransferableObjectDescriptor& rObjDesc ) rIStm >> rObjDesc.maSize.Height(); rIStm >> rObjDesc.maDragStartPos.X(); rIStm >> rObjDesc.maDragStartPos.Y(); - rIStm.ReadUniOrByteString( rObjDesc.maTypeName, osl_getThreadTextEncoding() ); - rIStm.ReadUniOrByteString( rObjDesc.maDisplayName, osl_getThreadTextEncoding() ); + rIStm.ReadByteString( rObjDesc.maTypeName, osl_getThreadTextEncoding() ); + rIStm.ReadByteString( rObjDesc.maDisplayName, osl_getThreadTextEncoding() ); rIStm >> nSig1 >> nSig2; rObjDesc.mnViewAspect = static_cast< sal_uInt16 >( nViewAspect ); @@ -126,8 +126,8 @@ SvStream& operator<<( SvStream& rOStm, const TransferableObjectDescriptor& rObjD rOStm << rObjDesc.maSize.Height(); rOStm << rObjDesc.maDragStartPos.X(); rOStm << rObjDesc.maDragStartPos.Y(); - rOStm.WriteUniOrByteString( rObjDesc.maTypeName, osl_getThreadTextEncoding() ); - rOStm.WriteUniOrByteString( rObjDesc.maDisplayName, osl_getThreadTextEncoding() ); + rOStm.WriteByteString( rObjDesc.maTypeName, osl_getThreadTextEncoding() ); + rOStm.WriteByteString( rObjDesc.maDisplayName, osl_getThreadTextEncoding() ); rOStm << nSig1 << nSig2; const sal_uInt32 nLastPos = rOStm.Tell(); diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx index 1f6dfa83a794..11a26aa04d49 100644 --- a/svx/source/items/hlnkitem.cxx +++ b/svx/source/items/hlnkitem.cxx @@ -49,13 +49,13 @@ SvStream& SvxHyperlinkItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ { // store 'simple' data // UNICODE: rStrm << sName; - rStrm.WriteUniOrByteString(sName, rStrm.GetStreamCharSet()); + rStrm.WriteByteString(sName); // UNICODE: rStrm << sURL; - rStrm.WriteUniOrByteString(sURL, rStrm.GetStreamCharSet()); + rStrm.WriteByteString(sURL); // UNICODE: rStrm << sTarget; - rStrm.WriteUniOrByteString(sTarget, rStrm.GetStreamCharSet()); + rStrm.WriteByteString(sTarget); rStrm << (sal_uInt32) eType; @@ -64,7 +64,7 @@ SvStream& SvxHyperlinkItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ // new data // UNICODE: rStrm << sIntName; - rStrm.WriteUniOrByteString(sIntName, rStrm.GetStreamCharSet()); + rStrm.WriteByteString(sIntName); // macro-events rStrm << nMacroEvents; @@ -91,10 +91,10 @@ SvStream& SvxHyperlinkItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ rStrm << (sal_uInt16)pMacroTable->GetCurKey(); // UNICODE: rStrm << pMac->GetLibName(); - rStrm.WriteUniOrByteString(pMac->GetLibName(), rStrm.GetStreamCharSet()); + rStrm.WriteByteString(pMac->GetLibName()); // UNICODE: rStrm << pMac->GetMacName(); - rStrm.WriteUniOrByteString(pMac->GetMacName(), rStrm.GetStreamCharSet()); + rStrm.WriteByteString(pMac->GetMacName()); } } } @@ -111,10 +111,10 @@ SvStream& SvxHyperlinkItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ rStrm << (sal_uInt16)pMacroTable->GetCurKey(); // UNICODE: rStrm << pMac->GetLibName(); - rStrm.WriteUniOrByteString(pMac->GetLibName(), rStrm.GetStreamCharSet()); + rStrm.WriteByteString(pMac->GetLibName()); // UNICODE: rStrm << pMac->GetMacName(); - rStrm.WriteUniOrByteString(pMac->GetMacName(), rStrm.GetStreamCharSet()); + rStrm.WriteByteString(pMac->GetMacName()); rStrm << (sal_uInt16)pMac->GetScriptType(); } @@ -131,13 +131,13 @@ SfxPoolItem* SvxHyperlinkItem::Create( SvStream &rStrm, sal_uInt16 /*nItemVer // simple data-types // UNICODE: rStrm >> pNew->sName; - rStrm.ReadUniOrByteString(pNew->sName, rStrm.GetStreamCharSet()); + rStrm.ReadByteString(pNew->sName); // UNICODE: rStrm >> pNew->sURL; - rStrm.ReadUniOrByteString(pNew->sURL, rStrm.GetStreamCharSet()); + rStrm.ReadByteString(pNew->sURL); // UNICODE: rStrm >> pNew->sTarget; - rStrm.ReadUniOrByteString(pNew->sTarget, rStrm.GetStreamCharSet()); + rStrm.ReadByteString(pNew->sTarget); rStrm >> nType; pNew->eType = (SvxLinkInsertMode) nType; @@ -149,7 +149,7 @@ SfxPoolItem* SvxHyperlinkItem::Create( SvStream &rStrm, sal_uInt16 /*nItemVer { // new data // UNICODE: rStrm >> pNew->sIntName; - rStrm.ReadUniOrByteString(pNew->sIntName, rStrm.GetStreamCharSet()); + rStrm.ReadByteString(pNew->sIntName); // macro-events rStrm >> pNew->nMacroEvents; @@ -164,10 +164,10 @@ SfxPoolItem* SvxHyperlinkItem::Create( SvStream &rStrm, sal_uInt16 /*nItemVer rStrm >> nCurKey; // UNICODE: rStrm >> aLibName; - rStrm.ReadUniOrByteString(aLibName, rStrm.GetStreamCharSet()); + rStrm.ReadByteString(aLibName); // UNICODE: rStrm >> aMacName; - rStrm.ReadUniOrByteString(aMacName, rStrm.GetStreamCharSet()); + rStrm.ReadByteString(aMacName); pNew->SetMacro( nCurKey, SvxMacro( aMacName, aLibName, STARBASIC ) ); } @@ -181,10 +181,10 @@ SfxPoolItem* SvxHyperlinkItem::Create( SvStream &rStrm, sal_uInt16 /*nItemVer rStrm >> nCurKey; // UNICODE: rStrm >> aLibName; - rStrm.ReadUniOrByteString(aLibName, rStrm.GetStreamCharSet()); + rStrm.ReadByteString(aLibName); // UNICODE: rStrm >> aMacName; - rStrm.ReadUniOrByteString(aMacName, rStrm.GetStreamCharSet()); + rStrm.ReadByteString(aMacName); rStrm >> nScriptType; diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx index 7dcffd0c9dd4..0ac676debe0a 100644 --- a/svx/source/items/pageitem.cxx +++ b/svx/source/items/pageitem.cxx @@ -251,7 +251,7 @@ SfxPoolItem* SvxPageItem::Create( SvStream& rStream, sal_uInt16 ) const sal_uInt16 nUse; // UNICODE: rStream >> sStr; - rStream.ReadUniOrByteString( sStr, rStream.GetStreamCharSet() ); + rStream.ReadByteString( sStr ); rStream >> eType; rStream >> bLand; @@ -270,7 +270,7 @@ SfxPoolItem* SvxPageItem::Create( SvStream& rStream, sal_uInt16 ) const SvStream& SvxPageItem::Store( SvStream &rStrm, sal_uInt16 /*nItemVersion*/ ) const { // UNICODE: rStrm << aDescName; - rStrm.WriteUniOrByteString(aDescName, rStrm.GetStreamCharSet()); + rStrm.WriteByteString(aDescName); rStrm << (sal_uInt8)eNumType << bLandscape << eUse; return rStrm; diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx index be2d325aef8f..d9c3a010eccd 100644 --- a/sw/source/core/doc/tblafmt.cxx +++ b/sw/source/core/doc/tblafmt.cxx @@ -401,7 +401,7 @@ sal_Bool SwBoxAutoFmt::Load( SvStream& rStream, const SwAfVersions& rVersions, s sal_uInt16 eSys, eLge; // --- from 680/dr25 on: store strings as UTF-8 CharSet eCharSet = (nVer >= AUTOFORMAT_ID_680DR25) ? RTL_TEXTENCODING_UTF8 : rStream.GetStreamCharSet(); - rStream.ReadUniOrByteString( sNumFmtString, eCharSet ) + rStream.ReadByteString( sNumFmtString, eCharSet ) >> eSys >> eLge; eSysLanguage = (LanguageType) eSys; eNumFmtLanguage = (LanguageType) eLge; @@ -486,9 +486,8 @@ sal_Bool SwBoxAutoFmt::Save( SvStream& rStream ) const aRotateMode.Store( rStream, aRotateMode.GetVersion(SOFFICE_FILEFORMAT_40) ); // --- from 680/dr25 on: store strings as UTF-8 - write_lenPrefixed_uInt8s_FromOUString(rStream, sNumFmtString, - RTL_TEXTENCODING_UTF8); - rStream << (sal_uInt16)eSysLanguage << (sal_uInt16)eNumFmtLanguage; + rStream.WriteByteString( sNumFmtString, RTL_TEXTENCODING_UTF8 ) + << (sal_uInt16)eSysLanguage << (sal_uInt16)eNumFmtLanguage; return 0 == rStream.GetError(); } @@ -780,7 +779,7 @@ sal_Bool SwTableAutoFmt::Load( SvStream& rStream, const SwAfVersions& rVersions sal_Bool b; // --- from 680/dr25 on: store strings as UTF-8 CharSet eCharSet = (nVal >= AUTOFORMAT_ID_680DR25) ? RTL_TEXTENCODING_UTF8 : rStream.GetStreamCharSet(); - rStream.ReadUniOrByteString( aName, eCharSet ); + rStream.ReadByteString( aName, eCharSet ); if( AUTOFORMAT_DATA_ID_552 <= nVal ) { rStream >> nStrResId; @@ -830,7 +829,7 @@ sal_Bool SwTableAutoFmt::LoadOld( SvStream& rStream, sal_uInt16 aLoadVer[] ) if( bRet && ( AUTOFORMAT_OLD_DATA_ID == nVal )) { sal_Bool b; - rStream.ReadUniOrByteString( aName, rStream.GetStreamCharSet() ); + rStream.ReadByteString( aName, rStream.GetStreamCharSet() ); rStream >> b; bInclFont = b; rStream >> b; bInclJustify = b; rStream >> b; bInclFrame = b; @@ -861,8 +860,7 @@ sal_Bool SwTableAutoFmt::Save( SvStream& rStream ) const sal_Bool b; rStream << nVal; // --- from 680/dr25 on: store strings as UTF-8 - write_lenPrefixed_uInt8s_FromOUString(rStream, aName, - RTL_TEXTENCODING_UTF8 ); + rStream.WriteByteString( aName, RTL_TEXTENCODING_UTF8 ); rStream << nStrResId; rStream << ( b = bInclFont ); rStream << ( b = bInclJustify ); diff --git a/sw/source/ui/config/uinums.cxx b/sw/source/ui/config/uinums.cxx index c43a2f4ed99b..b521578f605b 100644 --- a/sw/source/ui/config/uinums.cxx +++ b/sw/source/ui/config/uinums.cxx @@ -235,7 +235,7 @@ const SwNumRulesWithName& SwNumRulesWithName::operator=(const SwNumRulesWithName SwNumRulesWithName::SwNumRulesWithName( SvStream &rStream, sal_uInt16 nVersion ) { CharSet eEncoding = osl_getThreadTextEncoding(); - rStream.ReadUniOrByteString(aName, eEncoding); + rStream.ReadByteString(aName, eEncoding); char c; for(sal_uInt16 n = 0; n < MAXLEVEL; ++n ) @@ -274,7 +274,7 @@ void SwNumRulesWithName::MakeNumRule( SwWrtShell& rSh, SwNumRule& rChg ) const void SwNumRulesWithName::Store( SvStream &rStream ) { CharSet eEncoding = osl_getThreadTextEncoding(); - rStream.WriteUniOrByteString(aName, eEncoding); + rStream.WriteByteString(aName, eEncoding); for( sal_uInt16 n = 0; n < MAXLEVEL; ++n ) { @@ -354,9 +354,9 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( SvStream& rStream, long nL; rStream >> cChar; aFmt.SetStart( (sal_uInt16)cChar ); - rStream.ReadUniOrByteString(sStr, eEncoding); + rStream.ReadByteString(sStr, eEncoding); aFmt.SetPrefix( sStr ); - rStream.ReadUniOrByteString(sStr, eEncoding); + rStream.ReadByteString(sStr, eEncoding); aFmt.SetSuffix( sStr ); rStream >> nUS; aFmt.SetNumAdjust( SvxAdjust( nUS ) ); rStream >> nL; aFmt.SetLSpace( lNumIndent ); @@ -366,9 +366,9 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( SvStream& rStream, { short nShort; rStream >> nUS; aFmt.SetStart( nUS ); - rStream.ReadUniOrByteString(sStr, eEncoding); + rStream.ReadByteString(sStr, eEncoding); aFmt.SetPrefix( sStr ); - rStream.ReadUniOrByteString(sStr, eEncoding); + rStream.ReadByteString(sStr, eEncoding); aFmt.SetSuffix( sStr ); rStream >> nUS; aFmt.SetNumAdjust( SvxAdjust( nUS ) ); rStream >> nUS; aFmt.SetAbsLSpace( nUS ); @@ -385,7 +385,7 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( SvStream& rStream, sal_uInt16 nPitch; String aName; - rStream.ReadUniOrByteString(aName, eEncoding); + rStream.ReadByteString(aName, eEncoding); rStream >> nFamily >> nCharSet >> nWidth >> nHeight >> nPitch; if( aName.Len() ) @@ -411,7 +411,7 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( SvStream& rStream, { sal_uInt16 nItemCount; rStream >> nCharPoolId; - rStream.ReadUniOrByteString(sCharFmtName, eEncoding); + rStream.ReadByteString(sCharFmtName, eEncoding); rStream >> nItemCount; while( nItemCount-- ) @@ -485,15 +485,15 @@ void SwNumRulesWithName::_SwNumFmtGlobal::Store( SvStream& rStream ) << aFmt.GetBulletChar() << static_cast(aFmt.GetIncludeUpperLevels() > 0) << aFmt.GetStart(); - rStream.WriteUniOrByteString( aFmt.GetPrefix(), eEncoding ); - rStream.WriteUniOrByteString( aFmt.GetSuffix(), eEncoding ); + rStream.WriteByteString( aFmt.GetPrefix(), eEncoding ); + rStream.WriteByteString( aFmt.GetSuffix(), eEncoding ); rStream << sal_uInt16( aFmt.GetNumAdjust() ) << aFmt.GetAbsLSpace() << aFmt.GetFirstLineOffset() << aFmt.GetCharTextDistance() << aFmt.GetLSpace() << sal_False;//aFmt.IsRelLSpace(); - rStream.WriteUniOrByteString( aName, eEncoding ); + rStream.WriteByteString( aName, eEncoding ); rStream << nFamily << nCharSet << nWidth @@ -501,7 +501,7 @@ void SwNumRulesWithName::_SwNumFmtGlobal::Store( SvStream& rStream ) << nPitch; } rStream << nCharPoolId; - rStream.WriteUniOrByteString( sCharFmtName, eEncoding ); + rStream.WriteByteString( sCharFmtName, eEncoding ); rStream << aItems.Count(); for( sal_uInt16 n = aItems.Count(); n; ) diff --git a/tools/inc/tools/stream.hxx b/tools/inc/tools/stream.hxx index 4d316708b152..e6e939bbbd1b 100644 --- a/tools/inc/tools/stream.hxx +++ b/tools/inc/tools/stream.hxx @@ -363,6 +363,11 @@ public: SvStream& operator<<( const unsigned char* pBuf ); SvStream& operator<<( SvStream& rStream ); + SvStream& ReadByteString( UniString& rStr, rtl_TextEncoding eSrcCharSet ); + SvStream& ReadByteString( UniString& rStr ) { return ReadByteString( rStr, GetStreamCharSet() ); } + SvStream& WriteByteString( const UniString& rStr, rtl_TextEncoding eDestCharSet ); + SvStream& WriteByteString( const UniString& rStr ) { return WriteByteString( rStr, GetStreamCharSet() ); } + SvStream& WriteNumber( sal_uInt32 nUInt32 ); SvStream& WriteNumber( sal_Int32 nInt32 ); @@ -407,12 +412,6 @@ public: /// Read a line of Unicode sal_Bool ReadUniStringLine( String& rStr ); - /// Read a 32bit length prefixed sequence of utf-16 if eSrcCharSet==RTL_TEXTENCODING_UNICODE, - /// otherwise read a 16bit length prefixed sequence of bytes and convert from eSrcCharSet - SvStream& ReadUniOrByteString( UniString& rStr, rtl_TextEncoding eSrcCharSet ); - /// Write a 32bit length prefixed sequence of utf-16 if eSrcCharSet==RTL_TEXTENCODING_UNICODE, - /// otherwise convert to eSrcCharSet and write a 16bit length prefixed sequence of bytes - SvStream& WriteUniOrByteString( const UniString& rStr, rtl_TextEncoding eDestCharSet ); /// 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 ); diff --git a/tools/source/inet/inetmsg.cxx b/tools/source/inet/inetmsg.cxx index a49d382ef158..f626dcccd508 100644 --- a/tools/source/inet/inetmsg.cxx +++ b/tools/source/inet/inetmsg.cxx @@ -137,7 +137,7 @@ sal_uIntPtr INetMessage::SetHeaderField ( SvStream& INetMessage::operator<< (SvStream& rStrm) const { rStrm << static_cast(m_nDocSize); - write_lenPrefixed_uInt8s_FromOUString(rStrm, m_aDocName, RTL_TEXTENCODING_UTF8); + rStrm.WriteByteString (m_aDocName, RTL_TEXTENCODING_UTF8); sal_uIntPtr i, n = m_aHeaderList.size(); rStrm << static_cast(n); @@ -163,7 +163,7 @@ SvStream& INetMessage::operator>> (SvStream& rStrm) // Copy. rStrm >> nTemp; m_nDocSize = nTemp; - m_aDocName = read_lenPrefixed_uInt8s_ToOUString(rStrm, RTL_TEXTENCODING_UTF8); + rStrm.ReadByteString (m_aDocName, RTL_TEXTENCODING_UTF8); sal_uIntPtr i, n = 0; rStrm >> nTemp; diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx index aab11a6ffc51..b70195978008 100644 --- a/tools/source/stream/stream.cxx +++ b/tools/source/stream/stream.cxx @@ -1489,7 +1489,7 @@ SvStream& SvStream::operator<< ( SvStream& rStream ) // ----------------------------------------------------------------------- -SvStream& SvStream::ReadUniOrByteString( UniString& rStr, rtl_TextEncoding eSrcCharSet ) +SvStream& SvStream::ReadByteString( UniString& rStr, rtl_TextEncoding eSrcCharSet ) { // read UTF-16 string directly from stream ? if (eSrcCharSet == RTL_TEXTENCODING_UNICODE) @@ -1523,7 +1523,7 @@ SvStream& SvStream::ReadUniOrByteString( UniString& rStr, rtl_TextEncoding eSrcC // ----------------------------------------------------------------------- -SvStream& SvStream::WriteUniOrByteString( const UniString& rStr, rtl_TextEncoding eDestCharSet ) +SvStream& SvStream::WriteByteString( const UniString& rStr, rtl_TextEncoding eDestCharSet ) { // write UTF-16 string directly into stream ? if (eDestCharSet == RTL_TEXTENCODING_UNICODE) diff --git a/vcl/source/gdi/font.cxx b/vcl/source/gdi/font.cxx index 059b1fe85320..017042692225 100644 --- a/vcl/source/gdi/font.cxx +++ b/vcl/source/gdi/font.cxx @@ -780,8 +780,8 @@ SvStream& operator>>( SvStream& rIStm, Impl_Font& rImpl_Font ) sal_Bool bTmp; sal_uInt8 nTmp8; - rIStm.ReadUniOrByteString( rImpl_Font.maFamilyName, rIStm.GetStreamCharSet() ); - rIStm.ReadUniOrByteString( rImpl_Font.maStyleName, rIStm.GetStreamCharSet() ); + rIStm.ReadByteString( rImpl_Font.maFamilyName, rIStm.GetStreamCharSet() ); + rIStm.ReadByteString( rImpl_Font.maStyleName, rIStm.GetStreamCharSet() ); rIStm >> rImpl_Font.maSize; rIStm >> nTmp16; rImpl_Font.meCharSet = (rtl_TextEncoding) nTmp16; @@ -823,8 +823,8 @@ SvStream& operator>>( SvStream& rIStm, Impl_Font& rImpl_Font ) SvStream& operator<<( SvStream& rOStm, const Impl_Font& rImpl_Font ) { VersionCompat aCompat( rOStm, STREAM_WRITE, 3 ); - rOStm.WriteUniOrByteString( rImpl_Font.maFamilyName, rOStm.GetStreamCharSet() ); - rOStm.WriteUniOrByteString( rImpl_Font.maStyleName, rOStm.GetStreamCharSet() ); + rOStm.WriteByteString( rImpl_Font.maFamilyName, rOStm.GetStreamCharSet() ); + rOStm.WriteByteString( rImpl_Font.maStyleName, rOStm.GetStreamCharSet() ); rOStm << rImpl_Font.maSize; rOStm << (sal_uInt16) GetStoreCharSet( rImpl_Font.meCharSet ); diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx index 8d3ef576690e..796659cfdaa5 100644 --- a/vcl/source/gdi/jobset.cxx +++ b/vcl/source/gdi/jobset.cxx @@ -334,8 +334,9 @@ SvStream& operator>>( SvStream& rIStream, JobSetup& rJobSetup ) rIStream.Seek( nFirstPos + sizeof( ImplOldJobSetupData ) + 4 + sizeof( Impl364JobSetupData ) + pJobData->mnDriverDataLen ); while( rIStream.Tell() < nFirstPos + nLen ) { - String aKey = read_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8); - String aValue = read_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8); + String aKey, aValue; + rIStream.ReadByteString( aKey, RTL_TEXTENCODING_UTF8 ); + rIStream.ReadByteString( aValue, RTL_TEXTENCODING_UTF8 ); if( aKey.EqualsAscii( "COMPAT_DUPLEX_MODE" ) ) { if( aValue.EqualsAscii( "DUPLEX_UNKNOWN" ) ) @@ -406,8 +407,8 @@ SvStream& operator<<( SvStream& rOStream, const JobSetup& rJobSetup ) ::boost::unordered_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash >::const_iterator it; for( it = pJobData->maValueMap.begin(); it != pJobData->maValueMap.end(); ++it ) { - write_lenPrefixed_uInt8s_FromOUString(rOStream, it->first, RTL_TEXTENCODING_UTF8); - write_lenPrefixed_uInt8s_FromOUString(rOStream, it->second, RTL_TEXTENCODING_UTF8); + rOStream.WriteByteString( it->first, RTL_TEXTENCODING_UTF8 ); + rOStream.WriteByteString( it->second, RTL_TEXTENCODING_UTF8 ); } write_lenPrefixed_uInt8s_FromOString(rOStream, "COMPAT_DUPLEX_MODE"); switch( pJobData->meDuplexMode ) diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx index 2fd96e835910..9961705cbb6c 100644 --- a/vcl/source/gdi/metaact.cxx +++ b/vcl/source/gdi/metaact.cxx @@ -1259,7 +1259,7 @@ void MetaTextAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 2, pData ); rOStm << maPt; - rOStm.WriteUniOrByteString( maStr, pData->meActualCharSet ); + rOStm.WriteByteString( maStr, pData->meActualCharSet ); rOStm << mnIndex; rOStm << mnLen; @@ -1278,7 +1278,7 @@ void MetaTextAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) { COMPAT( rIStm ); rIStm >> maPt; - rIStm.ReadUniOrByteString( maStr, pData->meActualCharSet ); + rIStm.ReadByteString( maStr, pData->meActualCharSet ); rIStm >> mnIndex; rIStm >> mnLen; @@ -1408,7 +1408,7 @@ void MetaTextArrayAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) WRITE_BASE_COMPAT( rOStm, 2, pData ); rOStm << maStartPt; - rOStm.WriteUniOrByteString( maStr, pData->meActualCharSet ); + rOStm.WriteByteString( maStr, pData->meActualCharSet ); rOStm << mnIndex; rOStm << mnLen; rOStm << nAryLen; @@ -1435,7 +1435,7 @@ void MetaTextArrayAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) COMPAT( rIStm ); rIStm >> maStartPt; - rIStm.ReadUniOrByteString( maStr, pData->meActualCharSet ); + rIStm.ReadByteString( maStr, pData->meActualCharSet ); rIStm >> mnIndex; rIStm >> mnLen; rIStm >> nAryLen; @@ -1555,7 +1555,7 @@ void MetaStretchTextAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 2, pData ); rOStm << maPt; - rOStm.WriteUniOrByteString( maStr, pData->meActualCharSet ); + rOStm.WriteByteString( maStr, pData->meActualCharSet ); rOStm << mnWidth; rOStm << mnIndex; rOStm << mnLen; @@ -1575,7 +1575,7 @@ void MetaStretchTextAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) { COMPAT( rIStm ); rIStm >> maPt; - rIStm.ReadUniOrByteString( maStr, pData->meActualCharSet ); + rIStm.ReadByteString( maStr, pData->meActualCharSet ); rIStm >> mnWidth; rIStm >> mnIndex; rIStm >> mnLen; @@ -1650,7 +1650,7 @@ void MetaTextRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 2, pData ); rOStm << maRect; - rOStm.WriteUniOrByteString( maStr, pData->meActualCharSet ); + rOStm.WriteByteString( maStr, pData->meActualCharSet ); rOStm << mnStyle; sal_uInt16 i, nLen = maStr.Len(); // version 2 @@ -1668,7 +1668,7 @@ void MetaTextRectAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) { COMPAT( rIStm ); rIStm >> maRect; - rIStm.ReadUniOrByteString( maStr, pData->meActualCharSet ); + rIStm.ReadByteString( maStr, pData->meActualCharSet ); rIStm >> mnStyle; if ( aCompat.GetVersion() >= 2 ) // Version 2 diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index 9cede2527aaa..6a4cabaecbfe 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -280,10 +280,10 @@ SvStream& operator<<( SvStream& rOStream, const QueueInfo& rInfo ) { VersionCompat aCompat( rOStream, STREAM_WRITE, 1 ); - write_lenPrefixed_uInt8s_FromOUString(rOStream, rInfo.maPrinterName, RTL_TEXTENCODING_UTF8); - write_lenPrefixed_uInt8s_FromOUString(rOStream, rInfo.maDriver, RTL_TEXTENCODING_UTF8); - write_lenPrefixed_uInt8s_FromOUString(rOStream, rInfo.maLocation, RTL_TEXTENCODING_UTF8); - write_lenPrefixed_uInt8s_FromOUString(rOStream, rInfo.maComment, RTL_TEXTENCODING_UTF8); + rOStream.WriteByteString( rInfo.maPrinterName, RTL_TEXTENCODING_UTF8 ); + rOStream.WriteByteString( rInfo.maDriver, RTL_TEXTENCODING_UTF8 ); + rOStream.WriteByteString( rInfo.maLocation, RTL_TEXTENCODING_UTF8 ); + rOStream.WriteByteString( rInfo.maComment, RTL_TEXTENCODING_UTF8 ); rOStream << rInfo.mnStatus; rOStream << rInfo.mnJobs; @@ -296,10 +296,15 @@ SvStream& operator>>( SvStream& rIStream, QueueInfo& rInfo ) { VersionCompat aCompat( rIStream, STREAM_READ ); - rInfo.maPrinterName = read_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8); - rInfo.maDriver = read_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8); - rInfo.maLocation = read_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8); - rInfo.maComment = read_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8); + String aTmp; + rIStream.ReadByteString( aTmp, RTL_TEXTENCODING_UTF8 ); + rInfo.maPrinterName = aTmp; + rIStream.ReadByteString( aTmp, RTL_TEXTENCODING_UTF8 ); + rInfo.maDriver = aTmp; + rIStream.ReadByteString( aTmp, RTL_TEXTENCODING_UTF8 ); + rInfo.maLocation = aTmp; + rIStream.ReadByteString( aTmp, RTL_TEXTENCODING_UTF8 ); + rInfo.maComment = aTmp; rIStream >> rInfo.mnStatus; rIStream >> rInfo.mnJobs; diff --git a/vcl/source/gdi/rendergraphic.cxx b/vcl/source/gdi/rendergraphic.cxx index 16b08c4de17a..2077eedc4acd 100644 --- a/vcl/source/gdi/rendergraphic.cxx +++ b/vcl/source/gdi/rendergraphic.cxx @@ -192,9 +192,10 @@ void RenderGraphic::ImplGetDefaults() const ::SvStream& operator>>( ::SvStream& rIStm, RenderGraphic& rRenderGraphic ) { ::VersionCompat aVCompat( rIStm, STREAM_READ ); + String aGraphicDataMimeType; sal_uInt32 nGraphicDataLength = 0; - rtl::OUString aGraphicDataMimeType = read_lenPrefixed_uInt8s_ToOUString(rIStm, RTL_TEXTENCODING_ASCII_US); + rIStm.ReadByteString( aGraphicDataMimeType, RTL_TEXTENCODING_ASCII_US ); rIStm >> nGraphicDataLength; rRenderGraphic = RenderGraphic( aGraphicDataMimeType, nGraphicDataLength ); @@ -214,8 +215,7 @@ void RenderGraphic::ImplGetDefaults() const ::VersionCompat aVCompat( rOStm, STREAM_WRITE, 1 ); const sal_uInt32 nGraphicDataLength = rRenderGraphic.GetGraphicDataLength(); - write_lenPrefixed_uInt8s_FromOUString(rOStm, rRenderGraphic.GetGraphicDataMimeType(), - RTL_TEXTENCODING_ASCII_US); + rOStm.WriteByteString( rRenderGraphic.GetGraphicDataMimeType(), RTL_TEXTENCODING_ASCII_US ); rOStm << nGraphicDataLength; if( nGraphicDataLength ) diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index 44ca911f6987..cf7941e67805 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -160,10 +160,10 @@ ImplFontAttrCache::ImplFontAttrCache( const String& rFileNameURL, const String& ImplDevFontAttributes aDFA; for(;;) { - aFontFileURL = read_lenPrefixed_uInt8s_ToOUString(aCacheFile, RTL_TEXTENCODING_UTF8); + aCacheFile.ReadByteString( aFontFileURL, RTL_TEXTENCODING_UTF8 ); if( !aFontFileURL.Len() ) break; - aDFA.maName = read_lenPrefixed_uInt8s_ToOUString(aCacheFile, RTL_TEXTENCODING_UTF8); + aCacheFile.ReadByteString( aDFA.maName, RTL_TEXTENCODING_UTF8 ); short n; aCacheFile >> n; aDFA.meWeight = static_cast(n); @@ -195,8 +195,8 @@ ImplFontAttrCache::~ImplFontAttrCache() { const String rFontFileURL( (*aIter).first ); const ImplDevFontAttributes& rDFA( (*aIter).second ); - write_lenPrefixed_uInt8s_FromOUString(aCacheFile, rFontFileURL, RTL_TEXTENCODING_UTF8); - write_lenPrefixed_uInt8s_FromOUString(aCacheFile, rDFA.maName, RTL_TEXTENCODING_UTF8); + aCacheFile.WriteByteString( rFontFileURL, RTL_TEXTENCODING_UTF8 ); + aCacheFile.WriteByteString( rDFA.maName, RTL_TEXTENCODING_UTF8 ); aCacheFile << static_cast(rDFA.meWeight); aCacheFile << static_cast(rDFA.meItalic); @@ -205,12 +205,13 @@ ImplFontAttrCache::~ImplFontAttrCache() aCacheFile << static_cast(rDFA.meFamily); aCacheFile << static_cast(rDFA.mbSymbolFlag != false); - write_lenPrefixed_uInt8s_FromOUString(aCacheFile, rDFA.maStyleName, RTL_TEXTENCODING_UTF8); + aCacheFile.WriteByteStringLine( rDFA.maStyleName, RTL_TEXTENCODING_UTF8 ); ++aIter; } // EOF Marker - write_lenPrefixed_uInt8s_FromOString(aCacheFile, rtl::OString(), RTL_TEXTENCODING_UTF8); + String aEmptyStr; + aCacheFile.WriteByteString( aEmptyStr, RTL_TEXTENCODING_UTF8 ); } } } -- cgit v1.2.3 From 6708977331c933b3483b9fe5f66d981b51fd8d49 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 21 Dec 2011 10:30:10 +0000 Subject: needs more work first This reverts commit 92f396733ebc518bcb7a9eae2dd3169d333b82b9. --- basic/source/runtime/iosys.cxx | 2 +- connectivity/source/drivers/dbase/DTable.cxx | 2 +- connectivity/source/drivers/dbase/dindexnode.cxx | 2 +- editeng/source/editeng/editobj.cxx | 9 ++- filter/source/msfilter/mstoolbar.cxx | 2 +- idl/source/objects/bastype.cxx | 8 +- idl/source/objects/module.cxx | 12 +-- idl/source/objects/object.cxx | 4 +- idl/source/objects/types.cxx | 8 +- sc/source/filter/ftools/ftools.cxx | 6 +- sc/source/filter/inc/ftools.hxx | 6 +- sc/source/filter/lotus/lotform.cxx | 6 +- sc/source/filter/qpro/qproform.cxx | 2 +- sc/source/ui/unoobj/scdetect.cxx | 2 +- sd/source/filter/eppt/epptso.cxx | 2 +- sfx2/source/bastyp/sfxhtml.cxx | 2 +- sot/source/sdstor/ucbstorage.cxx | 3 +- svl/source/items/cntwall.cxx | 3 +- svl/source/numbers/zformat.cxx | 3 +- svtools/source/filter/igif/gifread.cxx | 4 +- svtools/source/graphic/grfmgr.cxx | 7 +- svtools/source/misc/imap.cxx | 37 +++++---- svtools/source/urlobj/inetimg.cxx | 8 +- svx/inc/svx/gallery1.hxx | 48 ++++++------ svx/inc/svx/galmisc.hxx | 14 ++-- svx/inc/svx/galtheme.hxx | 18 ++--- svx/source/gallery2/gallery1.cxx | 51 ++++++++----- svx/source/gallery2/galobj.cxx | 36 ++++++--- svx/source/gallery2/galtheme.cxx | 19 +++-- sw/source/filter/ww1/w1class.cxx | 2 +- sw/source/filter/ww8/ww8par.cxx | 2 +- sw/source/filter/ww8/ww8par2.cxx | 2 +- sw/source/filter/ww8/ww8scan.cxx | 21 ++++-- sw/source/filter/ww8/ww8scan.hxx | 5 +- sw/source/filter/ww8/ww8toolbar.cxx | 2 +- sw/source/ui/dochdl/swdtflvr.cxx | 6 +- tools/inc/tools/inetmsg.hxx | 96 ++++++++++++------------ tools/inc/tools/stream.hxx | 59 ++------------- tools/qa/cppunit/test_stream.cxx | 59 ++------------- tools/source/inet/inetmsg.cxx | 18 ++--- tools/source/inet/inetstrm.cxx | 2 +- tools/source/stream/stream.cxx | 36 +++++++-- vcl/source/gdi/animate.cxx | 6 +- vcl/source/gdi/cvtsvm.cxx | 11 +-- vcl/source/gdi/jobset.cxx | 18 ++--- vcl/source/gdi/metaact.cxx | 9 ++- 46 files changed, 327 insertions(+), 353 deletions(-) (limited to 'sd') diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx index 1a63f943d5a7..a2fe3bd9a096 100644 --- a/basic/source/runtime/iosys.cxx +++ b/basic/source/runtime/iosys.cxx @@ -656,7 +656,7 @@ SbError SbiStream::Read( ByteString& rBuf, sal_uInt16 n, bool bForceReadingPerBy n = nLen; if( !n ) return nError = SbERR_BAD_RECORD_LENGTH; - rtl::OStringBuffer aBuffer(read_uInt8s_ToOString(*pStrm, n)); + rtl::OStringBuffer aBuffer(read_uInt8s_AsOString(*pStrm, n)); //Pad it out with ' ' to the requested length on short read sal_Int32 nRequested = sal::static_int_cast(n); comphelper::string::padToLength(aBuffer, nRequested, ' '); diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index cfabfbff4b0d..fc5afcd3d354 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -2739,7 +2739,7 @@ sal_Bool ODbaseTable::ReadMemo(sal_uIntPtr nBlockNo, ORowSetValue& aVariable) { if ( bIsText ) { - rtl::OStringBuffer aBuffer(read_uInt8s_ToOString(*m_pMemoStream, nLength)); + rtl::OStringBuffer aBuffer(read_uInt8s_AsOString(*m_pMemoStream, nLength)); //pad it out with ' ' to expected length on short read sal_Int32 nRequested = sal::static_int_cast(nLength); comphelper::string::padToLength(aBuffer, nRequested, ' '); diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx index 046b457ab808..111745794750 100644 --- a/connectivity/source/drivers/dbase/dindexnode.cxx +++ b/connectivity/source/drivers/dbase/dindexnode.cxx @@ -673,7 +673,7 @@ void ONDXNode::Read(SvStream &rStream, ODbaseIndex& rIndex) else { sal_uInt16 nLen = rIndex.getHeader().db_keylen; - rtl::OString aBuf = read_uInt8s_ToOString(rStream, nLen); + rtl::OString aBuf = read_uInt8s_AsOString(rStream, nLen); //get length minus trailing whitespace sal_Int32 nContentLen = aBuf.getLength(); while (nContentLen && aBuf[nContentLen-1] == ' ') diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx index 0fd144b42514..678f31abad56 100644 --- a/editeng/source/editeng/editobj.cxx +++ b/editeng/source/editeng/editobj.cxx @@ -1131,10 +1131,10 @@ void BinTextObject::StoreData( SvStream& rOStream ) const // Convert CH_FEATURE to CH_FEATURE_OLD aText.SearchAndReplaceAll( cFeatureConverted, CH_FEATURE_OLD ); - write_lenPrefixed_uInt8s_FromOString(rOStream, aText); + rOStream.WriteByteString( aText ); // StyleName and Family... - write_lenPrefixed_uInt8s_FromOUString(rOStream, pC->GetStyle(), eEncoding); + rOStream.WriteByteString( rtl::OUStringToOString(pC->GetStyle(), eEncoding) ); rOStream << (sal_uInt16)pC->GetFamily(); // Paragraph attributes ... @@ -1226,8 +1226,9 @@ void BinTextObject::CreateData( SvStream& rIStream ) ContentInfo* pC = CreateAndInsertContent(); // The Text... - ByteString aByteString = read_lenPrefixed_uInt8s_ToOString(rIStream); - pC->GetText() = rtl::OStringToOUString(aByteString, eSrcEncoding); + ByteString aByteString; + rIStream.ReadByteString( aByteString ); + pC->GetText() = String( aByteString, eSrcEncoding ); // StyleName and Family... rIStream.ReadByteString( pC->GetStyle(), eSrcEncoding ); diff --git a/filter/source/msfilter/mstoolbar.cxx b/filter/source/msfilter/mstoolbar.cxx index ed1c986dd2c7..2776e724d1f5 100644 --- a/filter/source/msfilter/mstoolbar.cxx +++ b/filter/source/msfilter/mstoolbar.cxx @@ -412,7 +412,7 @@ WString::Read( SvStream &rS ) nOffSet = rS.Tell(); sal_uInt8 nChars = 0; rS >> nChars; - sString = read_LEuInt16s_ToOUString(rS, nChars); + sString = read_LEuInt16s_AsOUString(rS, nChars); return true; } diff --git a/idl/source/objects/bastype.cxx b/idl/source/objects/bastype.cxx index afeb0046730d..15c56c088ea0 100644 --- a/idl/source/objects/bastype.cxx +++ b/idl/source/objects/bastype.cxx @@ -228,13 +228,13 @@ sal_Bool SvIdentifier::WriteSvIdl( SvStringHashEntry * pName, SvStream& operator << (SvStream & rStm, const SvIdentifier & r ) { - write_lenPrefixed_uInt8s_FromOString(rStm, r); + rStm.WriteByteString( r ); return rStm; } SvStream& operator >> (SvStream & rStm, SvIdentifier & r ) { - r = read_lenPrefixed_uInt8s_ToOString(rStm); + rStm.ReadByteString( r ); return rStm; } @@ -343,13 +343,13 @@ sal_Bool SvString::WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm, SvStream& operator << (SvStream & rStm, const SvString & r ) { - write_lenPrefixed_uInt8s_FromOString(rStm, r); + rStm.WriteByteString( r ); return rStm; } SvStream& operator >> (SvStream & rStm, SvString & r ) { - r = read_lenPrefixed_uInt8s_ToOString(rStm); + rStm.ReadByteString( r ); return rStm; } diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx index 4fd5c78f7f6f..c2be3e232494 100644 --- a/idl/source/objects/module.cxx +++ b/idl/source/objects/module.cxx @@ -66,9 +66,9 @@ void SvMetaModule::Load( SvPersistStream & rStm ) rStm >> aAttrList; // browser rStm.ReadByteString( aIdlFileName ); - aHelpFileName = read_lenPrefixed_uInt8s_ToOString(rStm); - aSlotIdFile = read_lenPrefixed_uInt8s_ToOString(rStm); - aModulePrefix = read_lenPrefixed_uInt8s_ToOString(rStm); + rStm.ReadByteString( aHelpFileName ); + rStm.ReadByteString( aSlotIdFile ); + rStm.ReadByteString( aModulePrefix ); // read compiler data sal_uInt16 nCmpLen; @@ -91,9 +91,9 @@ void SvMetaModule::Save( SvPersistStream & rStm ) rStm << aAttrList; // browser rStm.WriteByteString( aIdlFileName ); - write_lenPrefixed_uInt8s_FromOString(rStm, aHelpFileName); - write_lenPrefixed_uInt8s_FromOString(rStm, aSlotIdFile); - write_lenPrefixed_uInt8s_FromOString(rStm, aModulePrefix); + rStm.WriteByteString( aHelpFileName ); + rStm.WriteByteString( aSlotIdFile ); + rStm.WriteByteString( aModulePrefix ); // write compiler data sal_uInt16 nCmpLen = 0; diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx index 798acbc1e180..0b3e1cf193e3 100644 --- a/idl/source/objects/object.cxx +++ b/idl/source/objects/object.cxx @@ -55,7 +55,7 @@ void SvClassElement::Load( SvPersistStream & rStm ) return; } if( nMask & 0x01 ) rStm >> aAutomation; - if( nMask & 0x02 ) aPrefix = read_lenPrefixed_uInt8s_ToOString(rStm); + if( nMask & 0x02 ) rStm.ReadByteString( aPrefix ); if( nMask & 0x04 ) { SvMetaClass * p; @@ -75,7 +75,7 @@ void SvClassElement::Save( SvPersistStream & rStm ) // write data rStm << nMask; if( nMask & 0x01 ) rStm << aAutomation; - if( nMask & 0x02 ) write_lenPrefixed_uInt8s_FromOString(rStm, aPrefix); + if( nMask & 0x02 ) rStm.WriteByteString( aPrefix ); if( nMask & 0x04 ) rStm << xClass; } diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx index f2488aa0498b..06db9ed18910 100644 --- a/idl/source/objects/types.cxx +++ b/idl/source/objects/types.cxx @@ -1780,7 +1780,7 @@ void SvMetaEnumValue::Load( SvPersistStream & rStm ) OSL_FAIL( "wrong format" ); return; } - if( nMask & 0x01 ) aEnumValue = read_lenPrefixed_uInt8s_ToOString(rStm); + if( nMask & 0x01 ) rStm.ReadByteString( aEnumValue ); } void SvMetaEnumValue::Save( SvPersistStream & rStm ) @@ -1793,7 +1793,7 @@ void SvMetaEnumValue::Save( SvPersistStream & rStm ) // write data rStm << nMask; - if( nMask & 0x01 ) write_lenPrefixed_uInt8s_FromOString(rStm, aEnumValue); + if( nMask & 0x01 ) rStm.WriteByteString( aEnumValue ); } sal_Bool SvMetaEnumValue::ReadSvIdl( SvIdlDataBase & rBase, @@ -1837,7 +1837,7 @@ void SvMetaTypeEnum::Load( SvPersistStream & rStm ) return; } if( nMask & 0x01 ) rStm >> aEnumValueList; - if( nMask & 0x02 ) aPrefix = read_lenPrefixed_uInt8s_ToOString(rStm); + if( nMask & 0x02 ) rStm.ReadByteString( aPrefix ); } void SvMetaTypeEnum::Save( SvPersistStream & rStm ) @@ -1852,7 +1852,7 @@ void SvMetaTypeEnum::Save( SvPersistStream & rStm ) // write data rStm << nMask; if( nMask & 0x01 ) rStm << aEnumValueList; - if( nMask & 0x02 ) write_lenPrefixed_uInt8s_FromOString(rStm, aPrefix); + if( nMask & 0x02 ) rStm.WriteByteString( aPrefix ); } void SvMetaTypeEnum::ReadContextSvIdl( SvIdlDataBase & rBase, diff --git a/sc/source/filter/ftools/ftools.cxx b/sc/source/filter/ftools/ftools.cxx index bbfbe41a2881..21d3e12fc803 100644 --- a/sc/source/filter/ftools/ftools.cxx +++ b/sc/source/filter/ftools/ftools.cxx @@ -276,9 +276,9 @@ ScStyleSheet& ScfTools::MakePageStyleSheet( ScStyleSheetPool& rPool, const Strin // *** byte string import operations *** -------------------------------------- -rtl::OString ScfTools::read_zeroTerminated_uInt8s_ToOString(SvStream& rStrm, sal_Int32& rnBytesLeft) +rtl::OString ScfTools::read_zeroTerminated_uInt8s_AsOString(SvStream& rStrm, sal_Int32& rnBytesLeft) { - rtl::OString aRet(::read_zeroTerminated_uInt8s_ToOString(rStrm)); + rtl::OString aRet(::read_zeroTerminated_uInt8s_AsOString(rStrm)); rnBytesLeft -= aRet.getLength(); //we read this number of bytes anyway if (rStrm.good()) //if the stream is happy we read the null terminator as well --rnBytesLeft; @@ -287,7 +287,7 @@ rtl::OString ScfTools::read_zeroTerminated_uInt8s_ToOString(SvStream& rStrm, sal void ScfTools::AppendCString( SvStream& rStrm, String& rString, rtl_TextEncoding eTextEnc ) { - rString += ::read_zeroTerminated_uInt8s_ToOUString(rStrm, eTextEnc); + rString += ::read_zeroTerminated_uInt8s_AsOUString(rStrm, eTextEnc); } // *** HTML table names <-> named range names *** ----------------------------- diff --git a/sc/source/filter/inc/ftools.hxx b/sc/source/filter/inc/ftools.hxx index 4bfac0961c83..e57d42c27599 100644 --- a/sc/source/filter/inc/ftools.hxx +++ b/sc/source/filter/inc/ftools.hxx @@ -237,11 +237,11 @@ public: // *** byte string import operations *** -------------------------------------- /** Reads and returns a zero terminated byte string and decreases a stream counter. */ - static rtl::OString read_zeroTerminated_uInt8s_ToOString(SvStream& rStrm, sal_Int32& rnBytesLeft); + static rtl::OString read_zeroTerminated_uInt8s_AsOString(SvStream& rStrm, sal_Int32& rnBytesLeft); /** Reads and returns a zero terminated byte string and decreases a stream counter. */ - inline static rtl::OUString read_zeroTerminated_uInt8s_ToOUString(SvStream& rStrm, sal_Int32& rnBytesLeft, rtl_TextEncoding eTextEnc) + inline static rtl::OUString read_zeroTerminated_uInt8s_AsOUString(SvStream& rStrm, sal_Int32& rnBytesLeft, rtl_TextEncoding eTextEnc) { - return rtl::OStringToOUString(read_zeroTerminated_uInt8s_ToOString(rStrm, rnBytesLeft), eTextEnc); + return rtl::OStringToOUString(read_zeroTerminated_uInt8s_AsOString(rStrm, rnBytesLeft), eTextEnc); } /** Appends a zero terminated byte string. */ diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx index d649c447ff65..5bd02b10d99e 100644 --- a/sc/source/filter/lotus/lotform.cxx +++ b/sc/source/filter/lotus/lotform.cxx @@ -542,7 +542,7 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, sal_Int32& rRest, break; case FT_ConstString: { - String aTmp(ScfTools::read_zeroTerminated_uInt8s_ToOUString(aIn, nBytesLeft, eSrcChar)); + String aTmp(ScfTools::read_zeroTerminated_uInt8s_AsOUString(aIn, nBytesLeft, eSrcChar)); aStack << aPool.Store( aTmp ); } break; @@ -561,7 +561,7 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, sal_Int32& rRest, break; case FT_Nrref: { - String aTmp(ScfTools::read_zeroTerminated_uInt8s_ToOUString(aIn, nBytesLeft, eSrcChar)); + String aTmp(ScfTools::read_zeroTerminated_uInt8s_AsOUString(aIn, nBytesLeft, eSrcChar)); if( rRangeNameBufferWK3.FindRel( aTmp, nRngIndex ) ) aStack << aPool.Store( nRngIndex ); else @@ -574,7 +574,7 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, sal_Int32& rRest, break; case FT_Absnref: { - String aTmp(ScfTools::read_zeroTerminated_uInt8s_ToOUString(aIn, nBytesLeft, eSrcChar)); + String aTmp(ScfTools::read_zeroTerminated_uInt8s_AsOUString(aIn, nBytesLeft, eSrcChar)); if( rRangeNameBufferWK3.FindAbs( aTmp, nRngIndex ) ) aStack << aPool.Store( nRngIndex ); else diff --git a/sc/source/filter/qpro/qproform.cxx b/sc/source/filter/qpro/qproform.cxx index 6c8e8b7d371c..30b7d6032745 100644 --- a/sc/source/filter/qpro/qproform.cxx +++ b/sc/source/filter/qpro/qproform.cxx @@ -249,7 +249,7 @@ ConvErr QProToSc::Convert( const ScTokenArray*& pArray, sal_uInt16 /*nLen*/, con } if( nFmla[ i ] == 0x06 ) { - String aTmp(::read_zeroTerminated_uInt8s_ToOUString(maIn, maIn.GetStreamCharSet())); + String aTmp(::read_zeroTerminated_uInt8s_AsOUString(maIn, maIn.GetStreamCharSet())); sStringArray[ nStringCount ] = aTmp; nStringCount++; SAFEDEC_OR_RET(nRef, aTmp.Len() + 1, ConvErrCount); diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx index fd3b0d264ebd..9d33f09eca2f 100644 --- a/sc/source/ui/unoobj/scdetect.cxx +++ b/sc/source/ui/unoobj/scdetect.cxx @@ -734,7 +734,7 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream ) // get file header rStr.Seek( 0 ); const sal_Size nTrySize = 80; - ByteString aHeader = read_uInt8s_ToOString(rStr, nTrySize); + ByteString aHeader = read_uInt8s_AsOString(rStr, nTrySize); if ( HTMLParser::IsHTMLFormat( aHeader.GetBuffer() ) ) { diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index c320f0c762d3..7e8064f781ea 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -2605,7 +2605,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a *xCompObj >> nStringLen; if ( ( nStringLen > 1 ) && ( ( xCompObj->Tell() + nStringLen ) < nStreamLen ) ) { // i think that the OleIdentifier will follow - rtl::OString aTemp = read_uInt8s_ToOString(*xCompObj, nStringLen - 1); + rtl::OString aTemp = read_uInt8s_AsOString(*xCompObj, nStringLen - 1); aOleIdentifier = rtl::OStringToOUString(aTemp, RTL_TEXTENCODING_MS_1252); } } diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx index acf69186d2ac..18214c5db042 100644 --- a/sfx2/source/bastyp/sfxhtml.cxx +++ b/sfx2/source/bastyp/sfxhtml.cxx @@ -274,7 +274,7 @@ sal_Bool SfxHTMLParser::FinishFileDownload( String& rStr ) : STRING_MAXLEN; aStream.Seek( 0 ); - rtl::OString sBuffer = read_uInt8s_ToOString(aStream, nLen); + rtl::OString sBuffer = read_uInt8s_AsOString(aStream, nLen); rStr = S2U(sBuffer); } diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx index f1cf5c0c3127..b6fb581057fc 100644 --- a/sot/source/sdstor/ucbstorage.cxx +++ b/sot/source/sdstor/ucbstorage.cxx @@ -3303,7 +3303,8 @@ String UCBStorage::GetLinkedFile( SvStream &rStream ) rStream >> nBytes; if( nBytes == 0x04034b50 ) { - ByteString aTmp = read_lenPrefixed_uInt8s_ToOString(rStream); + ByteString aTmp; + rStream.ReadByteString( aTmp ); if ( aTmp.CompareTo( "ContentURL=", 11 ) == COMPARE_EQUAL ) { aTmp.Erase( 0, 11 ); diff --git a/svl/source/items/cntwall.cxx b/svl/source/items/cntwall.cxx index 31ef07e8a06e..f81bd487d48a 100644 --- a/svl/source/items/cntwall.cxx +++ b/svl/source/items/cntwall.cxx @@ -80,7 +80,8 @@ CntWallpaperItem::CntWallpaperItem( sal_uInt16 which, SvStream& rStream, sal_uIn readUnicodeString(rStream, _aURL, false); // "Read" SfxWallpaperItem's string member _aFilter. - read_lenPrefixed_uInt8s_ToOString(rStream); + ByteString aDummy; + rStream.ReadByteString(aDummy); } } diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index 424aaa0204ce..a85491e4f30d 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -1768,7 +1768,8 @@ void SvNumberformat::ConvertLanguage( SvNumberFormatter& rConverter, void SvNumberformat::LoadString( SvStream& rStream, String& rStr ) { CharSet eStream = rStream.GetStreamCharSet(); - ByteString aStr = read_lenPrefixed_uInt8s_ToOString(rStream); + ByteString aStr; + rStream.ReadByteString( aStr ); sal_Char cStream = NfCurrencyEntry::GetEuroSymbol( eStream ); if ( aStr.Search( cStream ) == STRING_NOTFOUND ) { // simple conversion to unicode diff --git a/svtools/source/filter/igif/gifread.cxx b/svtools/source/filter/igif/gifread.cxx index 607b6a877af3..81dee55fabf5 100644 --- a/svtools/source/filter/igif/gifread.cxx +++ b/svtools/source/filter/igif/gifread.cxx @@ -257,8 +257,8 @@ sal_Bool GIFReader::ReadExtension() // Appl.-Extension hat Laenge 11 if ( cSize == 0x0b ) { - rtl::OString aAppId = read_uInt8s_ToOString(rIStm, 8); - rtl::OString aAppCode = read_uInt8s_ToOString(rIStm, 3); + rtl::OString aAppId = read_uInt8s_AsOString(rIStm, 8); + rtl::OString aAppCode = read_uInt8s_AsOString(rIStm, 3); rIStm >> cSize; // NetScape-Extension diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx index db3e8728f8d2..f259ccb06af4 100644 --- a/svtools/source/graphic/grfmgr.cxx +++ b/svtools/source/graphic/grfmgr.cxx @@ -1125,6 +1125,7 @@ SvStream& operator>>( SvStream& rIStm, GraphicObject& rGraphicObj ) VersionCompat aCompat( rIStm, STREAM_READ ); Graphic aGraphic; GraphicAttr aAttr; + ByteString aLink; sal_Bool bLink; rIStm >> aGraphic >> aAttr >> bLink; @@ -1134,8 +1135,8 @@ SvStream& operator>>( SvStream& rIStm, GraphicObject& rGraphicObj ) if( bLink ) { - rtl::OUString aLink = read_lenPrefixed_uInt8s_ToOUString(rIStm, RTL_TEXTENCODING_UTF8); - rGraphicObj.SetLink(aLink); + rIStm.ReadByteString(aLink); + rGraphicObj.SetLink( UniString( aLink, RTL_TEXTENCODING_UTF8 ) ); } else rGraphicObj.SetLink(); @@ -1153,7 +1154,7 @@ SvStream& operator<<( SvStream& rOStm, const GraphicObject& rGraphicObj ) rOStm << rGraphicObj.GetGraphic() << rGraphicObj.GetAttr() << bLink; if( bLink ) - write_lenPrefixed_uInt8s_FromOUString(rOStm, rGraphicObj.GetLink(), RTL_TEXTENCODING_UTF8); + rOStm.WriteByteString(rtl::OUStringToOString(rGraphicObj.GetLink(), RTL_TEXTENCODING_UTF8)); return rOStm; } diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx index bb720f6838e7..016250c23c8c 100644 --- a/svtools/source/misc/imap.cxx +++ b/svtools/source/misc/imap.cxx @@ -104,16 +104,16 @@ void IMapObject::Write( SvStream& rOStm, const String& rBaseURL ) const const rtl::OString aRelURL = rtl::OUStringToOString( URIHelper::simpleNormalizedMakeRelative(rBaseURL, aURL), eEncoding); - write_lenPrefixed_uInt8s_FromOString(rOStm, aRelURL); - write_lenPrefixed_uInt8s_FromOUString(rOStm, aAltText, eEncoding); + rOStm.WriteByteString(aRelURL); + rOStm.WriteByteString(rtl::OUStringToOString(aAltText, eEncoding)); rOStm << bActive; - write_lenPrefixed_uInt8s_FromOUString(rOStm, aTarget, eEncoding); + rOStm.WriteByteString(rtl::OUStringToOString(aTarget, eEncoding)); pCompat = new IMapCompat( rOStm, STREAM_WRITE ); WriteIMapObject( rOStm ); - aEventList.Write( rOStm ); // V4 - write_lenPrefixed_uInt8s_FromOUString(rOStm, aName, eEncoding); // V5 + aEventList.Write( rOStm ); // V4 + rOStm.WriteByteString(rtl::OUStringToOString(aName, eEncoding)); // V5 delete pCompat; } @@ -129,15 +129,16 @@ void IMapObject::Read( SvStream& rIStm, const String& rBaseURL ) { IMapCompat* pCompat; rtl_TextEncoding nTextEncoding; + ByteString aString; // Typ und Version ueberlesen wir rIStm.SeekRel( 2 ); rIStm >> nReadVersion; rIStm >> nTextEncoding; - aURL = read_lenPrefixed_uInt8s_ToOUString(rIStm, nTextEncoding); - aAltText = read_lenPrefixed_uInt8s_ToOUString(rIStm, nTextEncoding); + rIStm.ReadByteString( aString ); aURL = String( aString.GetBuffer(), nTextEncoding ); + rIStm.ReadByteString( aString ); aAltText = String( aString.GetBuffer(), nTextEncoding ); rIStm >> bActive; - aTarget = read_lenPrefixed_uInt8s_ToOUString(rIStm, nTextEncoding); + rIStm.ReadByteString( aString ); aTarget = String( aString.GetBuffer(), nTextEncoding ); // URL absolut machen aURL = URIHelper::SmartRel2Abs( INetURLObject(rBaseURL), aURL, URIHelper::GetMaybeFileHdl(), true, false, INetURLObject::WAS_ENCODED, INetURLObject::DECODE_UNAMBIGUOUS ); @@ -152,7 +153,9 @@ void IMapObject::Read( SvStream& rIStm, const String& rBaseURL ) // ab Version 5 kann ein Objektname vorhanden sein if ( nReadVersion >= 0x0005 ) - aName = read_lenPrefixed_uInt8s_ToOUString(rIStm, nTextEncoding); + { + rIStm.ReadByteString( aString ); aName = String( aString.GetBuffer(), nTextEncoding ); + } } delete pCompat; @@ -1114,19 +1117,20 @@ void ImageMap::Write( SvStream& rOStm, const String& rBaseURL ) const { IMapCompat* pCompat; String aImageName( GetName() ); + String aDummy; sal_uInt16 nOldFormat = rOStm.GetNumberFormatInt(); sal_uInt16 nCount = (sal_uInt16) GetIMapObjectCount(); - const rtl_TextEncoding eEncoding = osl_getThreadTextEncoding(); //vomit! + const rtl_TextEncoding eEncoding = osl_getThreadTextEncoding(); rOStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); // MagicCode schreiben rOStm << IMAPMAGIC; rOStm << GetVersion(); - write_lenPrefixed_uInt8s_FromOUString(rOStm, aImageName, eEncoding); - write_lenPrefixed_uInt8s_FromOString(rOStm, rtl::OString()); //dummy + rOStm.WriteByteString(rtl::OUStringToOString(aImageName, eEncoding)); + rOStm.WriteByteString(rtl::OUStringToOString(aDummy, eEncoding)); rOStm << nCount; - write_lenPrefixed_uInt8s_FromOUString(rOStm, aImageName, eEncoding); + rOStm.WriteByteString(rtl::OUStringToOString(aImageName, eEncoding)); pCompat = new IMapCompat( rOStm, STREAM_WRITE ); @@ -1148,6 +1152,7 @@ void ImageMap::Write( SvStream& rOStm, const String& rBaseURL ) const void ImageMap::Read( SvStream& rIStm, const String& rBaseURL ) { + ByteString aString; char cMagic[6]; sal_uInt16 nOldFormat = rIStm.GetNumberFormatInt(); sal_uInt16 nCount; @@ -1165,10 +1170,10 @@ void ImageMap::Read( SvStream& rIStm, const String& rBaseURL ) // Version ueberlesen wir rIStm.SeekRel( 2 ); - aName = read_lenPrefixed_uInt8s_ToOUString(rIStm, osl_getThreadTextEncoding()); - read_lenPrefixed_uInt8s_ToOString(rIStm); // Dummy + rIStm.ReadByteString( aString ); aName = String( aString, osl_getThreadTextEncoding() ); + rIStm.ReadByteString( aString ); // Dummy rIStm >> nCount; - read_lenPrefixed_uInt8s_ToOString(rIStm); // Dummy + rIStm.ReadByteString( aString ); // Dummy pCompat = new IMapCompat( rIStm, STREAM_READ ); diff --git a/svtools/source/urlobj/inetimg.cxx b/svtools/source/urlobj/inetimg.cxx index 8ed7996c16d0..fff9d170399a 100644 --- a/svtools/source/urlobj/inetimg.cxx +++ b/svtools/source/urlobj/inetimg.cxx @@ -73,7 +73,7 @@ sal_Bool INetImage::Read( SvStream& rIStm, sal_uLong nFormat ) { case SOT_FORMATSTR_ID_INET_IMAGE: { - String sINetImg = read_zeroTerminated_uInt8s_ToOUString(rIStm, RTL_TEXTENCODING_UTF8); + String sINetImg = read_zeroTerminated_uInt8s_AsOUString(rIStm, RTL_TEXTENCODING_UTF8); xub_StrLen nStart = 0; aImageURL = sINetImg.GetToken( 0, TOKEN_SEPARATOR, nStart ); aTargetURL = sINetImg.GetToken( 0, TOKEN_SEPARATOR, nStart ); @@ -119,11 +119,11 @@ sal_Bool INetImage::Read( SvStream& rIStm, sal_uLong nFormat ) // skip over iExtraHTML_Offset rIStm.SeekRel( sizeof( int ) ); - aImageURL = read_zeroTerminated_uInt8s_ToOUString(rIStm, eSysCSet); + aImageURL = read_zeroTerminated_uInt8s_AsOUString(rIStm, eSysCSet); if( nAltOffset ) { rIStm.Seek( nFilePos + nAltOffset ); - aAlternateText = read_zeroTerminated_uInt8s_ToOUString(rIStm, eSysCSet); + aAlternateText = read_zeroTerminated_uInt8s_AsOUString(rIStm, eSysCSet); } else if( aAlternateText.Len() ) aAlternateText.Erase(); @@ -131,7 +131,7 @@ sal_Bool INetImage::Read( SvStream& rIStm, sal_uLong nFormat ) if( nAnchorOffset ) { rIStm.Seek( nFilePos + nAnchorOffset ); - aTargetURL = read_zeroTerminated_uInt8s_ToOUString(rIStm, eSysCSet); + aTargetURL = read_zeroTerminated_uInt8s_AsOUString(rIStm, eSysCSet); } else if( aTargetURL.Len() ) aTargetURL.Erase(); diff --git a/svx/inc/svx/gallery1.hxx b/svx/inc/svx/gallery1.hxx index de6ebc684a32..aa5cc4aa0f8e 100644 --- a/svx/inc/svx/gallery1.hxx +++ b/svx/inc/svx/gallery1.hxx @@ -47,16 +47,16 @@ class GalleryThemeEntry { private: - rtl::OUString aName; + String aName; INetURLObject aThmURL; INetURLObject aSdgURL; INetURLObject aSdvURL; - sal_uInt32 nFileNumber; - sal_uInt32 nId; - sal_Bool bReadOnly; - sal_Bool bImported; - sal_Bool bModified; - sal_Bool bThemeNameFromResource; + sal_uInt32 nFileNumber; + sal_uInt32 nId; + sal_Bool bReadOnly; + sal_Bool bImported; + sal_Bool bModified; + sal_Bool bThemeNameFromResource; GalleryThemeEntry(); INetURLObject ImplGetURLIgnoreCase( const INetURLObject& rURL ) const; @@ -68,26 +68,26 @@ public: sal_Bool bNewFile, sal_uInt32 nId, sal_Bool bThemeNameFromResource ); ~GalleryThemeEntry() {}; - const rtl::OUString& GetThemeName() const { return aName; } - sal_uInt32 GetFileNumber() const { return nFileNumber; } + const String& GetThemeName() const { return aName; } + sal_uInt32 GetFileNumber() const { return nFileNumber; } const INetURLObject& GetThmURL() const { return aThmURL; } const INetURLObject& GetSdgURL() const { return aSdgURL; } const INetURLObject& GetSdvURL() const { return aSdvURL; } - sal_Bool IsImported() const { return bImported; } - sal_Bool IsReadOnly() const { return bReadOnly; } - sal_Bool IsDefault() const; + sal_Bool IsImported() const { return bImported; } + sal_Bool IsReadOnly() const { return bReadOnly; } + sal_Bool IsDefault() const; - sal_Bool IsHidden() const { return aName.matchAsciiL(RTL_CONSTASCII_STRINGPARAM("private://gallery/hidden/")); } + sal_Bool IsHidden() const { return aName.SearchAscii( "private://gallery/hidden/" ) == 0; } - sal_Bool IsModified() const { return bModified; } + sal_Bool IsModified() const { return bModified; } void SetModified( sal_Bool bSet ) { bModified = ( bSet && !IsImported() && !IsReadOnly() ); } - void SetName( const rtl::OUString& rNewName ); - sal_Bool IsNameFromResource() const { return bThemeNameFromResource; } + void SetName( const String& rNewName ); + sal_Bool IsNameFromResource() const { return bThemeNameFromResource; } - sal_uInt32 GetId() const { return nId; } + sal_uInt32 GetId() const { return nId; } void SetId( sal_uInt32 nNewId, sal_Bool bResetThemeName ); }; @@ -99,10 +99,10 @@ typedef ::std::vector< GalleryThemeEntry* > GalleryThemeList; struct GalleryImportThemeEntry { - rtl::OUString aThemeName; - rtl::OUString aUIName; - INetURLObject aURL; - rtl::OUString aImportName; + String aThemeName; + String aUIName; + INetURLObject aURL; + String aImportName; }; typedef ::std::vector< GalleryImportThemeEntry* > GalleryImportThemeList; @@ -144,9 +144,9 @@ private: void ImplLoadImports(); void ImplWriteImportList(); - SVX_DLLPUBLIC GalleryThemeEntry* ImplGetThemeEntry( const rtl::OUString& rThemeName ); + SVX_DLLPUBLIC GalleryThemeEntry* ImplGetThemeEntry( const String& rThemeName ); GalleryThemeEntry* ImplGetThemeEntry( sal_uIntPtr nThemeId ); - GalleryImportThemeEntry* ImplGetImportThemeEntry( const rtl::OUString& rImportName ); + GalleryImportThemeEntry* ImplGetImportThemeEntry( const String& rImportName ); GalleryTheme* ImplGetCachedTheme( const GalleryThemeEntry* pThemeEntry ); void ImplDeleteCachedTheme( GalleryTheme* pTheme ); @@ -164,7 +164,7 @@ public: const GalleryThemeEntry* GetThemeInfo( const String& rThemeName ) { return ImplGetThemeEntry( rThemeName ); } SVX_DLLPUBLIC sal_Bool HasTheme( const String& rThemeName ); - rtl::OUString GetThemeName( sal_uIntPtr nThemeId ) const; + String GetThemeName( sal_uIntPtr nThemeId ) const; SVX_DLLPUBLIC sal_Bool CreateTheme( const String& rThemeName, sal_uInt32 nNumFrom = 0 ); sal_Bool RenameTheme( const String& rOldName, const String& rNewName ); diff --git a/svx/inc/svx/galmisc.hxx b/svx/inc/svx/galmisc.hxx index 7f4563e89f7e..c7ed89c2f953 100644 --- a/svx/inc/svx/galmisc.hxx +++ b/svx/inc/svx/galmisc.hxx @@ -245,8 +245,8 @@ class GalleryHint : public SfxHint private: sal_uIntPtr mnType; - rtl::OUString maThemeName; - rtl::OUString maStringData; + String maThemeName; + String maStringData; sal_uIntPtr mnData1; sal_uIntPtr mnData2; @@ -258,11 +258,11 @@ public: GalleryHint( sal_uIntPtr nType, const String& rThemeName, const String& rStringData, sal_uIntPtr nData1 = 0UL, sal_uIntPtr nData2 = 0UL ) : mnType( nType ), maThemeName( rThemeName ), maStringData( rStringData ), mnData1( nData1 ), mnData2( nData2 ) {} - sal_uIntPtr GetType() const { return mnType; } - const rtl::OUString& GetThemeName() const { return maThemeName; } - const rtl::OUString& GetStringData() const { return maStringData; } - sal_uIntPtr GetData1() const { return mnData1; } - sal_uIntPtr GetData2() const { return mnData2; } + sal_uIntPtr GetType() const { return mnType; } + const String& GetThemeName() const { return maThemeName; } + const String& GetStringData() const { return maStringData; } + sal_uIntPtr GetData1() const { return mnData1; } + sal_uIntPtr GetData2() const { return mnData2; } }; #endif diff --git a/svx/inc/svx/galtheme.hxx b/svx/inc/svx/galtheme.hxx index 766bb449a78f..2bfdddf8ab4f 100644 --- a/svx/inc/svx/galtheme.hxx +++ b/svx/inc/svx/galtheme.hxx @@ -70,10 +70,10 @@ class ListBox; struct GalDragParams { - Region aDragRegion; - sal_uIntPtr nDragObjPos; - rtl::OUString aThemeName; - rtl::OUString aFileName; + Region aDragRegion; + sal_uIntPtr nDragObjPos; + String aThemeName; + String aFileName; SgaObjKind eObjKind; }; @@ -99,7 +99,7 @@ class GalleryTheme : public SfxBroadcaster private: GalleryObjectList aObjectList; - rtl::OUString aImportName; + String aImportName; String m_aDestDir; SotStorageRef aSvDrawStorageRef; Gallery* pParent; @@ -147,10 +147,10 @@ public: SVX_DLLPUBLIC bool RemoveObject( size_t nPos ); bool ChangeObjectPos( size_t nOldPos, size_t nNewPos ); - SVX_DLLPUBLIC const rtl::OUString& GetName() const; - const rtl::OUString& GetRealName() const; - const rtl::OUString& GetImportName() const { return aImportName; } - void SetImportName(const rtl::OUString& rImportName) { aImportName = rImportName; } + SVX_DLLPUBLIC const String& GetName() const; + const String& GetRealName() const; + const String& GetImportName() const { return aImportName; } + void SetImportName(const String& rImportName) { aImportName = rImportName; } const String& GetDestDir() const { return m_aDestDir; } void SetDestDir(const String& rDestDir) { m_aDestDir = rDestDir; } diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx index 9b7cfe2739e6..4c10186cac9b 100644 --- a/svx/source/gallery2/gallery1.cxx +++ b/svx/source/gallery2/gallery1.cxx @@ -78,7 +78,7 @@ GalleryThemeEntry::GalleryThemeEntry( const INetURLObject& rBaseURL, const Strin if( nId && bThemeNameFromResource ) aName = String( GAL_RESID( RID_GALLERYSTR_THEME_START + (sal_uInt16) nId ) ); - if( !aName.getLength() ) + if( !aName.Len() ) aName = rName; } @@ -107,7 +107,7 @@ INetURLObject GalleryThemeEntry::ImplGetURLIgnoreCase( const INetURLObject& rURL // ----------------------------------------------------------------------------- -void GalleryThemeEntry::SetName( const rtl::OUString& rNewName ) +void GalleryThemeEntry::SetName( const String& rNewName ) { if( aName != rNewName ) { @@ -132,12 +132,16 @@ void GalleryThemeEntry::SetId( sal_uInt32 nNewId, sal_Bool bResetThemeName ) SvStream& operator<<( SvStream& rOut, const GalleryImportThemeEntry& rEntry ) { - write_lenPrefixed_uInt8s_FromOUString(rOut, rEntry.aThemeName, RTL_TEXTENCODING_UTF8); - write_lenPrefixed_uInt8s_FromOUString(rOut, rEntry.aUIName, RTL_TEXTENCODING_UTF8); - write_lenPrefixed_uInt8s_FromOUString(rOut, (rEntry.aURL.GetMainURL( INetURLObject::NO_DECODE )), RTL_TEXTENCODING_UTF8); - write_lenPrefixed_uInt8s_FromOUString(rOut, rEntry.aImportName, RTL_TEXTENCODING_UTF8); + rOut.WriteByteString(rtl::OUStringToOString(rEntry.aThemeName, RTL_TEXTENCODING_UTF8)); + + rOut.WriteByteString(rtl::OUStringToOString(rEntry.aUIName, RTL_TEXTENCODING_UTF8)); + + rOut.WriteByteString(rtl::OUStringToOString(String(rEntry.aURL.GetMainURL( INetURLObject::NO_DECODE )), RTL_TEXTENCODING_UTF8)); + + rOut.WriteByteString(rtl::OUStringToOString(rEntry.aImportName, RTL_TEXTENCODING_UTF8)); + + rOut.WriteByteString(rtl::OUString()); - write_lenPrefixed_uInt8s_FromOString(rOut, rtl::OString()); return rOut; } @@ -145,11 +149,22 @@ SvStream& operator<<( SvStream& rOut, const GalleryImportThemeEntry& rEntry ) SvStream& operator>>( SvStream& rIn, GalleryImportThemeEntry& rEntry ) { - rEntry.aThemeName = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); - rEntry.aUIName = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); - rEntry.aURL = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); - rEntry.aImportName = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); - read_lenPrefixed_uInt8s_ToOString(rIn); + ByteString aTmpStr; + + rIn.ReadByteString(aTmpStr); + rEntry.aThemeName = String( aTmpStr, RTL_TEXTENCODING_UTF8 ); + + rIn.ReadByteString(aTmpStr); + rEntry.aUIName = String( aTmpStr, RTL_TEXTENCODING_UTF8 ); + + rIn.ReadByteString(aTmpStr); + rEntry.aURL = INetURLObject( String( aTmpStr, RTL_TEXTENCODING_UTF8 ) ); + + rIn.ReadByteString(aTmpStr); + rEntry.aImportName = String( aTmpStr, RTL_TEXTENCODING_UTF8 ); + + rIn.ReadByteString(aTmpStr); + return rIn; } @@ -532,23 +547,21 @@ void Gallery::ImplWriteImportList() // ------------------------------------------------------------------------ -GalleryThemeEntry* Gallery::ImplGetThemeEntry( const rtl::OUString& rThemeName ) +GalleryThemeEntry* Gallery::ImplGetThemeEntry( const String& rThemeName ) { GalleryThemeEntry* pFound = NULL; - if( rThemeName.getLength() ) - { + if( rThemeName.Len() ) for ( size_t i = 0, n = aThemeList.size(); i < n && !pFound; ++i ) if( rThemeName == aThemeList[ i ]->GetThemeName() ) pFound = aThemeList[ i ]; - } return pFound; } // ------------------------------------------------------------------------ -GalleryImportThemeEntry* Gallery::ImplGetImportThemeEntry( const rtl::OUString& rImportName ) +GalleryImportThemeEntry* Gallery::ImplGetImportThemeEntry( const String& rImportName ) { for ( size_t i = 0, n = aImportList.size(); i < n; ++i ) if ( rImportName == aImportList[ i ]->aUIName ) @@ -558,7 +571,7 @@ GalleryImportThemeEntry* Gallery::ImplGetImportThemeEntry( const rtl::OUString& // ------------------------------------------------------------------------ -rtl::OUString Gallery::GetThemeName( sal_uIntPtr nThemeId ) const +String Gallery::GetThemeName( sal_uIntPtr nThemeId ) const { GalleryThemeEntry* pFound = NULL; @@ -593,7 +606,7 @@ rtl::OUString Gallery::GetThemeName( sal_uIntPtr nThemeId ) const pFound = ( (Gallery*) this )->ImplGetThemeEntry( String::CreateFromAscii( aFallback.GetBuffer() ) ); } - return( pFound ? pFound->GetThemeName() : rtl::OUString() ); + return( pFound ? pFound->GetThemeName() : String() ); } // ------------------------------------------------------------------------ diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx index ddf56cbd7c01..1f03f1397b43 100644 --- a/svx/source/gallery2/galobj.cxx +++ b/svx/source/gallery2/galobj.cxx @@ -168,7 +168,7 @@ void SgaObject::WriteData( SvStream& rOut, const String& rDestDir ) const String aURLWithoutDestDir = String(aURL.GetMainURL( INetURLObject::NO_DECODE )); aURLWithoutDestDir.SearchAndReplace(rDestDir, String()); - write_lenPrefixed_uInt8s_FromOUString(rOut, aURLWithoutDestDir, RTL_TEXTENCODING_UTF8); + rOut.WriteByteString(rtl::OUStringToOString(aURLWithoutDestDir, RTL_TEXTENCODING_UTF8)); } // ------------------------------------------------------------------------ @@ -185,8 +185,9 @@ void SgaObject::ReadData(SvStream& rIn, sal_uInt16& rReadVersion ) else rIn >> aThumbMtf; - rtl::OUString aTmpStr = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); - aURL = INetURLObject(aTmpStr); + ByteString aTmpStr; + rIn.ReadByteString(aTmpStr); + aURL = INetURLObject(rtl::OStringToOUString(aTmpStr,RTL_TEXTENCODING_UTF8)); } // ------------------------------------------------------------------------ @@ -293,8 +294,9 @@ void SgaObjectBmp::WriteData( SvStream& rOut, const String& rDestDir ) const SgaObject::WriteData( rOut, rDestDir ); char aDummy[ 10 ]; rOut.Write( aDummy, 10 ); - write_lenPrefixed_uInt8s_FromOString(rOut, rtl::OString()); //dummy - write_lenPrefixed_uInt8s_FromOUString(rOut, aTitle, RTL_TEXTENCODING_UTF8); + String aDummyStr; + rOut.WriteByteString(rtl::OUStringToOString(aDummyStr, RTL_TEXTENCODING_UTF8)); + rOut.WriteByteString(rtl::OUStringToOString(aTitle, RTL_TEXTENCODING_UTF8)); } // ------------------------------------------------------------------------ @@ -304,10 +306,14 @@ void SgaObjectBmp::ReadData( SvStream& rIn, sal_uInt16& rReadVersion ) SgaObject::ReadData( rIn, rReadVersion ); rIn.SeekRel( 10 ); // 16, 16, 32, 16 - read_lenPrefixed_uInt8s_ToOString(rIn); //dummy + ByteString aTmpStr; + rIn.ReadByteString(aTmpStr); // dummy if( rReadVersion >= 5 ) - aTitle = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); + { + rIn.ReadByteString(aTmpStr); + aTitle = rtl::OStringToOUString(aTmpStr, RTL_TEXTENCODING_UTF8); + } } // ------------------ @@ -374,7 +380,7 @@ void SgaObjectSound::WriteData( SvStream& rOut, const String& rDestDir ) const { SgaObject::WriteData( rOut, rDestDir ); rOut << (sal_uInt16) eSoundType; - write_lenPrefixed_uInt8s_FromOUString(rOut, aTitle, RTL_TEXTENCODING_UTF8); + rOut.WriteByteString(rtl::OUStringToOString(aTitle, RTL_TEXTENCODING_UTF8)); } // ------------------------------------------------------------------------ @@ -390,7 +396,11 @@ void SgaObjectSound::ReadData( SvStream& rIn, sal_uInt16& rReadVersion ) rIn >> nTmp16; eSoundType = (GalSoundType) nTmp16; if( rReadVersion >= 6 ) - aTitle = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); + { + ByteString aTmpStr; + rIn.ReadByteString(aTmpStr); + aTitle = rtl::OStringToOUString(aTmpStr, RTL_TEXTENCODING_UTF8); + } } } @@ -581,7 +591,7 @@ sal_Bool SgaObjectSvDraw::DrawCentered( OutputDevice* pOut, const FmFormModel& r void SgaObjectSvDraw::WriteData( SvStream& rOut, const String& rDestDir ) const { SgaObject::WriteData( rOut, rDestDir ); - write_lenPrefixed_uInt8s_FromOUString(rOut, aTitle, RTL_TEXTENCODING_UTF8); + rOut.WriteByteString(rtl::OUStringToOString(aTitle, RTL_TEXTENCODING_UTF8)); } // ------------------------------------------------------------------------ @@ -591,7 +601,11 @@ void SgaObjectSvDraw::ReadData( SvStream& rIn, sal_uInt16& rReadVersion ) SgaObject::ReadData( rIn, rReadVersion ); if( rReadVersion >= 5 ) - aTitle = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); + { + ByteString aTmpStr; + rIn.ReadByteString(aTmpStr); + aTitle = rtl::OStringToOUString(aTmpStr, RTL_TEXTENCODING_UTF8); + } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index 4a34a85ee611..12f1e6d257ab 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -733,7 +733,8 @@ GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const INetURLObject& rURL, sa { sal_uInt32 nThemeId = 0; - rtl::OString aTmpStr = read_lenPrefixed_uInt8s_ToOString(*pIStm); + ByteString aTmpStr; + pIStm->ReadByteString(aTmpStr); aThemeName = rtl::OStringToOUString(aTmpStr, RTL_TEXTENCODING_UTF8); // Charakterkonvertierung durchfuehren @@ -1354,7 +1355,7 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const sal_Bool bRel; rOStm << (sal_uInt16) 0x0004; - write_lenPrefixed_uInt8s_FromOUString(rOStm, GetRealName(), RTL_TEXTENCODING_UTF8); + rOStm.WriteByteString(rtl::OUStringToOString(GetRealName(), RTL_TEXTENCODING_UTF8)); rOStm << nCount << (sal_uInt16) osl_getThreadTextEncoding(); for( sal_uInt32 i = 0; i < nCount; i++ ) @@ -1394,7 +1395,7 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const aPath.SearchAndReplace(m_aDestDir, String()); rOStm << bRel; - write_lenPrefixed_uInt8s_FromOUString(rOStm, aPath, RTL_TEXTENCODING_UTF8); + rOStm.WriteByteString(rtl::OUStringToOString(aPath, RTL_TEXTENCODING_UTF8)); rOStm << pObj->nOffset << (sal_uInt16) pObj->eObjKind; } @@ -1432,9 +1433,10 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm ) String aThemeName; rtl_TextEncoding nTextEncoding; - aImportName = rtl::OUString(); + aImportName = String(); rIStm >> nVersion; - rtl::OString aTmpStr = read_lenPrefixed_uInt8s_ToOString(rIStm); + ByteString aTmpStr; + rIStm.ReadByteString(aTmpStr); rIStm >> nCount; if( nVersion >= 0x0004 ) @@ -1469,12 +1471,13 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm ) { pObj = new GalleryObject; + ByteString aTempFileName; String aFileName; String aPath; sal_uInt16 nTemp; rIStm >> bRel; - rtl::OString aTempFileName = read_lenPrefixed_uInt8s_ToOString(rIStm); + rIStm.ReadByteString(aTempFileName); rIStm >> pObj->nOffset; rIStm >> nTemp; pObj->eObjKind = (SgaObjKind) nTemp; @@ -1580,7 +1583,7 @@ SvStream& operator>>( SvStream& rIn, GalleryTheme& rTheme ) void GalleryTheme::ImplSetModified( sal_Bool bModified ) { pThm->SetModified( bModified ); } -const rtl::OUString& GalleryTheme::GetRealName() const { return pThm->GetThemeName(); } +const String& GalleryTheme::GetRealName() const { return pThm->GetThemeName(); } const INetURLObject& GalleryTheme::GetThmURL() const { return pThm->GetThmURL(); } const INetURLObject& GalleryTheme::GetSdgURL() const { return pThm->GetSdgURL(); } const INetURLObject& GalleryTheme::GetSdvURL() const { return pThm->GetSdvURL(); } @@ -1591,7 +1594,7 @@ sal_Bool GalleryTheme::IsImported() const { return pThm->IsImported(); } sal_Bool GalleryTheme::IsReadOnly() const { return pThm->IsReadOnly(); } sal_Bool GalleryTheme::IsDefault() const { return pThm->IsDefault(); } sal_Bool GalleryTheme::IsModified() const { return pThm->IsModified(); } -const rtl::OUString& GalleryTheme::GetName() const { return IsImported() ? aImportName : pThm->GetThemeName(); } +const String& GalleryTheme::GetName() const { return IsImported() ? aImportName : pThm->GetThemeName(); } void GalleryTheme::InsertAllThemes( ListBox& rListBox ) { diff --git a/sw/source/filter/ww1/w1class.cxx b/sw/source/filter/ww1/w1class.cxx index a7e35cd65e41..3e5c3e6e0c25 100644 --- a/sw/source/filter/ww1/w1class.cxx +++ b/sw/source/filter/ww1/w1class.cxx @@ -85,7 +85,7 @@ String Ww1PlainText::GetText( sal_uLong ulOffset, sal_uLong nLen ) const bool bSeekOk = rFib.GetStream().Seek(nPos) == nPos; rtl::OString a8BitStr = bSeekOk ? - read_uInt8s_ToOString(rFib.GetStream(), nLen) : + read_uInt8s_AsOString(rFib.GetStream(), nLen) : rtl::OString(); return rtl::OStringToOUString(a8BitStr, RTL_TEXTENCODING_MS_1252); } diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 0ab1cf6e175a..99237686e660 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -281,7 +281,7 @@ bool Sttb::Read( SvStream& rS ) { SBBItem aItem; rS >> aItem.cchData; - aItem.data = read_LEuInt16s_ToOUString(rS, aItem.cchData); + aItem.data = read_LEuInt16s_AsOUString(rS, aItem.cchData); dataItems.push_back( aItem ); } } diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index b72fcd55ab51..c6702c55fc50 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -4334,7 +4334,7 @@ void WW8RStyle::ImportOldFormatStyles() } else // user style { - rtl::OString aTmp = read_uInt8s_ToOString(rSt, nCount); + rtl::OString aTmp = read_uInt8s_AsOString(rSt, nCount); nByteCount += aTmp.getLength(); sName = rtl::OStringToOUString(aTmp, eStructChrSet); } diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index 56981ace6280..56631b9bb225 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -1910,16 +1910,23 @@ Err: return false; } +String read_uInt8_PascalString(SvStream& rStrm, rtl_TextEncoding eEnc) +{ + sal_uInt8 nLen(0); + rStrm >> nLen; + return rtl::OStringToOUString(read_uInt8s_AsOString(rStrm, nLen), eEnc); +} + String read_LEuInt16_PascalString(SvStream& rStrm) { sal_uInt16 nLen(0); rStrm >> nLen; - return read_LEuInt16s_ToOUString(rStrm, nLen); + return read_LEuInt16s_AsOUString(rStrm, nLen); } String read_uInt8_BeltAndBracesString(SvStream& rStrm, rtl_TextEncoding eEnc) { - rtl::OUString aRet = read_lenPrefixed_uInt8s_ToOUString(rStrm, eEnc); + String aRet = read_uInt8_PascalString(rStrm, eEnc); rStrm.SeekRel(sizeof(sal_uInt8)); // skip null-byte at end return aRet; } @@ -1961,11 +1968,11 @@ xub_StrLen WW8ScannerBase::WW8ReadString( SvStream& rStrm, String& rStr, nLen = USHRT_MAX - 1; if( bIsUnicode ) - rStr.Append(String(read_LEuInt16s_ToOUString(rStrm, nLen))); + rStr.Append(String(read_LEuInt16s_AsOUString(rStrm, nLen))); else { // Alloc method automatically sets Zero at the end - rtl::OString aByteStr = read_uInt8s_ToOString(rStrm, nLen); + rtl::OString aByteStr = read_uInt8s_AsOString(rStrm, nLen); rStr.Append(String(rtl::OStringToOUString(aByteStr, eEnc))); } nTotalRead += nLen; @@ -3869,7 +3876,7 @@ void WW8ReadSTTBF(bool bVer8, SvStream& rStrm, sal_uInt32 nStart, sal_Int32 nLen { sal_uInt8 nBChar(0); rStrm >> nBChar; - rtl::OString aTmp = read_uInt8s_ToOString(rStrm, nBChar); + rtl::OString aTmp = read_uInt8s_AsOString(rStrm, nBChar); rArray.push_back(rtl::OStringToOUString(aTmp, eCS)); } @@ -3902,7 +3909,7 @@ void WW8ReadSTTBF(bool bVer8, SvStream& rStrm, sal_uInt32 nStart, sal_Int32 nLen { sal_uInt8 nBChar(0); rStrm >> nBChar; - rtl::OString aTmp = read_uInt8s_ToOString(rStrm, nBChar); + rtl::OString aTmp = read_uInt8s_AsOString(rStrm, nBChar); pValueArray->push_back(rtl::OStringToOUString(aTmp, eCS)); } } @@ -3928,7 +3935,7 @@ void WW8ReadSTTBF(bool bVer8, SvStream& rStrm, sal_uInt32 nStart, sal_Int32 nLen ++nRead; if (nBChar) { - rtl::OString aTmp = read_uInt8s_ToOString(rStrm, nBChar); + rtl::OString aTmp = read_uInt8s_AsOString(rStrm, nBChar); nRead += aTmp.getLength(); rArray.push_back(rtl::OStringToOUString(aTmp, eCS)); } diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx index 9cac3eb94c28..a323b84bae6e 100644 --- a/sw/source/filter/ww8/ww8scan.hxx +++ b/sw/source/filter/ww8/ww8scan.hxx @@ -136,10 +136,7 @@ public: //Read a Pascal-style, i.e. single byte string length followed //by string contents -inline String read_uInt8_PascalString(SvStream& rStrm, rtl_TextEncoding eEnc) -{ - return read_lenPrefixed_uInt8s_ToOUString(rStrm, eEnc); -} +String read_uInt8_PascalString(SvStream& rStrm, rtl_TextEncoding eEnc); String read_LEuInt16_PascalString(SvStream& rStrm); //Belt and Braces strings, i.e. Pascal-style strings followed by diff --git a/sw/source/filter/ww8/ww8toolbar.cxx b/sw/source/filter/ww8/ww8toolbar.cxx index 06cf7e707e2b..d615d860619c 100644 --- a/sw/source/filter/ww8/ww8toolbar.cxx +++ b/sw/source/filter/ww8/ww8toolbar.cxx @@ -1128,7 +1128,7 @@ bool TcgSttbfCore::Read( SvStream& rS ) for ( sal_Int32 index = 0; index < cData; ++index ) { rS >> dataItems[ index ].cchData; - dataItems[ index ].data = read_LEuInt16s_ToOUString(rS, dataItems[index].cchData); + dataItems[ index ].data = read_LEuInt16s_AsOUString(rS, dataItems[index].cchData); rS >> dataItems[ index ].extraData; } } diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx index 422e090b06e9..6f3905105b8b 100755 --- a/sw/source/ui/dochdl/swdtflvr.cxx +++ b/sw/source/ui/dochdl/swdtflvr.cxx @@ -1993,9 +1993,9 @@ int SwTransferable::_PasteDDE( TransferableDataHelper& rData, } // report useful error!! rtl_TextEncoding eEncoding = DDE_TXT_ENCODING; - aApp = read_zeroTerminated_uInt8s_ToOUString(*xStrm, eEncoding); - aTopic = read_zeroTerminated_uInt8s_ToOUString(*xStrm, eEncoding); - aItem = read_zeroTerminated_uInt8s_ToOUString(*xStrm, eEncoding); + aApp = read_zeroTerminated_uInt8s_AsOUString(*xStrm, eEncoding); + aTopic = read_zeroTerminated_uInt8s_AsOUString(*xStrm, eEncoding); + aItem = read_zeroTerminated_uInt8s_AsOUString(*xStrm, eEncoding); } String aCmd; diff --git a/tools/inc/tools/inetmsg.hxx b/tools/inc/tools/inetmsg.hxx index 7c88b9c3aa7a..610b804e7502 100644 --- a/tools/inc/tools/inetmsg.hxx +++ b/tools/inc/tools/inetmsg.hxx @@ -51,7 +51,7 @@ class INetMessageHeader ByteString m_aValue; public: - INetMessageHeader() + INetMessageHeader (void) {} INetMessageHeader ( @@ -64,7 +64,7 @@ public: : m_aName (rHdr.m_aName), m_aValue (rHdr.m_aValue) {} - ~INetMessageHeader() + ~INetMessageHeader (void) {} INetMessageHeader& operator= (const INetMessageHeader& rHdr) @@ -74,22 +74,22 @@ public: return *this; } - const ByteString& GetName() const { return m_aName; } - const ByteString& GetValue() const { return m_aValue; } + const ByteString& GetName (void) const { return m_aName; } + const ByteString& GetValue (void) const { return m_aValue; } friend SvStream& operator<< ( SvStream& rStrm, const INetMessageHeader& rHdr) { - write_lenPrefixed_uInt8s_FromOString(rStrm, rHdr.m_aName); - write_lenPrefixed_uInt8s_FromOString(rStrm, rHdr.m_aValue); + rStrm.WriteByteString (rHdr.m_aName); + rStrm.WriteByteString (rHdr.m_aValue); return rStrm; } friend SvStream& operator>> ( SvStream& rStrm, INetMessageHeader& rHdr) { - rHdr.m_aName = read_lenPrefixed_uInt8s_ToOString(rStrm); - rHdr.m_aValue = read_lenPrefixed_uInt8s_ToOString(rStrm); + rStrm.ReadByteString (rHdr.m_aName); + rStrm.ReadByteString (rHdr.m_aValue); return rStrm; } }; @@ -108,7 +108,7 @@ class INetMessage UniString m_aDocName; SvLockBytesRef m_xDocLB; - void ListCleanup_Impl(); + void ListCleanup_Impl (void); void ListCopy (const INetMessage& rMsg); protected: @@ -158,8 +158,8 @@ protected: virtual SvStream& operator>> (SvStream& rStrm); public: - INetMessage() : m_nDocSize(0) {} - virtual ~INetMessage(); + INetMessage (void) : m_nDocSize(0) {} + virtual ~INetMessage (void); INetMessage (const INetMessage& rMsg) : m_nDocSize (rMsg.m_nDocSize), @@ -178,7 +178,7 @@ public: return *this; } - sal_uIntPtr GetHeaderCount() const { return m_aHeaderList.size(); } + sal_uIntPtr GetHeaderCount (void) const { return m_aHeaderList.size(); } UniString GetHeaderName (sal_uIntPtr nIndex) const { @@ -204,13 +204,13 @@ public: sal_uIntPtr nIndex = ((sal_uIntPtr)-1) ); - sal_uIntPtr GetDocumentSize() const { return m_nDocSize; } + sal_uIntPtr GetDocumentSize (void) const { return m_nDocSize; } void SetDocumentSize (sal_uIntPtr nSize) { m_nDocSize = nSize; } - const UniString& GetDocumentName() const { return m_aDocName; } + const UniString& GetDocumentName (void) const { return m_aDocName; } void SetDocumentName (const UniString& rName) { m_aDocName = rName; } - SvLockBytes* GetDocumentLB() const { return m_xDocLB; } + SvLockBytes* GetDocumentLB (void) const { return m_xDocLB; } void SetDocumentLB (SvLockBytes *pDocLB) { m_xDocLB = pDocLB; } friend SvStream& operator<< ( @@ -260,9 +260,9 @@ protected: virtual SvStream& operator>> (SvStream& rStrm); public: - INetRFC822Message(); + INetRFC822Message (void); INetRFC822Message (const INetRFC822Message& rMsg); - virtual ~INetRFC822Message(); + virtual ~INetRFC822Message (void); INetRFC822Message& operator= (const INetRFC822Message& rMsg); @@ -277,105 +277,105 @@ public: /** Header fields. */ - UniString GetBCC() const + UniString GetBCC (void) const { return GetHeaderValue_Impl ( m_nIndex[INETMSG_RFC822_BCC], INetMIME::HEADER_FIELD_ADDRESS); } - UniString GetCC() const + UniString GetCC (void) const { return GetHeaderValue_Impl ( m_nIndex[INETMSG_RFC822_CC], INetMIME::HEADER_FIELD_ADDRESS); } - UniString GetComments() const + UniString GetComments (void) const { return GetHeaderValue_Impl ( m_nIndex[INETMSG_RFC822_COMMENTS], INetMIME::HEADER_FIELD_TEXT); } - UniString GetDate() const + UniString GetDate (void) const { return GetHeaderValue_Impl ( m_nIndex[INETMSG_RFC822_DATE], INetMIME::HEADER_FIELD_STRUCTURED); } - UniString GetFrom() const + UniString GetFrom (void) const { return GetHeaderValue_Impl ( m_nIndex[INETMSG_RFC822_FROM], INetMIME::HEADER_FIELD_ADDRESS); } - UniString GetInReplyTo() const + UniString GetInReplyTo (void) const { return GetHeaderValue_Impl ( m_nIndex[INETMSG_RFC822_IN_REPLY_TO], INetMIME::HEADER_FIELD_ADDRESS); // ??? MESSAGE_ID ??? } - UniString GetKeywords() const + UniString GetKeywords (void) const { return GetHeaderValue_Impl ( m_nIndex[INETMSG_RFC822_KEYWORDS], INetMIME::HEADER_FIELD_PHRASE); } - UniString GetMessageID() const + UniString GetMessageID (void) const { return GetHeaderValue_Impl ( m_nIndex[INETMSG_RFC822_MESSAGE_ID], INetMIME::HEADER_FIELD_MESSAGE_ID); } - UniString GetReferences() const + UniString GetReferences (void) const { return GetHeaderValue_Impl ( m_nIndex[INETMSG_RFC822_REFERENCES], INetMIME::HEADER_FIELD_ADDRESS); } - UniString GetReplyTo() const + UniString GetReplyTo (void) const { return GetHeaderValue_Impl ( m_nIndex[INETMSG_RFC822_REPLY_TO], INetMIME::HEADER_FIELD_ADDRESS); } - UniString GetReturnPath() const + UniString GetReturnPath (void) const { return GetHeaderValue_Impl ( m_nIndex[INETMSG_RFC822_RETURN_PATH], INetMIME::HEADER_FIELD_ADDRESS); } - UniString GetReturnReceiptTo() const + UniString GetReturnReceiptTo (void) const { return GetHeaderValue_Impl ( m_nIndex[INETMSG_RFC822_RETURN_RECEIPT_TO], INetMIME::HEADER_FIELD_ADDRESS); } - UniString GetSender() const + UniString GetSender (void) const { return GetHeaderValue_Impl ( m_nIndex[INETMSG_RFC822_SENDER], INetMIME::HEADER_FIELD_ADDRESS); } - UniString GetSubject() const + UniString GetSubject (void) const { return GetHeaderValue_Impl ( m_nIndex[INETMSG_RFC822_SUBJECT], INetMIME::HEADER_FIELD_TEXT); } - UniString GetTo() const + UniString GetTo (void) const { return GetHeaderValue_Impl ( m_nIndex[INETMSG_RFC822_TO], @@ -430,15 +430,15 @@ class TOOLS_DLLPUBLIC INetMIMEMessage : public INetRFC822Message INetMIMEMessage* pParent; INetMIMEMessgeList_impl aChildren; - rtl::OString m_aBoundary; + ByteString m_aBoundary; sal_Bool bHeaderParsed; friend class INetMIMEMessageStream; - const rtl::OString& GetMultipartBoundary() const { return m_aBoundary; } - void SetMultipartBoundary (const rtl::OString& rBnd) { m_aBoundary = rBnd; } + const ByteString& GetMultipartBoundary (void) const { return m_aBoundary; } + void SetMultipartBoundary (const ByteString& rBnd) { m_aBoundary = rBnd; } - void CleanupImp(); + void CleanupImp (void); void CopyImp (const INetMIMEMessage& rMsg); void SetHeaderParsed() { bHeaderParsed = sal_True; } @@ -447,9 +447,9 @@ protected: virtual SvStream& operator>> (SvStream& rStrm); public: - INetMIMEMessage(); + INetMIMEMessage (void); INetMIMEMessage (const INetMIMEMessage& rMsg); - virtual ~INetMIMEMessage(); + virtual ~INetMIMEMessage (void); INetMIMEMessage& operator= (const INetMIMEMessage& rMsg); @@ -467,35 +467,35 @@ public: /** Header fields. */ void SetMIMEVersion (const UniString& rVersion); - UniString GetMIMEVersion() const + UniString GetMIMEVersion (void) const { return GetHeaderValue (m_nIndex[INETMSG_MIME_VERSION]); } - UniString GetContentDescription() const + UniString GetContentDescription (void) const { return GetHeaderValue (m_nIndex[INETMSG_MIME_CONTENT_DESCRIPTION]); } void SetContentDisposition (const UniString& rDisposition); - UniString GetContentDisposition() const + UniString GetContentDisposition (void) const { return GetHeaderValue (m_nIndex[INETMSG_MIME_CONTENT_DISPOSITION]); } - UniString GetContentID() const + UniString GetContentID (void) const { return GetHeaderValue (m_nIndex[INETMSG_MIME_CONTENT_ID]); } void SetContentType (const UniString& rType); - UniString GetContentType() const + UniString GetContentType (void) const { return GetHeaderValue (m_nIndex[INETMSG_MIME_CONTENT_TYPE]); } void SetContentTransferEncoding (const UniString& rEncoding); - UniString GetContentTransferEncoding() const + UniString GetContentTransferEncoding (void) const { return GetHeaderValue (m_nIndex[INETMSG_MIME_CONTENT_TRANSFER_ENCODING]); } @@ -504,16 +504,16 @@ public: /** Message container methods. */ - sal_Bool IsContainer() const + sal_Bool IsContainer (void) const { return (IsMessage() || IsMultipart()); } - sal_Bool IsMessage() const + sal_Bool IsMessage (void) const { UniString aType (GetContentType()); return (aType.CompareIgnoreCaseToAscii("message/", 8) == 0); } - sal_Bool IsMultipart() const + sal_Bool IsMultipart (void) const { UniString aType (GetContentType()); return (aType.CompareIgnoreCaseToAscii("multipart/", 10) == 0); @@ -523,7 +523,7 @@ public: { return ( nIndex < aChildren.size() ) ? aChildren[ nIndex ] : NULL; } - INetMIMEMessage* GetParent() const { return pParent; } + INetMIMEMessage* GetParent (void) const { return pParent; } sal_Bool EnableAttachChild ( INetMessageContainerType eType = INETMSG_MULTIPART_MIXED); diff --git a/tools/inc/tools/stream.hxx b/tools/inc/tools/stream.hxx index e6e939bbbd1b..66312b76faaf 100644 --- a/tools/inc/tools/stream.hxx +++ b/tools/inc/tools/stream.hxx @@ -28,7 +28,6 @@ #ifndef _STREAM_HXX #define _STREAM_HXX -#include #include "tools/toolsdllapi.h" #include #include @@ -365,8 +364,10 @@ public: SvStream& ReadByteString( UniString& rStr, rtl_TextEncoding eSrcCharSet ); SvStream& ReadByteString( UniString& rStr ) { return ReadByteString( rStr, GetStreamCharSet() ); } + SvStream& ReadByteString( ByteString& rStr ); SvStream& WriteByteString( const UniString& rStr, rtl_TextEncoding eDestCharSet ); SvStream& WriteByteString( const UniString& rStr ) { return WriteByteString( rStr, GetStreamCharSet() ); } + SvStream& WriteByteString( const ByteString& rStr ); SvStream& WriteNumber( sal_uInt32 nUInt32 ); SvStream& WriteNumber( sal_Int32 nInt32 ); @@ -545,70 +546,22 @@ TOOLS_DLLPUBLIC SvStream& endlub( SvStream& rStr ); //Attempt to read nLen 8bit units to an OString, returned rtl::OString's length //is number of units successfully read -TOOLS_DLLPUBLIC rtl::OString read_uInt8s_ToOString(SvStream& rStrm, sal_Size nLen); +TOOLS_DLLPUBLIC rtl::OString read_uInt8s_AsOString(SvStream& rStr, sal_Size nLen); //Attempt to read nLen little endian 16bit units to an OUString, returned //rtl::OUString's length is number of units successfully read -TOOLS_DLLPUBLIC rtl::OUString read_LEuInt16s_ToOUString(SvStream& rStrm, sal_Size nLen); +TOOLS_DLLPUBLIC rtl::OUString read_LEuInt16s_AsOUString(SvStream& rStr, sal_Size nLen); //Attempt to read 8bit units to an OString until a zero terminator is //encountered, returned rtl::OString's length is number of units *definitely* //successfully read, check SvStream::good() to see if null terminator was //sucessfully read -TOOLS_DLLPUBLIC rtl::OString read_zeroTerminated_uInt8s_ToOString(SvStream& rStrm); +TOOLS_DLLPUBLIC rtl::OString read_zeroTerminated_uInt8s_AsOString(SvStream& rStr); //Attempt to read 8bit units assuming source encoding eEnc to an OUString until //a zero terminator is encountered. Check SvStream::good() to see if null //terminator was sucessfully read -TOOLS_DLLPUBLIC rtl::OUString read_zeroTerminated_uInt8s_ToOUString(SvStream& rStrm, rtl_TextEncoding eEnc); - -//Attempt to read a pascal-style length (of type prefix) prefixed sequence of -//8bit units to an OString, returned rtl::OString's length is number of units -//successfully read. -template rtl::OString read_lenPrefixed_uInt8s_ToOString(SvStream& rStrm) -{ - prefix nLen = 0; - rStrm >> nLen; - return read_uInt8s_ToOString(rStrm, nLen); -} - -//Attempt to read a pascal-style length (of type prefix) prefixed sequence of -//8bit units to an OUString -template rtl::OUString read_lenPrefixed_uInt8s_ToOUString(SvStream& rStrm, - rtl_TextEncoding eEnc) -{ - return rtl::OStringToOUString(read_lenPrefixed_uInt8s_ToOString(rStrm), eEnc); -} - -//Attempt to write a pascal-style length (of type prefix) prefixed sequence of -//8bit units from an OString, returned value is number of bytes written (including -//byte-count of prefix) -template sal_Size write_lenPrefixed_uInt8s_FromOString(SvStream& rStrm, - const rtl::OString &rStr) -{ - SAL_WARN_IF(rStr.getLength() > std::numeric_limits::max(), - "tools.stream", - "string too long for prefix count to fit in output type"); - - sal_Size nWritten = 0; - prefix nLen = std::min(rStr.getLength(), std::numeric_limits::max()); - rStrm << nLen; - if (rStrm.good()) - { - nWritten += sizeof(prefix); - nWritten += rStrm.Write(rStr.getStr(), nLen); - } - return nWritten; -} - -//Attempt to write a pascal-style length (of type prefix) prefixed sequence of -//8bit units from an OUString, returned value is number of bytes written (including -//byte-count of prefix) -template sal_Size write_lenPrefixed_uInt8s_FromOUString(SvStream& rStrm, - const rtl::OUString &rStr, rtl_TextEncoding eEnc) -{ - return write_lenPrefixed_uInt8s_FromOString(rStrm, rtl::OUStringToOString(rStr, eEnc)); -} +TOOLS_DLLPUBLIC rtl::OUString read_zeroTerminated_uInt8s_AsOUString(SvStream& rStr, rtl_TextEncoding eEnc); // -------------- // - FileStream - diff --git a/tools/qa/cppunit/test_stream.cxx b/tools/qa/cppunit/test_stream.cxx index 3e7580f40377..77c2b9ed75ae 100644 --- a/tools/qa/cppunit/test_stream.cxx +++ b/tools/qa/cppunit/test_stream.cxx @@ -47,13 +47,11 @@ namespace void test_stdstream(); void test_fastostring(); void test_read_cstring(); - void test_read_pstring(); CPPUNIT_TEST_SUITE(Test); CPPUNIT_TEST(test_stdstream); CPPUNIT_TEST(test_fastostring); CPPUNIT_TEST(test_read_cstring); - CPPUNIT_TEST(test_read_pstring); CPPUNIT_TEST_SUITE_END(); }; @@ -69,7 +67,7 @@ namespace char tools_a(78); aMemStream >> tools_a; - CPPUNIT_ASSERT(tools_a == 'f'); + CPPUNIT_ASSERT(std_a == 'f'); iss.seekg(0, std::ios_base::end); //seeking to end doesn't set eof, reading past eof does @@ -100,7 +98,7 @@ namespace //a failed read doesn't change the data, it remains unchanged CPPUNIT_ASSERT(tools_a == 78); //nothing wrong with the stream, so not bad - CPPUNIT_ASSERT(!aMemStream.bad()); + CPPUNIT_ASSERT(!aMemStream.GetError()); //yet, the read didn't succeed CPPUNIT_ASSERT(!aMemStream.good()); @@ -135,18 +133,18 @@ namespace char foo[] = "foobar"; SvMemoryStream aMemStream(RTL_CONSTASCII_STRINGPARAM(foo), STREAM_READ); - rtl::OString aOne = read_uInt8s_ToOString(aMemStream, 3); + rtl::OString aOne = read_uInt8s_AsOString(aMemStream, 3); CPPUNIT_ASSERT(aOne.equalsL(RTL_CONSTASCII_STRINGPARAM("foo"))); - rtl::OString aTwo = read_uInt8s_ToOString(aMemStream, 3); + rtl::OString aTwo = read_uInt8s_AsOString(aMemStream, 3); CPPUNIT_ASSERT(aTwo.equalsL(RTL_CONSTASCII_STRINGPARAM("bar"))); - rtl::OString aThree = read_uInt8s_ToOString(aMemStream, 3); + rtl::OString aThree = read_uInt8s_AsOString(aMemStream, 3); CPPUNIT_ASSERT(!aThree.getLength()); aMemStream.Seek(0); - rtl::OString aFour = read_uInt8s_ToOString(aMemStream, 100); + rtl::OString aFour = read_uInt8s_AsOString(aMemStream, 100); CPPUNIT_ASSERT(aFour.equalsL(RTL_CONSTASCII_STRINGPARAM(foo))); } @@ -155,7 +153,7 @@ namespace char foo[] = "foobar"; SvMemoryStream aMemStream(RTL_CONSTASCII_STRINGPARAM(foo), STREAM_READ); - rtl::OString aOne = read_zeroTerminated_uInt8s_ToOString(aMemStream); + rtl::OString aOne = read_zeroTerminated_uInt8s_AsOString(aMemStream); CPPUNIT_ASSERT(aOne.equalsL(RTL_CONSTASCII_STRINGPARAM("foobar"))); CPPUNIT_ASSERT(!aMemStream.good()); CPPUNIT_ASSERT(!aMemStream.bad()); @@ -163,52 +161,11 @@ namespace aMemStream.Seek(0); foo[3] = 0; - rtl::OString aTwo = read_zeroTerminated_uInt8s_ToOString(aMemStream); + rtl::OString aTwo = read_zeroTerminated_uInt8s_AsOString(aMemStream); CPPUNIT_ASSERT(aTwo.equalsL(RTL_CONSTASCII_STRINGPARAM("foo"))); CPPUNIT_ASSERT(aMemStream.good()); } - void Test::test_read_pstring() - { - char foo[] = "\3foobar"; - SvMemoryStream aMemStream(RTL_CONSTASCII_STRINGPARAM(foo), STREAM_READ); - - rtl::OString aFoo = read_lenPrefixed_uInt8s_ToOString(aMemStream); - CPPUNIT_ASSERT(aFoo.equalsL(RTL_CONSTASCII_STRINGPARAM("foo"))); - CPPUNIT_ASSERT(aMemStream.good()); - CPPUNIT_ASSERT(!aMemStream.bad()); - CPPUNIT_ASSERT(!aMemStream.eof()); - - aMemStream.Seek(0); - foo[0] = 10; - aFoo = read_lenPrefixed_uInt8s_ToOString(aMemStream); - CPPUNIT_ASSERT(aFoo.equalsL(RTL_CONSTASCII_STRINGPARAM("foobar"))); - CPPUNIT_ASSERT(!aMemStream.good()); - CPPUNIT_ASSERT(!aMemStream.bad()); - CPPUNIT_ASSERT(aMemStream.eof()); - - aMemStream.SetNumberFormatInt(NUMBERFORMAT_INT_BIGENDIAN); - aMemStream.Seek(0); - foo[0] = 0; - foo[1] = 3; - aFoo = read_lenPrefixed_uInt8s_ToOString(aMemStream); - CPPUNIT_ASSERT(aFoo.equalsL(RTL_CONSTASCII_STRINGPARAM("oob"))); - CPPUNIT_ASSERT(aMemStream.good()); - CPPUNIT_ASSERT(!aMemStream.bad()); - CPPUNIT_ASSERT(!aMemStream.eof()); - - aMemStream.SetNumberFormatInt(NUMBERFORMAT_INT_LITTLEENDIAN); - aMemStream.Seek(0); - foo[0] = 3; - foo[1] = 0; - foo[2] = 0; - foo[3] = 0; - aFoo = read_lenPrefixed_uInt8s_ToOString(aMemStream); - CPPUNIT_ASSERT(aFoo.equalsL(RTL_CONSTASCII_STRINGPARAM("bar"))); - CPPUNIT_ASSERT(aMemStream.good()); - CPPUNIT_ASSERT(!aMemStream.bad()); - CPPUNIT_ASSERT(!aMemStream.eof()); - } CPPUNIT_TEST_SUITE_REGISTRATION(Test); } diff --git a/tools/source/inet/inetmsg.cxx b/tools/source/inet/inetmsg.cxx index f626dcccd508..f5fa071ad15a 100644 --- a/tools/source/inet/inetmsg.cxx +++ b/tools/source/inet/inetmsg.cxx @@ -66,7 +66,7 @@ inline sal_Unicode ascii_toLowerCase( sal_Unicode ch ) /* * ~INetMessage. */ -INetMessage::~INetMessage() +INetMessage::~INetMessage (void) { ListCleanup_Impl(); } @@ -74,7 +74,7 @@ INetMessage::~INetMessage() /* * ListCleanup_Impl. */ -void INetMessage::ListCleanup_Impl() +void INetMessage::ListCleanup_Impl (void) { // Cleanup. sal_uIntPtr i, n = m_aHeaderList.size(); @@ -243,7 +243,7 @@ enum _ImplINetRFC822MessageHeaderState /* * INetRFC822Message. */ -INetRFC822Message::INetRFC822Message() +INetRFC822Message::INetRFC822Message (void) : INetMessage() { for (sal_uInt16 i = 0; i < INETMSG_RFC822_NUMHDR; i++) @@ -275,7 +275,7 @@ INetRFC822Message& INetRFC822Message::operator= (const INetRFC822Message& rMsg) /* * ~INetRFC822Message. */ -INetRFC822Message::~INetRFC822Message() +INetRFC822Message::~INetRFC822Message (void) { } @@ -753,7 +753,7 @@ enum _ImplINetMIMEMessageHeaderState /* * INetMIMEMessage. */ -INetMIMEMessage::INetMIMEMessage() +INetMIMEMessage::INetMIMEMessage (void) : INetRFC822Message (), pParent (NULL), bHeaderParsed (sal_False) @@ -792,7 +792,7 @@ INetMIMEMessage& INetMIMEMessage::operator= ( /* * ~INetMIMEMessage. */ -INetMIMEMessage::~INetMIMEMessage() +INetMIMEMessage::~INetMIMEMessage (void) { // Cleanup. CleanupImp(); @@ -801,7 +801,7 @@ INetMIMEMessage::~INetMIMEMessage() /* * CleanupImp. */ -void INetMIMEMessage::CleanupImp() +void INetMIMEMessage::CleanupImp (void) { for( size_t i = 0, n = aChildren.size(); i < n; ++i ) { delete aChildren[ i ]; @@ -1161,7 +1161,7 @@ SvStream& INetMIMEMessage::operator<< (SvStream& rStrm) const for (sal_uInt16 i = 0; i < INETMSG_MIME_NUMHDR; i++) rStrm << static_cast(m_nIndex[i]); - write_lenPrefixed_uInt8s_FromOString(rStrm, m_aBoundary); + rStrm.WriteByteString (m_aBoundary); rStrm << static_cast(aChildren.size()); return rStrm; @@ -1181,7 +1181,7 @@ SvStream& INetMIMEMessage::operator>> (SvStream& rStrm) m_nIndex[i] = nTemp; } - m_aBoundary = read_lenPrefixed_uInt8s_ToOString(rStrm); + rStrm.ReadByteString (m_aBoundary); rStrm >> nTemp; diff --git a/tools/source/inet/inetstrm.cxx b/tools/source/inet/inetstrm.cxx index 5345067aa0f8..d70d84d2c30c 100644 --- a/tools/source/inet/inetstrm.cxx +++ b/tools/source/inet/inetstrm.cxx @@ -1608,7 +1608,7 @@ int INetMIMEMessageStream::PutMsgLine (const sal_Char *pData, sal_uIntPtr nSize) // Multipart message body. Initialize multipart delimiters. // Multipart message. - if (pMsg->GetMultipartBoundary().getLength() == 0) + if (pMsg->GetMultipartBoundary().Len() == 0) { // Determine boundary. rtl::OString aType(rtl::OUStringToOString( diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx index b70195978008..5fa5b0e43380 100644 --- a/tools/source/stream/stream.cxx +++ b/tools/source/stream/stream.cxx @@ -806,7 +806,7 @@ sal_Bool SvStream::ReadUniOrByteStringLine( String& rStr, rtl_TextEncoding eSrcC return ReadByteStringLine( rStr, eSrcCharSet ); } -rtl::OString read_zeroTerminated_uInt8s_ToOString(SvStream& rStream) +rtl::OString read_zeroTerminated_uInt8s_AsOString(SvStream& rStream) { rtl::OStringBuffer aOutput; @@ -839,10 +839,10 @@ rtl::OString read_zeroTerminated_uInt8s_ToOString(SvStream& rStream) return aOutput.makeStringAndClear(); } -rtl::OUString read_zeroTerminated_uInt8s_ToOUString(SvStream& rStream, rtl_TextEncoding eEnc) +rtl::OUString read_zeroTerminated_uInt8s_AsOUString(SvStream& rStream, rtl_TextEncoding eEnc) { return rtl::OStringToOUString( - read_zeroTerminated_uInt8s_ToOString(rStream), eEnc); + read_zeroTerminated_uInt8s_AsOString(rStream), eEnc); } /************************************************************************* @@ -1517,7 +1517,19 @@ SvStream& SvStream::ReadByteString( UniString& rStr, rtl_TextEncoding eSrcCharSe return *this; } - rStr = read_lenPrefixed_uInt8s_ToOUString(*this, eSrcCharSet); + ByteString aStr; + ReadByteString( aStr ); + rStr = UniString( aStr, eSrcCharSet ); + return *this; +} + +// ----------------------------------------------------------------------- + +SvStream& SvStream::ReadByteString( ByteString& rStr ) +{ + sal_uInt16 nLen = 0; + operator>>( nLen ); + rStr = read_uInt8s_AsOString(*this, nLen); return *this; } @@ -1551,7 +1563,17 @@ SvStream& SvStream::WriteByteString( const UniString& rStr, rtl_TextEncoding eDe return *this; } - write_lenPrefixed_uInt8s_FromOUString(*this, rStr, eDestCharSet); + return WriteByteString(rtl::OUStringToOString(rStr, eDestCharSet)); +} + +// ----------------------------------------------------------------------- + +SvStream& SvStream::WriteByteString( const ByteString& rStr) +{ + sal_uInt16 nLen = rStr.Len(); + operator<< ( nLen ); + if( nLen != 0 ) + Write( rStr.GetBuffer(), nLen ); return *this; } @@ -2432,7 +2454,7 @@ void SvDataCopyStream::Assign( const SvDataCopyStream& ) } //Create a OString of nLen bytes from rStream -rtl::OString read_uInt8s_ToOString(SvStream& rStrm, sal_Size nLen) +rtl::OString read_uInt8s_AsOString(SvStream& rStrm, sal_Size nLen) { using comphelper::string::rtl_string_alloc; @@ -2459,7 +2481,7 @@ rtl::OString read_uInt8s_ToOString(SvStream& rStrm, sal_Size nLen) } //Create a OUString of nLen little endian sal_Unicodes from rStream -rtl::OUString read_LEuInt16s_ToOUString(SvStream& rStrm, sal_Size nLen) +rtl::OUString read_LEuInt16s_AsOUString(SvStream& rStrm, sal_Size nLen) { using comphelper::string::rtl_uString_alloc; diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx index 636df96a6c66..30a23372661c 100644 --- a/vcl/source/gdi/animate.cxx +++ b/vcl/source/gdi/animate.cxx @@ -795,6 +795,7 @@ SvStream& operator<<( SvStream& rOStm, const Animation& rAnimation ) if( nCount ) { + const ByteString aDummyStr; const sal_uInt32 nDummy32 = 0UL; // Falls keine BitmapEx gesetzt wurde, schreiben wir @@ -824,7 +825,7 @@ SvStream& operator<<( SvStream& rOStm, const Animation& rAnimation ) rOStm << nDummy32; // unbenutzt rOStm << nDummy32; // unbenutzt rOStm << nDummy32; // unbenutzt - write_lenPrefixed_uInt8s_FromOString(rOStm, rtl::OString()); // dummy + rOStm.WriteByteString(aDummyStr); // unbenutzt rOStm << nRest; // Anzahl der Strukturen, die noch _folgen_ } } @@ -871,6 +872,7 @@ SvStream& operator>>( SvStream& rIStm, Animation& rAnimation ) { AnimationBitmap aAnimBmp; BitmapEx aBmpEx; + ByteString aDummyStr; sal_uInt32 nTmp32; sal_uInt16 nTmp16; sal_uInt8 cTmp; @@ -888,7 +890,7 @@ SvStream& operator>>( SvStream& rIStm, Animation& rAnimation ) rIStm >> nTmp32; // unbenutzt rIStm >> nTmp32; // unbenutzt rIStm >> nTmp32; // unbenutzt - read_lenPrefixed_uInt8s_ToOString(rIStm); // unbenutzt + rIStm.ReadByteString(aDummyStr); // unbenutzt rIStm >> nTmp16; // Rest zu lesen rAnimation.Insert( aAnimBmp ); diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx index 738a5907172b..7efd1f6f6e82 100644 --- a/vcl/source/gdi/cvtsvm.cxx +++ b/vcl/source/gdi/cvtsvm.cxx @@ -877,7 +877,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) rIStm >> aPt >> nIndex >> nLen >> nTmp; if ( nTmp && ( static_cast< sal_uInt32 >( nTmp ) < ( SAL_MAX_UINT16 - 1 ) ) ) { - rtl::OString aByteStr = read_uInt8s_ToOString(rIStm, nTmp); + rtl::OString aByteStr = read_uInt8s_AsOString(rIStm, nTmp); sal_uInt8 nTerminator = 0; rIStm >> nTerminator; DBG_ASSERT( nTerminator == 0, "expected string to be NULL terminated" ); @@ -899,7 +899,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) rIStm >> aPt >> nIndex >> nLen >> nTmp >> nAryLen; if ( nTmp && ( static_cast< sal_uInt32 >( nTmp ) < ( SAL_MAX_UINT16 - 1 ) ) ) { - rtl::OString aByteStr = read_uInt8s_ToOString(rIStm, nTmp); + rtl::OString aByteStr = read_uInt8s_AsOString(rIStm, nTmp); sal_uInt8 nTerminator = 0; rIStm >> nTerminator; DBG_ASSERT( nTerminator == 0, "expected string to be NULL terminated" ); @@ -962,7 +962,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) rIStm >> aPt >> nIndex >> nLen >> nTmp >> nWidth; if ( nTmp && ( static_cast< sal_uInt32 >( nTmp ) < ( SAL_MAX_INT16 - 1 ) ) ) { - rtl::OString aByteStr = read_uInt8s_ToOString(rIStm, nTmp); + rtl::OString aByteStr = read_uInt8s_AsOString(rIStm, nTmp); sal_uInt8 nTerminator = 0; rIStm >> nTerminator; DBG_ASSERT( nTerminator == 0, "expected string to be NULL terminated" ); @@ -1322,12 +1322,13 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) case( GDI_COMMENT_COMMENT ): { + ByteString aComment; sal_Int32 nValue; sal_uInt32 nDataSize; sal_uInt8* pData; sal_Int32 nFollowingActionCount; - rtl::OString aComment = read_lenPrefixed_uInt8s_ToOString(rIStm); + rIStm.ReadByteString(aComment); rIStm >> nValue >> nDataSize; if( nDataSize ) @@ -2412,7 +2413,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, rOStm.SeekRel( 4 ); // write data - write_lenPrefixed_uInt8s_FromOString(rOStm, pA->GetComment()); + rOStm.WriteByteString(pA->GetComment()); rOStm << pA->GetValue() << nDataSize; if( nDataSize ) diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx index 796659cfdaa5..14b86b236068 100644 --- a/vcl/source/gdi/jobset.cxx +++ b/vcl/source/gdi/jobset.cxx @@ -410,21 +410,13 @@ SvStream& operator<<( SvStream& rOStream, const JobSetup& rJobSetup ) rOStream.WriteByteString( it->first, RTL_TEXTENCODING_UTF8 ); rOStream.WriteByteString( it->second, RTL_TEXTENCODING_UTF8 ); } - write_lenPrefixed_uInt8s_FromOString(rOStream, "COMPAT_DUPLEX_MODE"); + rOStream.WriteByteString( "COMPAT_DUPLEX_MODE" ) ; switch( pJobData->meDuplexMode ) { - case DUPLEX_UNKNOWN: - write_lenPrefixed_uInt8s_FromOString(rOStream, "DUPLEX_UNKNOWN"); - break; - case DUPLEX_OFF: - write_lenPrefixed_uInt8s_FromOString(rOStream, "DUPLEX_OFF"); - break; - case DUPLEX_SHORTEDGE: - write_lenPrefixed_uInt8s_FromOString(rOStream, "DUPLEX_SHORTEDGE"); - break; - case DUPLEX_LONGEDGE: - write_lenPrefixed_uInt8s_FromOString(rOStream, "DUPLEX_LONGEDGE"); - break; + case DUPLEX_UNKNOWN: rOStream.WriteByteString( "DUPLEX_UNKNOWN" );break; + case DUPLEX_OFF: rOStream.WriteByteString( "DUPLEX_OFF" );break; + case DUPLEX_SHORTEDGE: rOStream.WriteByteString( "DUPLEX_SHORTEDGE" );break; + case DUPLEX_LONGEDGE: rOStream.WriteByteString( "DUPLEX_LONGEDGE" );break; } nLen = sal::static_int_cast(rOStream.Tell() - nPos); rOStream.Seek( nPos ); diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx index 9961705cbb6c..a0b6c3b27c6b 100644 --- a/vcl/source/gdi/metaact.cxx +++ b/vcl/source/gdi/metaact.cxx @@ -4198,7 +4198,7 @@ sal_Bool MetaCommentAction::Compare( const MetaAction& rMetaAction ) const void MetaCommentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); - write_lenPrefixed_uInt8s_FromOString(rOStm, maComment); + rOStm.WriteByteString(maComment); rOStm << mnValue << mnDataSize; if ( mnDataSize ) @@ -4210,10 +4210,13 @@ void MetaCommentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) void MetaCommentAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); - maComment = read_lenPrefixed_uInt8s_ToOString(rIStm); + ByteString sTmp; + rIStm.ReadByteString(sTmp); + maComment = sTmp; rIStm >> mnValue >> mnDataSize; - delete[] mpData; + if( mpData ) + delete[] mpData; if( mnDataSize ) { -- cgit v1.2.3 From c4f0efc2378cebc3b581bc949da70a2b2f149961 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 21 Dec 2011 10:44:56 +0000 Subject: convert ReadByteString/WriteByteString from ByteString to OString Nobody ever used the return values anyway, so for reading just return the string and for writing the number of bytes written Doesn't need to be members, make standalone functions Rename to read_lenPrefixed_uInt8s_ToO[U]String and write_lenPrefixed_uInt8s_FromO[U]String, lengthy, but much less unambiguous, seeing as a lot of users of it don't seem to be aware that they read/write pascal-style length prefixed strings, which isn't surprising given the apparent simplicity of their original name. added a unit test --- basic/source/runtime/iosys.cxx | 2 +- connectivity/source/drivers/dbase/DTable.cxx | 2 +- connectivity/source/drivers/dbase/dindexnode.cxx | 2 +- editeng/source/editeng/editobj.cxx | 9 +-- filter/source/msfilter/mstoolbar.cxx | 2 +- idl/source/objects/bastype.cxx | 8 +- idl/source/objects/module.cxx | 12 +-- idl/source/objects/object.cxx | 4 +- idl/source/objects/types.cxx | 8 +- sc/source/filter/ftools/ftools.cxx | 6 +- sc/source/filter/inc/ftools.hxx | 6 +- sc/source/filter/lotus/lotform.cxx | 6 +- sc/source/filter/qpro/qproform.cxx | 2 +- sc/source/ui/unoobj/scdetect.cxx | 2 +- sd/source/filter/eppt/epptso.cxx | 2 +- sfx2/source/bastyp/sfxhtml.cxx | 2 +- sot/source/sdstor/ucbstorage.cxx | 3 +- svl/source/items/cntwall.cxx | 3 +- svl/source/numbers/zformat.cxx | 3 +- svtools/source/filter/igif/gifread.cxx | 4 +- svtools/source/graphic/grfmgr.cxx | 7 +- svtools/source/misc/imap.cxx | 37 ++++----- svtools/source/urlobj/inetimg.cxx | 8 +- svx/inc/svx/gallery1.hxx | 48 ++++++------ svx/inc/svx/galmisc.hxx | 14 ++-- svx/inc/svx/galtheme.hxx | 18 ++--- svx/source/gallery2/gallery1.cxx | 51 +++++-------- svx/source/gallery2/galobj.cxx | 36 +++------ svx/source/gallery2/galtheme.cxx | 19 ++--- sw/source/filter/ww1/w1class.cxx | 2 +- sw/source/filter/ww8/ww8par.cxx | 2 +- sw/source/filter/ww8/ww8par2.cxx | 2 +- sw/source/filter/ww8/ww8scan.cxx | 21 ++---- sw/source/filter/ww8/ww8scan.hxx | 5 +- sw/source/filter/ww8/ww8toolbar.cxx | 2 +- sw/source/ui/dochdl/swdtflvr.cxx | 6 +- tools/inc/tools/inetmsg.hxx | 96 ++++++++++++------------ tools/inc/tools/stream.hxx | 59 +++++++++++++-- tools/qa/cppunit/test_stream.cxx | 59 +++++++++++++-- tools/source/inet/inetmsg.cxx | 18 ++--- tools/source/inet/inetstrm.cxx | 2 +- tools/source/stream/stream.cxx | 36 ++------- vcl/source/gdi/animate.cxx | 6 +- vcl/source/gdi/cvtsvm.cxx | 11 ++- vcl/source/gdi/jobset.cxx | 18 +++-- vcl/source/gdi/metaact.cxx | 9 +-- 46 files changed, 353 insertions(+), 327 deletions(-) (limited to 'sd') diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx index a2fe3bd9a096..1a63f943d5a7 100644 --- a/basic/source/runtime/iosys.cxx +++ b/basic/source/runtime/iosys.cxx @@ -656,7 +656,7 @@ SbError SbiStream::Read( ByteString& rBuf, sal_uInt16 n, bool bForceReadingPerBy n = nLen; if( !n ) return nError = SbERR_BAD_RECORD_LENGTH; - rtl::OStringBuffer aBuffer(read_uInt8s_AsOString(*pStrm, n)); + rtl::OStringBuffer aBuffer(read_uInt8s_ToOString(*pStrm, n)); //Pad it out with ' ' to the requested length on short read sal_Int32 nRequested = sal::static_int_cast(n); comphelper::string::padToLength(aBuffer, nRequested, ' '); diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index fc5afcd3d354..cfabfbff4b0d 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -2739,7 +2739,7 @@ sal_Bool ODbaseTable::ReadMemo(sal_uIntPtr nBlockNo, ORowSetValue& aVariable) { if ( bIsText ) { - rtl::OStringBuffer aBuffer(read_uInt8s_AsOString(*m_pMemoStream, nLength)); + rtl::OStringBuffer aBuffer(read_uInt8s_ToOString(*m_pMemoStream, nLength)); //pad it out with ' ' to expected length on short read sal_Int32 nRequested = sal::static_int_cast(nLength); comphelper::string::padToLength(aBuffer, nRequested, ' '); diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx index 111745794750..046b457ab808 100644 --- a/connectivity/source/drivers/dbase/dindexnode.cxx +++ b/connectivity/source/drivers/dbase/dindexnode.cxx @@ -673,7 +673,7 @@ void ONDXNode::Read(SvStream &rStream, ODbaseIndex& rIndex) else { sal_uInt16 nLen = rIndex.getHeader().db_keylen; - rtl::OString aBuf = read_uInt8s_AsOString(rStream, nLen); + rtl::OString aBuf = read_uInt8s_ToOString(rStream, nLen); //get length minus trailing whitespace sal_Int32 nContentLen = aBuf.getLength(); while (nContentLen && aBuf[nContentLen-1] == ' ') diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx index 678f31abad56..0fd144b42514 100644 --- a/editeng/source/editeng/editobj.cxx +++ b/editeng/source/editeng/editobj.cxx @@ -1131,10 +1131,10 @@ void BinTextObject::StoreData( SvStream& rOStream ) const // Convert CH_FEATURE to CH_FEATURE_OLD aText.SearchAndReplaceAll( cFeatureConverted, CH_FEATURE_OLD ); - rOStream.WriteByteString( aText ); + write_lenPrefixed_uInt8s_FromOString(rOStream, aText); // StyleName and Family... - rOStream.WriteByteString( rtl::OUStringToOString(pC->GetStyle(), eEncoding) ); + write_lenPrefixed_uInt8s_FromOUString(rOStream, pC->GetStyle(), eEncoding); rOStream << (sal_uInt16)pC->GetFamily(); // Paragraph attributes ... @@ -1226,9 +1226,8 @@ void BinTextObject::CreateData( SvStream& rIStream ) ContentInfo* pC = CreateAndInsertContent(); // The Text... - ByteString aByteString; - rIStream.ReadByteString( aByteString ); - pC->GetText() = String( aByteString, eSrcEncoding ); + ByteString aByteString = read_lenPrefixed_uInt8s_ToOString(rIStream); + pC->GetText() = rtl::OStringToOUString(aByteString, eSrcEncoding); // StyleName and Family... rIStream.ReadByteString( pC->GetStyle(), eSrcEncoding ); diff --git a/filter/source/msfilter/mstoolbar.cxx b/filter/source/msfilter/mstoolbar.cxx index 2776e724d1f5..ed1c986dd2c7 100644 --- a/filter/source/msfilter/mstoolbar.cxx +++ b/filter/source/msfilter/mstoolbar.cxx @@ -412,7 +412,7 @@ WString::Read( SvStream &rS ) nOffSet = rS.Tell(); sal_uInt8 nChars = 0; rS >> nChars; - sString = read_LEuInt16s_AsOUString(rS, nChars); + sString = read_LEuInt16s_ToOUString(rS, nChars); return true; } diff --git a/idl/source/objects/bastype.cxx b/idl/source/objects/bastype.cxx index 15c56c088ea0..afeb0046730d 100644 --- a/idl/source/objects/bastype.cxx +++ b/idl/source/objects/bastype.cxx @@ -228,13 +228,13 @@ sal_Bool SvIdentifier::WriteSvIdl( SvStringHashEntry * pName, SvStream& operator << (SvStream & rStm, const SvIdentifier & r ) { - rStm.WriteByteString( r ); + write_lenPrefixed_uInt8s_FromOString(rStm, r); return rStm; } SvStream& operator >> (SvStream & rStm, SvIdentifier & r ) { - rStm.ReadByteString( r ); + r = read_lenPrefixed_uInt8s_ToOString(rStm); return rStm; } @@ -343,13 +343,13 @@ sal_Bool SvString::WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm, SvStream& operator << (SvStream & rStm, const SvString & r ) { - rStm.WriteByteString( r ); + write_lenPrefixed_uInt8s_FromOString(rStm, r); return rStm; } SvStream& operator >> (SvStream & rStm, SvString & r ) { - rStm.ReadByteString( r ); + r = read_lenPrefixed_uInt8s_ToOString(rStm); return rStm; } diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx index c2be3e232494..4fd5c78f7f6f 100644 --- a/idl/source/objects/module.cxx +++ b/idl/source/objects/module.cxx @@ -66,9 +66,9 @@ void SvMetaModule::Load( SvPersistStream & rStm ) rStm >> aAttrList; // browser rStm.ReadByteString( aIdlFileName ); - rStm.ReadByteString( aHelpFileName ); - rStm.ReadByteString( aSlotIdFile ); - rStm.ReadByteString( aModulePrefix ); + aHelpFileName = read_lenPrefixed_uInt8s_ToOString(rStm); + aSlotIdFile = read_lenPrefixed_uInt8s_ToOString(rStm); + aModulePrefix = read_lenPrefixed_uInt8s_ToOString(rStm); // read compiler data sal_uInt16 nCmpLen; @@ -91,9 +91,9 @@ void SvMetaModule::Save( SvPersistStream & rStm ) rStm << aAttrList; // browser rStm.WriteByteString( aIdlFileName ); - rStm.WriteByteString( aHelpFileName ); - rStm.WriteByteString( aSlotIdFile ); - rStm.WriteByteString( aModulePrefix ); + write_lenPrefixed_uInt8s_FromOString(rStm, aHelpFileName); + write_lenPrefixed_uInt8s_FromOString(rStm, aSlotIdFile); + write_lenPrefixed_uInt8s_FromOString(rStm, aModulePrefix); // write compiler data sal_uInt16 nCmpLen = 0; diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx index 0b3e1cf193e3..798acbc1e180 100644 --- a/idl/source/objects/object.cxx +++ b/idl/source/objects/object.cxx @@ -55,7 +55,7 @@ void SvClassElement::Load( SvPersistStream & rStm ) return; } if( nMask & 0x01 ) rStm >> aAutomation; - if( nMask & 0x02 ) rStm.ReadByteString( aPrefix ); + if( nMask & 0x02 ) aPrefix = read_lenPrefixed_uInt8s_ToOString(rStm); if( nMask & 0x04 ) { SvMetaClass * p; @@ -75,7 +75,7 @@ void SvClassElement::Save( SvPersistStream & rStm ) // write data rStm << nMask; if( nMask & 0x01 ) rStm << aAutomation; - if( nMask & 0x02 ) rStm.WriteByteString( aPrefix ); + if( nMask & 0x02 ) write_lenPrefixed_uInt8s_FromOString(rStm, aPrefix); if( nMask & 0x04 ) rStm << xClass; } diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx index 06db9ed18910..f2488aa0498b 100644 --- a/idl/source/objects/types.cxx +++ b/idl/source/objects/types.cxx @@ -1780,7 +1780,7 @@ void SvMetaEnumValue::Load( SvPersistStream & rStm ) OSL_FAIL( "wrong format" ); return; } - if( nMask & 0x01 ) rStm.ReadByteString( aEnumValue ); + if( nMask & 0x01 ) aEnumValue = read_lenPrefixed_uInt8s_ToOString(rStm); } void SvMetaEnumValue::Save( SvPersistStream & rStm ) @@ -1793,7 +1793,7 @@ void SvMetaEnumValue::Save( SvPersistStream & rStm ) // write data rStm << nMask; - if( nMask & 0x01 ) rStm.WriteByteString( aEnumValue ); + if( nMask & 0x01 ) write_lenPrefixed_uInt8s_FromOString(rStm, aEnumValue); } sal_Bool SvMetaEnumValue::ReadSvIdl( SvIdlDataBase & rBase, @@ -1837,7 +1837,7 @@ void SvMetaTypeEnum::Load( SvPersistStream & rStm ) return; } if( nMask & 0x01 ) rStm >> aEnumValueList; - if( nMask & 0x02 ) rStm.ReadByteString( aPrefix ); + if( nMask & 0x02 ) aPrefix = read_lenPrefixed_uInt8s_ToOString(rStm); } void SvMetaTypeEnum::Save( SvPersistStream & rStm ) @@ -1852,7 +1852,7 @@ void SvMetaTypeEnum::Save( SvPersistStream & rStm ) // write data rStm << nMask; if( nMask & 0x01 ) rStm << aEnumValueList; - if( nMask & 0x02 ) rStm.WriteByteString( aPrefix ); + if( nMask & 0x02 ) write_lenPrefixed_uInt8s_FromOString(rStm, aPrefix); } void SvMetaTypeEnum::ReadContextSvIdl( SvIdlDataBase & rBase, diff --git a/sc/source/filter/ftools/ftools.cxx b/sc/source/filter/ftools/ftools.cxx index 21d3e12fc803..bbfbe41a2881 100644 --- a/sc/source/filter/ftools/ftools.cxx +++ b/sc/source/filter/ftools/ftools.cxx @@ -276,9 +276,9 @@ ScStyleSheet& ScfTools::MakePageStyleSheet( ScStyleSheetPool& rPool, const Strin // *** byte string import operations *** -------------------------------------- -rtl::OString ScfTools::read_zeroTerminated_uInt8s_AsOString(SvStream& rStrm, sal_Int32& rnBytesLeft) +rtl::OString ScfTools::read_zeroTerminated_uInt8s_ToOString(SvStream& rStrm, sal_Int32& rnBytesLeft) { - rtl::OString aRet(::read_zeroTerminated_uInt8s_AsOString(rStrm)); + rtl::OString aRet(::read_zeroTerminated_uInt8s_ToOString(rStrm)); rnBytesLeft -= aRet.getLength(); //we read this number of bytes anyway if (rStrm.good()) //if the stream is happy we read the null terminator as well --rnBytesLeft; @@ -287,7 +287,7 @@ rtl::OString ScfTools::read_zeroTerminated_uInt8s_AsOString(SvStream& rStrm, sal void ScfTools::AppendCString( SvStream& rStrm, String& rString, rtl_TextEncoding eTextEnc ) { - rString += ::read_zeroTerminated_uInt8s_AsOUString(rStrm, eTextEnc); + rString += ::read_zeroTerminated_uInt8s_ToOUString(rStrm, eTextEnc); } // *** HTML table names <-> named range names *** ----------------------------- diff --git a/sc/source/filter/inc/ftools.hxx b/sc/source/filter/inc/ftools.hxx index e57d42c27599..4bfac0961c83 100644 --- a/sc/source/filter/inc/ftools.hxx +++ b/sc/source/filter/inc/ftools.hxx @@ -237,11 +237,11 @@ public: // *** byte string import operations *** -------------------------------------- /** Reads and returns a zero terminated byte string and decreases a stream counter. */ - static rtl::OString read_zeroTerminated_uInt8s_AsOString(SvStream& rStrm, sal_Int32& rnBytesLeft); + static rtl::OString read_zeroTerminated_uInt8s_ToOString(SvStream& rStrm, sal_Int32& rnBytesLeft); /** Reads and returns a zero terminated byte string and decreases a stream counter. */ - inline static rtl::OUString read_zeroTerminated_uInt8s_AsOUString(SvStream& rStrm, sal_Int32& rnBytesLeft, rtl_TextEncoding eTextEnc) + inline static rtl::OUString read_zeroTerminated_uInt8s_ToOUString(SvStream& rStrm, sal_Int32& rnBytesLeft, rtl_TextEncoding eTextEnc) { - return rtl::OStringToOUString(read_zeroTerminated_uInt8s_AsOString(rStrm, rnBytesLeft), eTextEnc); + return rtl::OStringToOUString(read_zeroTerminated_uInt8s_ToOString(rStrm, rnBytesLeft), eTextEnc); } /** Appends a zero terminated byte string. */ diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx index 5bd02b10d99e..d649c447ff65 100644 --- a/sc/source/filter/lotus/lotform.cxx +++ b/sc/source/filter/lotus/lotform.cxx @@ -542,7 +542,7 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, sal_Int32& rRest, break; case FT_ConstString: { - String aTmp(ScfTools::read_zeroTerminated_uInt8s_AsOUString(aIn, nBytesLeft, eSrcChar)); + String aTmp(ScfTools::read_zeroTerminated_uInt8s_ToOUString(aIn, nBytesLeft, eSrcChar)); aStack << aPool.Store( aTmp ); } break; @@ -561,7 +561,7 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, sal_Int32& rRest, break; case FT_Nrref: { - String aTmp(ScfTools::read_zeroTerminated_uInt8s_AsOUString(aIn, nBytesLeft, eSrcChar)); + String aTmp(ScfTools::read_zeroTerminated_uInt8s_ToOUString(aIn, nBytesLeft, eSrcChar)); if( rRangeNameBufferWK3.FindRel( aTmp, nRngIndex ) ) aStack << aPool.Store( nRngIndex ); else @@ -574,7 +574,7 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, sal_Int32& rRest, break; case FT_Absnref: { - String aTmp(ScfTools::read_zeroTerminated_uInt8s_AsOUString(aIn, nBytesLeft, eSrcChar)); + String aTmp(ScfTools::read_zeroTerminated_uInt8s_ToOUString(aIn, nBytesLeft, eSrcChar)); if( rRangeNameBufferWK3.FindAbs( aTmp, nRngIndex ) ) aStack << aPool.Store( nRngIndex ); else diff --git a/sc/source/filter/qpro/qproform.cxx b/sc/source/filter/qpro/qproform.cxx index 30b7d6032745..6c8e8b7d371c 100644 --- a/sc/source/filter/qpro/qproform.cxx +++ b/sc/source/filter/qpro/qproform.cxx @@ -249,7 +249,7 @@ ConvErr QProToSc::Convert( const ScTokenArray*& pArray, sal_uInt16 /*nLen*/, con } if( nFmla[ i ] == 0x06 ) { - String aTmp(::read_zeroTerminated_uInt8s_AsOUString(maIn, maIn.GetStreamCharSet())); + String aTmp(::read_zeroTerminated_uInt8s_ToOUString(maIn, maIn.GetStreamCharSet())); sStringArray[ nStringCount ] = aTmp; nStringCount++; SAFEDEC_OR_RET(nRef, aTmp.Len() + 1, ConvErrCount); diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx index 9d33f09eca2f..fd3b0d264ebd 100644 --- a/sc/source/ui/unoobj/scdetect.cxx +++ b/sc/source/ui/unoobj/scdetect.cxx @@ -734,7 +734,7 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream ) // get file header rStr.Seek( 0 ); const sal_Size nTrySize = 80; - ByteString aHeader = read_uInt8s_AsOString(rStr, nTrySize); + ByteString aHeader = read_uInt8s_ToOString(rStr, nTrySize); if ( HTMLParser::IsHTMLFormat( aHeader.GetBuffer() ) ) { diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index 7e8064f781ea..c320f0c762d3 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -2605,7 +2605,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a *xCompObj >> nStringLen; if ( ( nStringLen > 1 ) && ( ( xCompObj->Tell() + nStringLen ) < nStreamLen ) ) { // i think that the OleIdentifier will follow - rtl::OString aTemp = read_uInt8s_AsOString(*xCompObj, nStringLen - 1); + rtl::OString aTemp = read_uInt8s_ToOString(*xCompObj, nStringLen - 1); aOleIdentifier = rtl::OStringToOUString(aTemp, RTL_TEXTENCODING_MS_1252); } } diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx index 18214c5db042..acf69186d2ac 100644 --- a/sfx2/source/bastyp/sfxhtml.cxx +++ b/sfx2/source/bastyp/sfxhtml.cxx @@ -274,7 +274,7 @@ sal_Bool SfxHTMLParser::FinishFileDownload( String& rStr ) : STRING_MAXLEN; aStream.Seek( 0 ); - rtl::OString sBuffer = read_uInt8s_AsOString(aStream, nLen); + rtl::OString sBuffer = read_uInt8s_ToOString(aStream, nLen); rStr = S2U(sBuffer); } diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx index b6fb581057fc..f1cf5c0c3127 100644 --- a/sot/source/sdstor/ucbstorage.cxx +++ b/sot/source/sdstor/ucbstorage.cxx @@ -3303,8 +3303,7 @@ String UCBStorage::GetLinkedFile( SvStream &rStream ) rStream >> nBytes; if( nBytes == 0x04034b50 ) { - ByteString aTmp; - rStream.ReadByteString( aTmp ); + ByteString aTmp = read_lenPrefixed_uInt8s_ToOString(rStream); if ( aTmp.CompareTo( "ContentURL=", 11 ) == COMPARE_EQUAL ) { aTmp.Erase( 0, 11 ); diff --git a/svl/source/items/cntwall.cxx b/svl/source/items/cntwall.cxx index f81bd487d48a..31ef07e8a06e 100644 --- a/svl/source/items/cntwall.cxx +++ b/svl/source/items/cntwall.cxx @@ -80,8 +80,7 @@ CntWallpaperItem::CntWallpaperItem( sal_uInt16 which, SvStream& rStream, sal_uIn readUnicodeString(rStream, _aURL, false); // "Read" SfxWallpaperItem's string member _aFilter. - ByteString aDummy; - rStream.ReadByteString(aDummy); + read_lenPrefixed_uInt8s_ToOString(rStream); } } diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index a85491e4f30d..424aaa0204ce 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -1768,8 +1768,7 @@ void SvNumberformat::ConvertLanguage( SvNumberFormatter& rConverter, void SvNumberformat::LoadString( SvStream& rStream, String& rStr ) { CharSet eStream = rStream.GetStreamCharSet(); - ByteString aStr; - rStream.ReadByteString( aStr ); + ByteString aStr = read_lenPrefixed_uInt8s_ToOString(rStream); sal_Char cStream = NfCurrencyEntry::GetEuroSymbol( eStream ); if ( aStr.Search( cStream ) == STRING_NOTFOUND ) { // simple conversion to unicode diff --git a/svtools/source/filter/igif/gifread.cxx b/svtools/source/filter/igif/gifread.cxx index 81dee55fabf5..607b6a877af3 100644 --- a/svtools/source/filter/igif/gifread.cxx +++ b/svtools/source/filter/igif/gifread.cxx @@ -257,8 +257,8 @@ sal_Bool GIFReader::ReadExtension() // Appl.-Extension hat Laenge 11 if ( cSize == 0x0b ) { - rtl::OString aAppId = read_uInt8s_AsOString(rIStm, 8); - rtl::OString aAppCode = read_uInt8s_AsOString(rIStm, 3); + rtl::OString aAppId = read_uInt8s_ToOString(rIStm, 8); + rtl::OString aAppCode = read_uInt8s_ToOString(rIStm, 3); rIStm >> cSize; // NetScape-Extension diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx index f259ccb06af4..db3e8728f8d2 100644 --- a/svtools/source/graphic/grfmgr.cxx +++ b/svtools/source/graphic/grfmgr.cxx @@ -1125,7 +1125,6 @@ SvStream& operator>>( SvStream& rIStm, GraphicObject& rGraphicObj ) VersionCompat aCompat( rIStm, STREAM_READ ); Graphic aGraphic; GraphicAttr aAttr; - ByteString aLink; sal_Bool bLink; rIStm >> aGraphic >> aAttr >> bLink; @@ -1135,8 +1134,8 @@ SvStream& operator>>( SvStream& rIStm, GraphicObject& rGraphicObj ) if( bLink ) { - rIStm.ReadByteString(aLink); - rGraphicObj.SetLink( UniString( aLink, RTL_TEXTENCODING_UTF8 ) ); + rtl::OUString aLink = read_lenPrefixed_uInt8s_ToOUString(rIStm, RTL_TEXTENCODING_UTF8); + rGraphicObj.SetLink(aLink); } else rGraphicObj.SetLink(); @@ -1154,7 +1153,7 @@ SvStream& operator<<( SvStream& rOStm, const GraphicObject& rGraphicObj ) rOStm << rGraphicObj.GetGraphic() << rGraphicObj.GetAttr() << bLink; if( bLink ) - rOStm.WriteByteString(rtl::OUStringToOString(rGraphicObj.GetLink(), RTL_TEXTENCODING_UTF8)); + write_lenPrefixed_uInt8s_FromOUString(rOStm, rGraphicObj.GetLink(), RTL_TEXTENCODING_UTF8); return rOStm; } diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx index 016250c23c8c..bb720f6838e7 100644 --- a/svtools/source/misc/imap.cxx +++ b/svtools/source/misc/imap.cxx @@ -104,16 +104,16 @@ void IMapObject::Write( SvStream& rOStm, const String& rBaseURL ) const const rtl::OString aRelURL = rtl::OUStringToOString( URIHelper::simpleNormalizedMakeRelative(rBaseURL, aURL), eEncoding); - rOStm.WriteByteString(aRelURL); - rOStm.WriteByteString(rtl::OUStringToOString(aAltText, eEncoding)); + write_lenPrefixed_uInt8s_FromOString(rOStm, aRelURL); + write_lenPrefixed_uInt8s_FromOUString(rOStm, aAltText, eEncoding); rOStm << bActive; - rOStm.WriteByteString(rtl::OUStringToOString(aTarget, eEncoding)); + write_lenPrefixed_uInt8s_FromOUString(rOStm, aTarget, eEncoding); pCompat = new IMapCompat( rOStm, STREAM_WRITE ); WriteIMapObject( rOStm ); - aEventList.Write( rOStm ); // V4 - rOStm.WriteByteString(rtl::OUStringToOString(aName, eEncoding)); // V5 + aEventList.Write( rOStm ); // V4 + write_lenPrefixed_uInt8s_FromOUString(rOStm, aName, eEncoding); // V5 delete pCompat; } @@ -129,16 +129,15 @@ void IMapObject::Read( SvStream& rIStm, const String& rBaseURL ) { IMapCompat* pCompat; rtl_TextEncoding nTextEncoding; - ByteString aString; // Typ und Version ueberlesen wir rIStm.SeekRel( 2 ); rIStm >> nReadVersion; rIStm >> nTextEncoding; - rIStm.ReadByteString( aString ); aURL = String( aString.GetBuffer(), nTextEncoding ); - rIStm.ReadByteString( aString ); aAltText = String( aString.GetBuffer(), nTextEncoding ); + aURL = read_lenPrefixed_uInt8s_ToOUString(rIStm, nTextEncoding); + aAltText = read_lenPrefixed_uInt8s_ToOUString(rIStm, nTextEncoding); rIStm >> bActive; - rIStm.ReadByteString( aString ); aTarget = String( aString.GetBuffer(), nTextEncoding ); + aTarget = read_lenPrefixed_uInt8s_ToOUString(rIStm, nTextEncoding); // URL absolut machen aURL = URIHelper::SmartRel2Abs( INetURLObject(rBaseURL), aURL, URIHelper::GetMaybeFileHdl(), true, false, INetURLObject::WAS_ENCODED, INetURLObject::DECODE_UNAMBIGUOUS ); @@ -153,9 +152,7 @@ void IMapObject::Read( SvStream& rIStm, const String& rBaseURL ) // ab Version 5 kann ein Objektname vorhanden sein if ( nReadVersion >= 0x0005 ) - { - rIStm.ReadByteString( aString ); aName = String( aString.GetBuffer(), nTextEncoding ); - } + aName = read_lenPrefixed_uInt8s_ToOUString(rIStm, nTextEncoding); } delete pCompat; @@ -1117,20 +1114,19 @@ void ImageMap::Write( SvStream& rOStm, const String& rBaseURL ) const { IMapCompat* pCompat; String aImageName( GetName() ); - String aDummy; sal_uInt16 nOldFormat = rOStm.GetNumberFormatInt(); sal_uInt16 nCount = (sal_uInt16) GetIMapObjectCount(); - const rtl_TextEncoding eEncoding = osl_getThreadTextEncoding(); + const rtl_TextEncoding eEncoding = osl_getThreadTextEncoding(); //vomit! rOStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); // MagicCode schreiben rOStm << IMAPMAGIC; rOStm << GetVersion(); - rOStm.WriteByteString(rtl::OUStringToOString(aImageName, eEncoding)); - rOStm.WriteByteString(rtl::OUStringToOString(aDummy, eEncoding)); + write_lenPrefixed_uInt8s_FromOUString(rOStm, aImageName, eEncoding); + write_lenPrefixed_uInt8s_FromOString(rOStm, rtl::OString()); //dummy rOStm << nCount; - rOStm.WriteByteString(rtl::OUStringToOString(aImageName, eEncoding)); + write_lenPrefixed_uInt8s_FromOUString(rOStm, aImageName, eEncoding); pCompat = new IMapCompat( rOStm, STREAM_WRITE ); @@ -1152,7 +1148,6 @@ void ImageMap::Write( SvStream& rOStm, const String& rBaseURL ) const void ImageMap::Read( SvStream& rIStm, const String& rBaseURL ) { - ByteString aString; char cMagic[6]; sal_uInt16 nOldFormat = rIStm.GetNumberFormatInt(); sal_uInt16 nCount; @@ -1170,10 +1165,10 @@ void ImageMap::Read( SvStream& rIStm, const String& rBaseURL ) // Version ueberlesen wir rIStm.SeekRel( 2 ); - rIStm.ReadByteString( aString ); aName = String( aString, osl_getThreadTextEncoding() ); - rIStm.ReadByteString( aString ); // Dummy + aName = read_lenPrefixed_uInt8s_ToOUString(rIStm, osl_getThreadTextEncoding()); + read_lenPrefixed_uInt8s_ToOString(rIStm); // Dummy rIStm >> nCount; - rIStm.ReadByteString( aString ); // Dummy + read_lenPrefixed_uInt8s_ToOString(rIStm); // Dummy pCompat = new IMapCompat( rIStm, STREAM_READ ); diff --git a/svtools/source/urlobj/inetimg.cxx b/svtools/source/urlobj/inetimg.cxx index fff9d170399a..8ed7996c16d0 100644 --- a/svtools/source/urlobj/inetimg.cxx +++ b/svtools/source/urlobj/inetimg.cxx @@ -73,7 +73,7 @@ sal_Bool INetImage::Read( SvStream& rIStm, sal_uLong nFormat ) { case SOT_FORMATSTR_ID_INET_IMAGE: { - String sINetImg = read_zeroTerminated_uInt8s_AsOUString(rIStm, RTL_TEXTENCODING_UTF8); + String sINetImg = read_zeroTerminated_uInt8s_ToOUString(rIStm, RTL_TEXTENCODING_UTF8); xub_StrLen nStart = 0; aImageURL = sINetImg.GetToken( 0, TOKEN_SEPARATOR, nStart ); aTargetURL = sINetImg.GetToken( 0, TOKEN_SEPARATOR, nStart ); @@ -119,11 +119,11 @@ sal_Bool INetImage::Read( SvStream& rIStm, sal_uLong nFormat ) // skip over iExtraHTML_Offset rIStm.SeekRel( sizeof( int ) ); - aImageURL = read_zeroTerminated_uInt8s_AsOUString(rIStm, eSysCSet); + aImageURL = read_zeroTerminated_uInt8s_ToOUString(rIStm, eSysCSet); if( nAltOffset ) { rIStm.Seek( nFilePos + nAltOffset ); - aAlternateText = read_zeroTerminated_uInt8s_AsOUString(rIStm, eSysCSet); + aAlternateText = read_zeroTerminated_uInt8s_ToOUString(rIStm, eSysCSet); } else if( aAlternateText.Len() ) aAlternateText.Erase(); @@ -131,7 +131,7 @@ sal_Bool INetImage::Read( SvStream& rIStm, sal_uLong nFormat ) if( nAnchorOffset ) { rIStm.Seek( nFilePos + nAnchorOffset ); - aTargetURL = read_zeroTerminated_uInt8s_AsOUString(rIStm, eSysCSet); + aTargetURL = read_zeroTerminated_uInt8s_ToOUString(rIStm, eSysCSet); } else if( aTargetURL.Len() ) aTargetURL.Erase(); diff --git a/svx/inc/svx/gallery1.hxx b/svx/inc/svx/gallery1.hxx index aa5cc4aa0f8e..de6ebc684a32 100644 --- a/svx/inc/svx/gallery1.hxx +++ b/svx/inc/svx/gallery1.hxx @@ -47,16 +47,16 @@ class GalleryThemeEntry { private: - String aName; + rtl::OUString aName; INetURLObject aThmURL; INetURLObject aSdgURL; INetURLObject aSdvURL; - sal_uInt32 nFileNumber; - sal_uInt32 nId; - sal_Bool bReadOnly; - sal_Bool bImported; - sal_Bool bModified; - sal_Bool bThemeNameFromResource; + sal_uInt32 nFileNumber; + sal_uInt32 nId; + sal_Bool bReadOnly; + sal_Bool bImported; + sal_Bool bModified; + sal_Bool bThemeNameFromResource; GalleryThemeEntry(); INetURLObject ImplGetURLIgnoreCase( const INetURLObject& rURL ) const; @@ -68,26 +68,26 @@ public: sal_Bool bNewFile, sal_uInt32 nId, sal_Bool bThemeNameFromResource ); ~GalleryThemeEntry() {}; - const String& GetThemeName() const { return aName; } - sal_uInt32 GetFileNumber() const { return nFileNumber; } + const rtl::OUString& GetThemeName() const { return aName; } + sal_uInt32 GetFileNumber() const { return nFileNumber; } const INetURLObject& GetThmURL() const { return aThmURL; } const INetURLObject& GetSdgURL() const { return aSdgURL; } const INetURLObject& GetSdvURL() const { return aSdvURL; } - sal_Bool IsImported() const { return bImported; } - sal_Bool IsReadOnly() const { return bReadOnly; } - sal_Bool IsDefault() const; + sal_Bool IsImported() const { return bImported; } + sal_Bool IsReadOnly() const { return bReadOnly; } + sal_Bool IsDefault() const; - sal_Bool IsHidden() const { return aName.SearchAscii( "private://gallery/hidden/" ) == 0; } + sal_Bool IsHidden() const { return aName.matchAsciiL(RTL_CONSTASCII_STRINGPARAM("private://gallery/hidden/")); } - sal_Bool IsModified() const { return bModified; } + sal_Bool IsModified() const { return bModified; } void SetModified( sal_Bool bSet ) { bModified = ( bSet && !IsImported() && !IsReadOnly() ); } - void SetName( const String& rNewName ); - sal_Bool IsNameFromResource() const { return bThemeNameFromResource; } + void SetName( const rtl::OUString& rNewName ); + sal_Bool IsNameFromResource() const { return bThemeNameFromResource; } - sal_uInt32 GetId() const { return nId; } + sal_uInt32 GetId() const { return nId; } void SetId( sal_uInt32 nNewId, sal_Bool bResetThemeName ); }; @@ -99,10 +99,10 @@ typedef ::std::vector< GalleryThemeEntry* > GalleryThemeList; struct GalleryImportThemeEntry { - String aThemeName; - String aUIName; - INetURLObject aURL; - String aImportName; + rtl::OUString aThemeName; + rtl::OUString aUIName; + INetURLObject aURL; + rtl::OUString aImportName; }; typedef ::std::vector< GalleryImportThemeEntry* > GalleryImportThemeList; @@ -144,9 +144,9 @@ private: void ImplLoadImports(); void ImplWriteImportList(); - SVX_DLLPUBLIC GalleryThemeEntry* ImplGetThemeEntry( const String& rThemeName ); + SVX_DLLPUBLIC GalleryThemeEntry* ImplGetThemeEntry( const rtl::OUString& rThemeName ); GalleryThemeEntry* ImplGetThemeEntry( sal_uIntPtr nThemeId ); - GalleryImportThemeEntry* ImplGetImportThemeEntry( const String& rImportName ); + GalleryImportThemeEntry* ImplGetImportThemeEntry( const rtl::OUString& rImportName ); GalleryTheme* ImplGetCachedTheme( const GalleryThemeEntry* pThemeEntry ); void ImplDeleteCachedTheme( GalleryTheme* pTheme ); @@ -164,7 +164,7 @@ public: const GalleryThemeEntry* GetThemeInfo( const String& rThemeName ) { return ImplGetThemeEntry( rThemeName ); } SVX_DLLPUBLIC sal_Bool HasTheme( const String& rThemeName ); - String GetThemeName( sal_uIntPtr nThemeId ) const; + rtl::OUString GetThemeName( sal_uIntPtr nThemeId ) const; SVX_DLLPUBLIC sal_Bool CreateTheme( const String& rThemeName, sal_uInt32 nNumFrom = 0 ); sal_Bool RenameTheme( const String& rOldName, const String& rNewName ); diff --git a/svx/inc/svx/galmisc.hxx b/svx/inc/svx/galmisc.hxx index c7ed89c2f953..7f4563e89f7e 100644 --- a/svx/inc/svx/galmisc.hxx +++ b/svx/inc/svx/galmisc.hxx @@ -245,8 +245,8 @@ class GalleryHint : public SfxHint private: sal_uIntPtr mnType; - String maThemeName; - String maStringData; + rtl::OUString maThemeName; + rtl::OUString maStringData; sal_uIntPtr mnData1; sal_uIntPtr mnData2; @@ -258,11 +258,11 @@ public: GalleryHint( sal_uIntPtr nType, const String& rThemeName, const String& rStringData, sal_uIntPtr nData1 = 0UL, sal_uIntPtr nData2 = 0UL ) : mnType( nType ), maThemeName( rThemeName ), maStringData( rStringData ), mnData1( nData1 ), mnData2( nData2 ) {} - sal_uIntPtr GetType() const { return mnType; } - const String& GetThemeName() const { return maThemeName; } - const String& GetStringData() const { return maStringData; } - sal_uIntPtr GetData1() const { return mnData1; } - sal_uIntPtr GetData2() const { return mnData2; } + sal_uIntPtr GetType() const { return mnType; } + const rtl::OUString& GetThemeName() const { return maThemeName; } + const rtl::OUString& GetStringData() const { return maStringData; } + sal_uIntPtr GetData1() const { return mnData1; } + sal_uIntPtr GetData2() const { return mnData2; } }; #endif diff --git a/svx/inc/svx/galtheme.hxx b/svx/inc/svx/galtheme.hxx index 2bfdddf8ab4f..766bb449a78f 100644 --- a/svx/inc/svx/galtheme.hxx +++ b/svx/inc/svx/galtheme.hxx @@ -70,10 +70,10 @@ class ListBox; struct GalDragParams { - Region aDragRegion; - sal_uIntPtr nDragObjPos; - String aThemeName; - String aFileName; + Region aDragRegion; + sal_uIntPtr nDragObjPos; + rtl::OUString aThemeName; + rtl::OUString aFileName; SgaObjKind eObjKind; }; @@ -99,7 +99,7 @@ class GalleryTheme : public SfxBroadcaster private: GalleryObjectList aObjectList; - String aImportName; + rtl::OUString aImportName; String m_aDestDir; SotStorageRef aSvDrawStorageRef; Gallery* pParent; @@ -147,10 +147,10 @@ public: SVX_DLLPUBLIC bool RemoveObject( size_t nPos ); bool ChangeObjectPos( size_t nOldPos, size_t nNewPos ); - SVX_DLLPUBLIC const String& GetName() const; - const String& GetRealName() const; - const String& GetImportName() const { return aImportName; } - void SetImportName(const String& rImportName) { aImportName = rImportName; } + SVX_DLLPUBLIC const rtl::OUString& GetName() const; + const rtl::OUString& GetRealName() const; + const rtl::OUString& GetImportName() const { return aImportName; } + void SetImportName(const rtl::OUString& rImportName) { aImportName = rImportName; } const String& GetDestDir() const { return m_aDestDir; } void SetDestDir(const String& rDestDir) { m_aDestDir = rDestDir; } diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx index 4c10186cac9b..9b7cfe2739e6 100644 --- a/svx/source/gallery2/gallery1.cxx +++ b/svx/source/gallery2/gallery1.cxx @@ -78,7 +78,7 @@ GalleryThemeEntry::GalleryThemeEntry( const INetURLObject& rBaseURL, const Strin if( nId && bThemeNameFromResource ) aName = String( GAL_RESID( RID_GALLERYSTR_THEME_START + (sal_uInt16) nId ) ); - if( !aName.Len() ) + if( !aName.getLength() ) aName = rName; } @@ -107,7 +107,7 @@ INetURLObject GalleryThemeEntry::ImplGetURLIgnoreCase( const INetURLObject& rURL // ----------------------------------------------------------------------------- -void GalleryThemeEntry::SetName( const String& rNewName ) +void GalleryThemeEntry::SetName( const rtl::OUString& rNewName ) { if( aName != rNewName ) { @@ -132,16 +132,12 @@ void GalleryThemeEntry::SetId( sal_uInt32 nNewId, sal_Bool bResetThemeName ) SvStream& operator<<( SvStream& rOut, const GalleryImportThemeEntry& rEntry ) { - rOut.WriteByteString(rtl::OUStringToOString(rEntry.aThemeName, RTL_TEXTENCODING_UTF8)); - - rOut.WriteByteString(rtl::OUStringToOString(rEntry.aUIName, RTL_TEXTENCODING_UTF8)); - - rOut.WriteByteString(rtl::OUStringToOString(String(rEntry.aURL.GetMainURL( INetURLObject::NO_DECODE )), RTL_TEXTENCODING_UTF8)); - - rOut.WriteByteString(rtl::OUStringToOString(rEntry.aImportName, RTL_TEXTENCODING_UTF8)); - - rOut.WriteByteString(rtl::OUString()); + write_lenPrefixed_uInt8s_FromOUString(rOut, rEntry.aThemeName, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString(rOut, rEntry.aUIName, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString(rOut, (rEntry.aURL.GetMainURL( INetURLObject::NO_DECODE )), RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString(rOut, rEntry.aImportName, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOString(rOut, rtl::OString()); return rOut; } @@ -149,22 +145,11 @@ SvStream& operator<<( SvStream& rOut, const GalleryImportThemeEntry& rEntry ) SvStream& operator>>( SvStream& rIn, GalleryImportThemeEntry& rEntry ) { - ByteString aTmpStr; - - rIn.ReadByteString(aTmpStr); - rEntry.aThemeName = String( aTmpStr, RTL_TEXTENCODING_UTF8 ); - - rIn.ReadByteString(aTmpStr); - rEntry.aUIName = String( aTmpStr, RTL_TEXTENCODING_UTF8 ); - - rIn.ReadByteString(aTmpStr); - rEntry.aURL = INetURLObject( String( aTmpStr, RTL_TEXTENCODING_UTF8 ) ); - - rIn.ReadByteString(aTmpStr); - rEntry.aImportName = String( aTmpStr, RTL_TEXTENCODING_UTF8 ); - - rIn.ReadByteString(aTmpStr); - + rEntry.aThemeName = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); + rEntry.aUIName = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); + rEntry.aURL = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); + rEntry.aImportName = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); + read_lenPrefixed_uInt8s_ToOString(rIn); return rIn; } @@ -547,21 +532,23 @@ void Gallery::ImplWriteImportList() // ------------------------------------------------------------------------ -GalleryThemeEntry* Gallery::ImplGetThemeEntry( const String& rThemeName ) +GalleryThemeEntry* Gallery::ImplGetThemeEntry( const rtl::OUString& rThemeName ) { GalleryThemeEntry* pFound = NULL; - if( rThemeName.Len() ) + if( rThemeName.getLength() ) + { for ( size_t i = 0, n = aThemeList.size(); i < n && !pFound; ++i ) if( rThemeName == aThemeList[ i ]->GetThemeName() ) pFound = aThemeList[ i ]; + } return pFound; } // ------------------------------------------------------------------------ -GalleryImportThemeEntry* Gallery::ImplGetImportThemeEntry( const String& rImportName ) +GalleryImportThemeEntry* Gallery::ImplGetImportThemeEntry( const rtl::OUString& rImportName ) { for ( size_t i = 0, n = aImportList.size(); i < n; ++i ) if ( rImportName == aImportList[ i ]->aUIName ) @@ -571,7 +558,7 @@ GalleryImportThemeEntry* Gallery::ImplGetImportThemeEntry( const String& rImport // ------------------------------------------------------------------------ -String Gallery::GetThemeName( sal_uIntPtr nThemeId ) const +rtl::OUString Gallery::GetThemeName( sal_uIntPtr nThemeId ) const { GalleryThemeEntry* pFound = NULL; @@ -606,7 +593,7 @@ String Gallery::GetThemeName( sal_uIntPtr nThemeId ) const pFound = ( (Gallery*) this )->ImplGetThemeEntry( String::CreateFromAscii( aFallback.GetBuffer() ) ); } - return( pFound ? pFound->GetThemeName() : String() ); + return( pFound ? pFound->GetThemeName() : rtl::OUString() ); } // ------------------------------------------------------------------------ diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx index 1f03f1397b43..ddf56cbd7c01 100644 --- a/svx/source/gallery2/galobj.cxx +++ b/svx/source/gallery2/galobj.cxx @@ -168,7 +168,7 @@ void SgaObject::WriteData( SvStream& rOut, const String& rDestDir ) const String aURLWithoutDestDir = String(aURL.GetMainURL( INetURLObject::NO_DECODE )); aURLWithoutDestDir.SearchAndReplace(rDestDir, String()); - rOut.WriteByteString(rtl::OUStringToOString(aURLWithoutDestDir, RTL_TEXTENCODING_UTF8)); + write_lenPrefixed_uInt8s_FromOUString(rOut, aURLWithoutDestDir, RTL_TEXTENCODING_UTF8); } // ------------------------------------------------------------------------ @@ -185,9 +185,8 @@ void SgaObject::ReadData(SvStream& rIn, sal_uInt16& rReadVersion ) else rIn >> aThumbMtf; - ByteString aTmpStr; - rIn.ReadByteString(aTmpStr); - aURL = INetURLObject(rtl::OStringToOUString(aTmpStr,RTL_TEXTENCODING_UTF8)); + rtl::OUString aTmpStr = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); + aURL = INetURLObject(aTmpStr); } // ------------------------------------------------------------------------ @@ -294,9 +293,8 @@ void SgaObjectBmp::WriteData( SvStream& rOut, const String& rDestDir ) const SgaObject::WriteData( rOut, rDestDir ); char aDummy[ 10 ]; rOut.Write( aDummy, 10 ); - String aDummyStr; - rOut.WriteByteString(rtl::OUStringToOString(aDummyStr, RTL_TEXTENCODING_UTF8)); - rOut.WriteByteString(rtl::OUStringToOString(aTitle, RTL_TEXTENCODING_UTF8)); + write_lenPrefixed_uInt8s_FromOString(rOut, rtl::OString()); //dummy + write_lenPrefixed_uInt8s_FromOUString(rOut, aTitle, RTL_TEXTENCODING_UTF8); } // ------------------------------------------------------------------------ @@ -306,14 +304,10 @@ void SgaObjectBmp::ReadData( SvStream& rIn, sal_uInt16& rReadVersion ) SgaObject::ReadData( rIn, rReadVersion ); rIn.SeekRel( 10 ); // 16, 16, 32, 16 - ByteString aTmpStr; - rIn.ReadByteString(aTmpStr); // dummy + read_lenPrefixed_uInt8s_ToOString(rIn); //dummy if( rReadVersion >= 5 ) - { - rIn.ReadByteString(aTmpStr); - aTitle = rtl::OStringToOUString(aTmpStr, RTL_TEXTENCODING_UTF8); - } + aTitle = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); } // ------------------ @@ -380,7 +374,7 @@ void SgaObjectSound::WriteData( SvStream& rOut, const String& rDestDir ) const { SgaObject::WriteData( rOut, rDestDir ); rOut << (sal_uInt16) eSoundType; - rOut.WriteByteString(rtl::OUStringToOString(aTitle, RTL_TEXTENCODING_UTF8)); + write_lenPrefixed_uInt8s_FromOUString(rOut, aTitle, RTL_TEXTENCODING_UTF8); } // ------------------------------------------------------------------------ @@ -396,11 +390,7 @@ void SgaObjectSound::ReadData( SvStream& rIn, sal_uInt16& rReadVersion ) rIn >> nTmp16; eSoundType = (GalSoundType) nTmp16; if( rReadVersion >= 6 ) - { - ByteString aTmpStr; - rIn.ReadByteString(aTmpStr); - aTitle = rtl::OStringToOUString(aTmpStr, RTL_TEXTENCODING_UTF8); - } + aTitle = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); } } @@ -591,7 +581,7 @@ sal_Bool SgaObjectSvDraw::DrawCentered( OutputDevice* pOut, const FmFormModel& r void SgaObjectSvDraw::WriteData( SvStream& rOut, const String& rDestDir ) const { SgaObject::WriteData( rOut, rDestDir ); - rOut.WriteByteString(rtl::OUStringToOString(aTitle, RTL_TEXTENCODING_UTF8)); + write_lenPrefixed_uInt8s_FromOUString(rOut, aTitle, RTL_TEXTENCODING_UTF8); } // ------------------------------------------------------------------------ @@ -601,11 +591,7 @@ void SgaObjectSvDraw::ReadData( SvStream& rIn, sal_uInt16& rReadVersion ) SgaObject::ReadData( rIn, rReadVersion ); if( rReadVersion >= 5 ) - { - ByteString aTmpStr; - rIn.ReadByteString(aTmpStr); - aTitle = rtl::OStringToOUString(aTmpStr, RTL_TEXTENCODING_UTF8); - } + aTitle = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index 12f1e6d257ab..4a34a85ee611 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -733,8 +733,7 @@ GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const INetURLObject& rURL, sa { sal_uInt32 nThemeId = 0; - ByteString aTmpStr; - pIStm->ReadByteString(aTmpStr); + rtl::OString aTmpStr = read_lenPrefixed_uInt8s_ToOString(*pIStm); aThemeName = rtl::OStringToOUString(aTmpStr, RTL_TEXTENCODING_UTF8); // Charakterkonvertierung durchfuehren @@ -1355,7 +1354,7 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const sal_Bool bRel; rOStm << (sal_uInt16) 0x0004; - rOStm.WriteByteString(rtl::OUStringToOString(GetRealName(), RTL_TEXTENCODING_UTF8)); + write_lenPrefixed_uInt8s_FromOUString(rOStm, GetRealName(), RTL_TEXTENCODING_UTF8); rOStm << nCount << (sal_uInt16) osl_getThreadTextEncoding(); for( sal_uInt32 i = 0; i < nCount; i++ ) @@ -1395,7 +1394,7 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const aPath.SearchAndReplace(m_aDestDir, String()); rOStm << bRel; - rOStm.WriteByteString(rtl::OUStringToOString(aPath, RTL_TEXTENCODING_UTF8)); + write_lenPrefixed_uInt8s_FromOUString(rOStm, aPath, RTL_TEXTENCODING_UTF8); rOStm << pObj->nOffset << (sal_uInt16) pObj->eObjKind; } @@ -1433,10 +1432,9 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm ) String aThemeName; rtl_TextEncoding nTextEncoding; - aImportName = String(); + aImportName = rtl::OUString(); rIStm >> nVersion; - ByteString aTmpStr; - rIStm.ReadByteString(aTmpStr); + rtl::OString aTmpStr = read_lenPrefixed_uInt8s_ToOString(rIStm); rIStm >> nCount; if( nVersion >= 0x0004 ) @@ -1471,13 +1469,12 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm ) { pObj = new GalleryObject; - ByteString aTempFileName; String aFileName; String aPath; sal_uInt16 nTemp; rIStm >> bRel; - rIStm.ReadByteString(aTempFileName); + rtl::OString aTempFileName = read_lenPrefixed_uInt8s_ToOString(rIStm); rIStm >> pObj->nOffset; rIStm >> nTemp; pObj->eObjKind = (SgaObjKind) nTemp; @@ -1583,7 +1580,7 @@ SvStream& operator>>( SvStream& rIn, GalleryTheme& rTheme ) void GalleryTheme::ImplSetModified( sal_Bool bModified ) { pThm->SetModified( bModified ); } -const String& GalleryTheme::GetRealName() const { return pThm->GetThemeName(); } +const rtl::OUString& GalleryTheme::GetRealName() const { return pThm->GetThemeName(); } const INetURLObject& GalleryTheme::GetThmURL() const { return pThm->GetThmURL(); } const INetURLObject& GalleryTheme::GetSdgURL() const { return pThm->GetSdgURL(); } const INetURLObject& GalleryTheme::GetSdvURL() const { return pThm->GetSdvURL(); } @@ -1594,7 +1591,7 @@ sal_Bool GalleryTheme::IsImported() const { return pThm->IsImported(); } sal_Bool GalleryTheme::IsReadOnly() const { return pThm->IsReadOnly(); } sal_Bool GalleryTheme::IsDefault() const { return pThm->IsDefault(); } sal_Bool GalleryTheme::IsModified() const { return pThm->IsModified(); } -const String& GalleryTheme::GetName() const { return IsImported() ? aImportName : pThm->GetThemeName(); } +const rtl::OUString& GalleryTheme::GetName() const { return IsImported() ? aImportName : pThm->GetThemeName(); } void GalleryTheme::InsertAllThemes( ListBox& rListBox ) { diff --git a/sw/source/filter/ww1/w1class.cxx b/sw/source/filter/ww1/w1class.cxx index 3e5c3e6e0c25..a7e35cd65e41 100644 --- a/sw/source/filter/ww1/w1class.cxx +++ b/sw/source/filter/ww1/w1class.cxx @@ -85,7 +85,7 @@ String Ww1PlainText::GetText( sal_uLong ulOffset, sal_uLong nLen ) const bool bSeekOk = rFib.GetStream().Seek(nPos) == nPos; rtl::OString a8BitStr = bSeekOk ? - read_uInt8s_AsOString(rFib.GetStream(), nLen) : + read_uInt8s_ToOString(rFib.GetStream(), nLen) : rtl::OString(); return rtl::OStringToOUString(a8BitStr, RTL_TEXTENCODING_MS_1252); } diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 99237686e660..0ab1cf6e175a 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -281,7 +281,7 @@ bool Sttb::Read( SvStream& rS ) { SBBItem aItem; rS >> aItem.cchData; - aItem.data = read_LEuInt16s_AsOUString(rS, aItem.cchData); + aItem.data = read_LEuInt16s_ToOUString(rS, aItem.cchData); dataItems.push_back( aItem ); } } diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index c6702c55fc50..b72fcd55ab51 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -4334,7 +4334,7 @@ void WW8RStyle::ImportOldFormatStyles() } else // user style { - rtl::OString aTmp = read_uInt8s_AsOString(rSt, nCount); + rtl::OString aTmp = read_uInt8s_ToOString(rSt, nCount); nByteCount += aTmp.getLength(); sName = rtl::OStringToOUString(aTmp, eStructChrSet); } diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index 56631b9bb225..56981ace6280 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -1910,23 +1910,16 @@ Err: return false; } -String read_uInt8_PascalString(SvStream& rStrm, rtl_TextEncoding eEnc) -{ - sal_uInt8 nLen(0); - rStrm >> nLen; - return rtl::OStringToOUString(read_uInt8s_AsOString(rStrm, nLen), eEnc); -} - String read_LEuInt16_PascalString(SvStream& rStrm) { sal_uInt16 nLen(0); rStrm >> nLen; - return read_LEuInt16s_AsOUString(rStrm, nLen); + return read_LEuInt16s_ToOUString(rStrm, nLen); } String read_uInt8_BeltAndBracesString(SvStream& rStrm, rtl_TextEncoding eEnc) { - String aRet = read_uInt8_PascalString(rStrm, eEnc); + rtl::OUString aRet = read_lenPrefixed_uInt8s_ToOUString(rStrm, eEnc); rStrm.SeekRel(sizeof(sal_uInt8)); // skip null-byte at end return aRet; } @@ -1968,11 +1961,11 @@ xub_StrLen WW8ScannerBase::WW8ReadString( SvStream& rStrm, String& rStr, nLen = USHRT_MAX - 1; if( bIsUnicode ) - rStr.Append(String(read_LEuInt16s_AsOUString(rStrm, nLen))); + rStr.Append(String(read_LEuInt16s_ToOUString(rStrm, nLen))); else { // Alloc method automatically sets Zero at the end - rtl::OString aByteStr = read_uInt8s_AsOString(rStrm, nLen); + rtl::OString aByteStr = read_uInt8s_ToOString(rStrm, nLen); rStr.Append(String(rtl::OStringToOUString(aByteStr, eEnc))); } nTotalRead += nLen; @@ -3876,7 +3869,7 @@ void WW8ReadSTTBF(bool bVer8, SvStream& rStrm, sal_uInt32 nStart, sal_Int32 nLen { sal_uInt8 nBChar(0); rStrm >> nBChar; - rtl::OString aTmp = read_uInt8s_AsOString(rStrm, nBChar); + rtl::OString aTmp = read_uInt8s_ToOString(rStrm, nBChar); rArray.push_back(rtl::OStringToOUString(aTmp, eCS)); } @@ -3909,7 +3902,7 @@ void WW8ReadSTTBF(bool bVer8, SvStream& rStrm, sal_uInt32 nStart, sal_Int32 nLen { sal_uInt8 nBChar(0); rStrm >> nBChar; - rtl::OString aTmp = read_uInt8s_AsOString(rStrm, nBChar); + rtl::OString aTmp = read_uInt8s_ToOString(rStrm, nBChar); pValueArray->push_back(rtl::OStringToOUString(aTmp, eCS)); } } @@ -3935,7 +3928,7 @@ void WW8ReadSTTBF(bool bVer8, SvStream& rStrm, sal_uInt32 nStart, sal_Int32 nLen ++nRead; if (nBChar) { - rtl::OString aTmp = read_uInt8s_AsOString(rStrm, nBChar); + rtl::OString aTmp = read_uInt8s_ToOString(rStrm, nBChar); nRead += aTmp.getLength(); rArray.push_back(rtl::OStringToOUString(aTmp, eCS)); } diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx index a323b84bae6e..9cac3eb94c28 100644 --- a/sw/source/filter/ww8/ww8scan.hxx +++ b/sw/source/filter/ww8/ww8scan.hxx @@ -136,7 +136,10 @@ public: //Read a Pascal-style, i.e. single byte string length followed //by string contents -String read_uInt8_PascalString(SvStream& rStrm, rtl_TextEncoding eEnc); +inline String read_uInt8_PascalString(SvStream& rStrm, rtl_TextEncoding eEnc) +{ + return read_lenPrefixed_uInt8s_ToOUString(rStrm, eEnc); +} String read_LEuInt16_PascalString(SvStream& rStrm); //Belt and Braces strings, i.e. Pascal-style strings followed by diff --git a/sw/source/filter/ww8/ww8toolbar.cxx b/sw/source/filter/ww8/ww8toolbar.cxx index d615d860619c..06cf7e707e2b 100644 --- a/sw/source/filter/ww8/ww8toolbar.cxx +++ b/sw/source/filter/ww8/ww8toolbar.cxx @@ -1128,7 +1128,7 @@ bool TcgSttbfCore::Read( SvStream& rS ) for ( sal_Int32 index = 0; index < cData; ++index ) { rS >> dataItems[ index ].cchData; - dataItems[ index ].data = read_LEuInt16s_AsOUString(rS, dataItems[index].cchData); + dataItems[ index ].data = read_LEuInt16s_ToOUString(rS, dataItems[index].cchData); rS >> dataItems[ index ].extraData; } } diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx index 6f3905105b8b..422e090b06e9 100755 --- a/sw/source/ui/dochdl/swdtflvr.cxx +++ b/sw/source/ui/dochdl/swdtflvr.cxx @@ -1993,9 +1993,9 @@ int SwTransferable::_PasteDDE( TransferableDataHelper& rData, } // report useful error!! rtl_TextEncoding eEncoding = DDE_TXT_ENCODING; - aApp = read_zeroTerminated_uInt8s_AsOUString(*xStrm, eEncoding); - aTopic = read_zeroTerminated_uInt8s_AsOUString(*xStrm, eEncoding); - aItem = read_zeroTerminated_uInt8s_AsOUString(*xStrm, eEncoding); + aApp = read_zeroTerminated_uInt8s_ToOUString(*xStrm, eEncoding); + aTopic = read_zeroTerminated_uInt8s_ToOUString(*xStrm, eEncoding); + aItem = read_zeroTerminated_uInt8s_ToOUString(*xStrm, eEncoding); } String aCmd; diff --git a/tools/inc/tools/inetmsg.hxx b/tools/inc/tools/inetmsg.hxx index 610b804e7502..7c88b9c3aa7a 100644 --- a/tools/inc/tools/inetmsg.hxx +++ b/tools/inc/tools/inetmsg.hxx @@ -51,7 +51,7 @@ class INetMessageHeader ByteString m_aValue; public: - INetMessageHeader (void) + INetMessageHeader() {} INetMessageHeader ( @@ -64,7 +64,7 @@ public: : m_aName (rHdr.m_aName), m_aValue (rHdr.m_aValue) {} - ~INetMessageHeader (void) + ~INetMessageHeader() {} INetMessageHeader& operator= (const INetMessageHeader& rHdr) @@ -74,22 +74,22 @@ public: return *this; } - const ByteString& GetName (void) const { return m_aName; } - const ByteString& GetValue (void) const { return m_aValue; } + const ByteString& GetName() const { return m_aName; } + const ByteString& GetValue() const { return m_aValue; } friend SvStream& operator<< ( SvStream& rStrm, const INetMessageHeader& rHdr) { - rStrm.WriteByteString (rHdr.m_aName); - rStrm.WriteByteString (rHdr.m_aValue); + write_lenPrefixed_uInt8s_FromOString(rStrm, rHdr.m_aName); + write_lenPrefixed_uInt8s_FromOString(rStrm, rHdr.m_aValue); return rStrm; } friend SvStream& operator>> ( SvStream& rStrm, INetMessageHeader& rHdr) { - rStrm.ReadByteString (rHdr.m_aName); - rStrm.ReadByteString (rHdr.m_aValue); + rHdr.m_aName = read_lenPrefixed_uInt8s_ToOString(rStrm); + rHdr.m_aValue = read_lenPrefixed_uInt8s_ToOString(rStrm); return rStrm; } }; @@ -108,7 +108,7 @@ class INetMessage UniString m_aDocName; SvLockBytesRef m_xDocLB; - void ListCleanup_Impl (void); + void ListCleanup_Impl(); void ListCopy (const INetMessage& rMsg); protected: @@ -158,8 +158,8 @@ protected: virtual SvStream& operator>> (SvStream& rStrm); public: - INetMessage (void) : m_nDocSize(0) {} - virtual ~INetMessage (void); + INetMessage() : m_nDocSize(0) {} + virtual ~INetMessage(); INetMessage (const INetMessage& rMsg) : m_nDocSize (rMsg.m_nDocSize), @@ -178,7 +178,7 @@ public: return *this; } - sal_uIntPtr GetHeaderCount (void) const { return m_aHeaderList.size(); } + sal_uIntPtr GetHeaderCount() const { return m_aHeaderList.size(); } UniString GetHeaderName (sal_uIntPtr nIndex) const { @@ -204,13 +204,13 @@ public: sal_uIntPtr nIndex = ((sal_uIntPtr)-1) ); - sal_uIntPtr GetDocumentSize (void) const { return m_nDocSize; } + sal_uIntPtr GetDocumentSize() const { return m_nDocSize; } void SetDocumentSize (sal_uIntPtr nSize) { m_nDocSize = nSize; } - const UniString& GetDocumentName (void) const { return m_aDocName; } + const UniString& GetDocumentName() const { return m_aDocName; } void SetDocumentName (const UniString& rName) { m_aDocName = rName; } - SvLockBytes* GetDocumentLB (void) const { return m_xDocLB; } + SvLockBytes* GetDocumentLB() const { return m_xDocLB; } void SetDocumentLB (SvLockBytes *pDocLB) { m_xDocLB = pDocLB; } friend SvStream& operator<< ( @@ -260,9 +260,9 @@ protected: virtual SvStream& operator>> (SvStream& rStrm); public: - INetRFC822Message (void); + INetRFC822Message(); INetRFC822Message (const INetRFC822Message& rMsg); - virtual ~INetRFC822Message (void); + virtual ~INetRFC822Message(); INetRFC822Message& operator= (const INetRFC822Message& rMsg); @@ -277,105 +277,105 @@ public: /** Header fields. */ - UniString GetBCC (void) const + UniString GetBCC() const { return GetHeaderValue_Impl ( m_nIndex[INETMSG_RFC822_BCC], INetMIME::HEADER_FIELD_ADDRESS); } - UniString GetCC (void) const + UniString GetCC() const { return GetHeaderValue_Impl ( m_nIndex[INETMSG_RFC822_CC], INetMIME::HEADER_FIELD_ADDRESS); } - UniString GetComments (void) const + UniString GetComments() const { return GetHeaderValue_Impl ( m_nIndex[INETMSG_RFC822_COMMENTS], INetMIME::HEADER_FIELD_TEXT); } - UniString GetDate (void) const + UniString GetDate() const { return GetHeaderValue_Impl ( m_nIndex[INETMSG_RFC822_DATE], INetMIME::HEADER_FIELD_STRUCTURED); } - UniString GetFrom (void) const + UniString GetFrom() const { return GetHeaderValue_Impl ( m_nIndex[INETMSG_RFC822_FROM], INetMIME::HEADER_FIELD_ADDRESS); } - UniString GetInReplyTo (void) const + UniString GetInReplyTo() const { return GetHeaderValue_Impl ( m_nIndex[INETMSG_RFC822_IN_REPLY_TO], INetMIME::HEADER_FIELD_ADDRESS); // ??? MESSAGE_ID ??? } - UniString GetKeywords (void) const + UniString GetKeywords() const { return GetHeaderValue_Impl ( m_nIndex[INETMSG_RFC822_KEYWORDS], INetMIME::HEADER_FIELD_PHRASE); } - UniString GetMessageID (void) const + UniString GetMessageID() const { return GetHeaderValue_Impl ( m_nIndex[INETMSG_RFC822_MESSAGE_ID], INetMIME::HEADER_FIELD_MESSAGE_ID); } - UniString GetReferences (void) const + UniString GetReferences() const { return GetHeaderValue_Impl ( m_nIndex[INETMSG_RFC822_REFERENCES], INetMIME::HEADER_FIELD_ADDRESS); } - UniString GetReplyTo (void) const + UniString GetReplyTo() const { return GetHeaderValue_Impl ( m_nIndex[INETMSG_RFC822_REPLY_TO], INetMIME::HEADER_FIELD_ADDRESS); } - UniString GetReturnPath (void) const + UniString GetReturnPath() const { return GetHeaderValue_Impl ( m_nIndex[INETMSG_RFC822_RETURN_PATH], INetMIME::HEADER_FIELD_ADDRESS); } - UniString GetReturnReceiptTo (void) const + UniString GetReturnReceiptTo() const { return GetHeaderValue_Impl ( m_nIndex[INETMSG_RFC822_RETURN_RECEIPT_TO], INetMIME::HEADER_FIELD_ADDRESS); } - UniString GetSender (void) const + UniString GetSender() const { return GetHeaderValue_Impl ( m_nIndex[INETMSG_RFC822_SENDER], INetMIME::HEADER_FIELD_ADDRESS); } - UniString GetSubject (void) const + UniString GetSubject() const { return GetHeaderValue_Impl ( m_nIndex[INETMSG_RFC822_SUBJECT], INetMIME::HEADER_FIELD_TEXT); } - UniString GetTo (void) const + UniString GetTo() const { return GetHeaderValue_Impl ( m_nIndex[INETMSG_RFC822_TO], @@ -430,15 +430,15 @@ class TOOLS_DLLPUBLIC INetMIMEMessage : public INetRFC822Message INetMIMEMessage* pParent; INetMIMEMessgeList_impl aChildren; - ByteString m_aBoundary; + rtl::OString m_aBoundary; sal_Bool bHeaderParsed; friend class INetMIMEMessageStream; - const ByteString& GetMultipartBoundary (void) const { return m_aBoundary; } - void SetMultipartBoundary (const ByteString& rBnd) { m_aBoundary = rBnd; } + const rtl::OString& GetMultipartBoundary() const { return m_aBoundary; } + void SetMultipartBoundary (const rtl::OString& rBnd) { m_aBoundary = rBnd; } - void CleanupImp (void); + void CleanupImp(); void CopyImp (const INetMIMEMessage& rMsg); void SetHeaderParsed() { bHeaderParsed = sal_True; } @@ -447,9 +447,9 @@ protected: virtual SvStream& operator>> (SvStream& rStrm); public: - INetMIMEMessage (void); + INetMIMEMessage(); INetMIMEMessage (const INetMIMEMessage& rMsg); - virtual ~INetMIMEMessage (void); + virtual ~INetMIMEMessage(); INetMIMEMessage& operator= (const INetMIMEMessage& rMsg); @@ -467,35 +467,35 @@ public: /** Header fields. */ void SetMIMEVersion (const UniString& rVersion); - UniString GetMIMEVersion (void) const + UniString GetMIMEVersion() const { return GetHeaderValue (m_nIndex[INETMSG_MIME_VERSION]); } - UniString GetContentDescription (void) const + UniString GetContentDescription() const { return GetHeaderValue (m_nIndex[INETMSG_MIME_CONTENT_DESCRIPTION]); } void SetContentDisposition (const UniString& rDisposition); - UniString GetContentDisposition (void) const + UniString GetContentDisposition() const { return GetHeaderValue (m_nIndex[INETMSG_MIME_CONTENT_DISPOSITION]); } - UniString GetContentID (void) const + UniString GetContentID() const { return GetHeaderValue (m_nIndex[INETMSG_MIME_CONTENT_ID]); } void SetContentType (const UniString& rType); - UniString GetContentType (void) const + UniString GetContentType() const { return GetHeaderValue (m_nIndex[INETMSG_MIME_CONTENT_TYPE]); } void SetContentTransferEncoding (const UniString& rEncoding); - UniString GetContentTransferEncoding (void) const + UniString GetContentTransferEncoding() const { return GetHeaderValue (m_nIndex[INETMSG_MIME_CONTENT_TRANSFER_ENCODING]); } @@ -504,16 +504,16 @@ public: /** Message container methods. */ - sal_Bool IsContainer (void) const + sal_Bool IsContainer() const { return (IsMessage() || IsMultipart()); } - sal_Bool IsMessage (void) const + sal_Bool IsMessage() const { UniString aType (GetContentType()); return (aType.CompareIgnoreCaseToAscii("message/", 8) == 0); } - sal_Bool IsMultipart (void) const + sal_Bool IsMultipart() const { UniString aType (GetContentType()); return (aType.CompareIgnoreCaseToAscii("multipart/", 10) == 0); @@ -523,7 +523,7 @@ public: { return ( nIndex < aChildren.size() ) ? aChildren[ nIndex ] : NULL; } - INetMIMEMessage* GetParent (void) const { return pParent; } + INetMIMEMessage* GetParent() const { return pParent; } sal_Bool EnableAttachChild ( INetMessageContainerType eType = INETMSG_MULTIPART_MIXED); diff --git a/tools/inc/tools/stream.hxx b/tools/inc/tools/stream.hxx index 66312b76faaf..e6e939bbbd1b 100644 --- a/tools/inc/tools/stream.hxx +++ b/tools/inc/tools/stream.hxx @@ -28,6 +28,7 @@ #ifndef _STREAM_HXX #define _STREAM_HXX +#include #include "tools/toolsdllapi.h" #include #include @@ -364,10 +365,8 @@ public: SvStream& ReadByteString( UniString& rStr, rtl_TextEncoding eSrcCharSet ); SvStream& ReadByteString( UniString& rStr ) { return ReadByteString( rStr, GetStreamCharSet() ); } - SvStream& ReadByteString( ByteString& rStr ); SvStream& WriteByteString( const UniString& rStr, rtl_TextEncoding eDestCharSet ); SvStream& WriteByteString( const UniString& rStr ) { return WriteByteString( rStr, GetStreamCharSet() ); } - SvStream& WriteByteString( const ByteString& rStr ); SvStream& WriteNumber( sal_uInt32 nUInt32 ); SvStream& WriteNumber( sal_Int32 nInt32 ); @@ -546,22 +545,70 @@ TOOLS_DLLPUBLIC SvStream& endlub( SvStream& rStr ); //Attempt to read nLen 8bit units to an OString, returned rtl::OString's length //is number of units successfully read -TOOLS_DLLPUBLIC rtl::OString read_uInt8s_AsOString(SvStream& rStr, sal_Size nLen); +TOOLS_DLLPUBLIC rtl::OString read_uInt8s_ToOString(SvStream& rStrm, sal_Size nLen); //Attempt to read nLen little endian 16bit units to an OUString, returned //rtl::OUString's length is number of units successfully read -TOOLS_DLLPUBLIC rtl::OUString read_LEuInt16s_AsOUString(SvStream& rStr, sal_Size nLen); +TOOLS_DLLPUBLIC rtl::OUString read_LEuInt16s_ToOUString(SvStream& rStrm, sal_Size nLen); //Attempt to read 8bit units to an OString until a zero terminator is //encountered, returned rtl::OString's length is number of units *definitely* //successfully read, check SvStream::good() to see if null terminator was //sucessfully read -TOOLS_DLLPUBLIC rtl::OString read_zeroTerminated_uInt8s_AsOString(SvStream& rStr); +TOOLS_DLLPUBLIC rtl::OString read_zeroTerminated_uInt8s_ToOString(SvStream& rStrm); //Attempt to read 8bit units assuming source encoding eEnc to an OUString until //a zero terminator is encountered. Check SvStream::good() to see if null //terminator was sucessfully read -TOOLS_DLLPUBLIC rtl::OUString read_zeroTerminated_uInt8s_AsOUString(SvStream& rStr, rtl_TextEncoding eEnc); +TOOLS_DLLPUBLIC rtl::OUString read_zeroTerminated_uInt8s_ToOUString(SvStream& rStrm, rtl_TextEncoding eEnc); + +//Attempt to read a pascal-style length (of type prefix) prefixed sequence of +//8bit units to an OString, returned rtl::OString's length is number of units +//successfully read. +template rtl::OString read_lenPrefixed_uInt8s_ToOString(SvStream& rStrm) +{ + prefix nLen = 0; + rStrm >> nLen; + return read_uInt8s_ToOString(rStrm, nLen); +} + +//Attempt to read a pascal-style length (of type prefix) prefixed sequence of +//8bit units to an OUString +template rtl::OUString read_lenPrefixed_uInt8s_ToOUString(SvStream& rStrm, + rtl_TextEncoding eEnc) +{ + return rtl::OStringToOUString(read_lenPrefixed_uInt8s_ToOString(rStrm), eEnc); +} + +//Attempt to write a pascal-style length (of type prefix) prefixed sequence of +//8bit units from an OString, returned value is number of bytes written (including +//byte-count of prefix) +template sal_Size write_lenPrefixed_uInt8s_FromOString(SvStream& rStrm, + const rtl::OString &rStr) +{ + SAL_WARN_IF(rStr.getLength() > std::numeric_limits::max(), + "tools.stream", + "string too long for prefix count to fit in output type"); + + sal_Size nWritten = 0; + prefix nLen = std::min(rStr.getLength(), std::numeric_limits::max()); + rStrm << nLen; + if (rStrm.good()) + { + nWritten += sizeof(prefix); + nWritten += rStrm.Write(rStr.getStr(), nLen); + } + return nWritten; +} + +//Attempt to write a pascal-style length (of type prefix) prefixed sequence of +//8bit units from an OUString, returned value is number of bytes written (including +//byte-count of prefix) +template sal_Size write_lenPrefixed_uInt8s_FromOUString(SvStream& rStrm, + const rtl::OUString &rStr, rtl_TextEncoding eEnc) +{ + return write_lenPrefixed_uInt8s_FromOString(rStrm, rtl::OUStringToOString(rStr, eEnc)); +} // -------------- // - FileStream - diff --git a/tools/qa/cppunit/test_stream.cxx b/tools/qa/cppunit/test_stream.cxx index 77c2b9ed75ae..3e7580f40377 100644 --- a/tools/qa/cppunit/test_stream.cxx +++ b/tools/qa/cppunit/test_stream.cxx @@ -47,11 +47,13 @@ namespace void test_stdstream(); void test_fastostring(); void test_read_cstring(); + void test_read_pstring(); CPPUNIT_TEST_SUITE(Test); CPPUNIT_TEST(test_stdstream); CPPUNIT_TEST(test_fastostring); CPPUNIT_TEST(test_read_cstring); + CPPUNIT_TEST(test_read_pstring); CPPUNIT_TEST_SUITE_END(); }; @@ -67,7 +69,7 @@ namespace char tools_a(78); aMemStream >> tools_a; - CPPUNIT_ASSERT(std_a == 'f'); + CPPUNIT_ASSERT(tools_a == 'f'); iss.seekg(0, std::ios_base::end); //seeking to end doesn't set eof, reading past eof does @@ -98,7 +100,7 @@ namespace //a failed read doesn't change the data, it remains unchanged CPPUNIT_ASSERT(tools_a == 78); //nothing wrong with the stream, so not bad - CPPUNIT_ASSERT(!aMemStream.GetError()); + CPPUNIT_ASSERT(!aMemStream.bad()); //yet, the read didn't succeed CPPUNIT_ASSERT(!aMemStream.good()); @@ -133,18 +135,18 @@ namespace char foo[] = "foobar"; SvMemoryStream aMemStream(RTL_CONSTASCII_STRINGPARAM(foo), STREAM_READ); - rtl::OString aOne = read_uInt8s_AsOString(aMemStream, 3); + rtl::OString aOne = read_uInt8s_ToOString(aMemStream, 3); CPPUNIT_ASSERT(aOne.equalsL(RTL_CONSTASCII_STRINGPARAM("foo"))); - rtl::OString aTwo = read_uInt8s_AsOString(aMemStream, 3); + rtl::OString aTwo = read_uInt8s_ToOString(aMemStream, 3); CPPUNIT_ASSERT(aTwo.equalsL(RTL_CONSTASCII_STRINGPARAM("bar"))); - rtl::OString aThree = read_uInt8s_AsOString(aMemStream, 3); + rtl::OString aThree = read_uInt8s_ToOString(aMemStream, 3); CPPUNIT_ASSERT(!aThree.getLength()); aMemStream.Seek(0); - rtl::OString aFour = read_uInt8s_AsOString(aMemStream, 100); + rtl::OString aFour = read_uInt8s_ToOString(aMemStream, 100); CPPUNIT_ASSERT(aFour.equalsL(RTL_CONSTASCII_STRINGPARAM(foo))); } @@ -153,7 +155,7 @@ namespace char foo[] = "foobar"; SvMemoryStream aMemStream(RTL_CONSTASCII_STRINGPARAM(foo), STREAM_READ); - rtl::OString aOne = read_zeroTerminated_uInt8s_AsOString(aMemStream); + rtl::OString aOne = read_zeroTerminated_uInt8s_ToOString(aMemStream); CPPUNIT_ASSERT(aOne.equalsL(RTL_CONSTASCII_STRINGPARAM("foobar"))); CPPUNIT_ASSERT(!aMemStream.good()); CPPUNIT_ASSERT(!aMemStream.bad()); @@ -161,11 +163,52 @@ namespace aMemStream.Seek(0); foo[3] = 0; - rtl::OString aTwo = read_zeroTerminated_uInt8s_AsOString(aMemStream); + rtl::OString aTwo = read_zeroTerminated_uInt8s_ToOString(aMemStream); CPPUNIT_ASSERT(aTwo.equalsL(RTL_CONSTASCII_STRINGPARAM("foo"))); CPPUNIT_ASSERT(aMemStream.good()); } + void Test::test_read_pstring() + { + char foo[] = "\3foobar"; + SvMemoryStream aMemStream(RTL_CONSTASCII_STRINGPARAM(foo), STREAM_READ); + + rtl::OString aFoo = read_lenPrefixed_uInt8s_ToOString(aMemStream); + CPPUNIT_ASSERT(aFoo.equalsL(RTL_CONSTASCII_STRINGPARAM("foo"))); + CPPUNIT_ASSERT(aMemStream.good()); + CPPUNIT_ASSERT(!aMemStream.bad()); + CPPUNIT_ASSERT(!aMemStream.eof()); + + aMemStream.Seek(0); + foo[0] = 10; + aFoo = read_lenPrefixed_uInt8s_ToOString(aMemStream); + CPPUNIT_ASSERT(aFoo.equalsL(RTL_CONSTASCII_STRINGPARAM("foobar"))); + CPPUNIT_ASSERT(!aMemStream.good()); + CPPUNIT_ASSERT(!aMemStream.bad()); + CPPUNIT_ASSERT(aMemStream.eof()); + + aMemStream.SetNumberFormatInt(NUMBERFORMAT_INT_BIGENDIAN); + aMemStream.Seek(0); + foo[0] = 0; + foo[1] = 3; + aFoo = read_lenPrefixed_uInt8s_ToOString(aMemStream); + CPPUNIT_ASSERT(aFoo.equalsL(RTL_CONSTASCII_STRINGPARAM("oob"))); + CPPUNIT_ASSERT(aMemStream.good()); + CPPUNIT_ASSERT(!aMemStream.bad()); + CPPUNIT_ASSERT(!aMemStream.eof()); + + aMemStream.SetNumberFormatInt(NUMBERFORMAT_INT_LITTLEENDIAN); + aMemStream.Seek(0); + foo[0] = 3; + foo[1] = 0; + foo[2] = 0; + foo[3] = 0; + aFoo = read_lenPrefixed_uInt8s_ToOString(aMemStream); + CPPUNIT_ASSERT(aFoo.equalsL(RTL_CONSTASCII_STRINGPARAM("bar"))); + CPPUNIT_ASSERT(aMemStream.good()); + CPPUNIT_ASSERT(!aMemStream.bad()); + CPPUNIT_ASSERT(!aMemStream.eof()); + } CPPUNIT_TEST_SUITE_REGISTRATION(Test); } diff --git a/tools/source/inet/inetmsg.cxx b/tools/source/inet/inetmsg.cxx index f5fa071ad15a..f626dcccd508 100644 --- a/tools/source/inet/inetmsg.cxx +++ b/tools/source/inet/inetmsg.cxx @@ -66,7 +66,7 @@ inline sal_Unicode ascii_toLowerCase( sal_Unicode ch ) /* * ~INetMessage. */ -INetMessage::~INetMessage (void) +INetMessage::~INetMessage() { ListCleanup_Impl(); } @@ -74,7 +74,7 @@ INetMessage::~INetMessage (void) /* * ListCleanup_Impl. */ -void INetMessage::ListCleanup_Impl (void) +void INetMessage::ListCleanup_Impl() { // Cleanup. sal_uIntPtr i, n = m_aHeaderList.size(); @@ -243,7 +243,7 @@ enum _ImplINetRFC822MessageHeaderState /* * INetRFC822Message. */ -INetRFC822Message::INetRFC822Message (void) +INetRFC822Message::INetRFC822Message() : INetMessage() { for (sal_uInt16 i = 0; i < INETMSG_RFC822_NUMHDR; i++) @@ -275,7 +275,7 @@ INetRFC822Message& INetRFC822Message::operator= (const INetRFC822Message& rMsg) /* * ~INetRFC822Message. */ -INetRFC822Message::~INetRFC822Message (void) +INetRFC822Message::~INetRFC822Message() { } @@ -753,7 +753,7 @@ enum _ImplINetMIMEMessageHeaderState /* * INetMIMEMessage. */ -INetMIMEMessage::INetMIMEMessage (void) +INetMIMEMessage::INetMIMEMessage() : INetRFC822Message (), pParent (NULL), bHeaderParsed (sal_False) @@ -792,7 +792,7 @@ INetMIMEMessage& INetMIMEMessage::operator= ( /* * ~INetMIMEMessage. */ -INetMIMEMessage::~INetMIMEMessage (void) +INetMIMEMessage::~INetMIMEMessage() { // Cleanup. CleanupImp(); @@ -801,7 +801,7 @@ INetMIMEMessage::~INetMIMEMessage (void) /* * CleanupImp. */ -void INetMIMEMessage::CleanupImp (void) +void INetMIMEMessage::CleanupImp() { for( size_t i = 0, n = aChildren.size(); i < n; ++i ) { delete aChildren[ i ]; @@ -1161,7 +1161,7 @@ SvStream& INetMIMEMessage::operator<< (SvStream& rStrm) const for (sal_uInt16 i = 0; i < INETMSG_MIME_NUMHDR; i++) rStrm << static_cast(m_nIndex[i]); - rStrm.WriteByteString (m_aBoundary); + write_lenPrefixed_uInt8s_FromOString(rStrm, m_aBoundary); rStrm << static_cast(aChildren.size()); return rStrm; @@ -1181,7 +1181,7 @@ SvStream& INetMIMEMessage::operator>> (SvStream& rStrm) m_nIndex[i] = nTemp; } - rStrm.ReadByteString (m_aBoundary); + m_aBoundary = read_lenPrefixed_uInt8s_ToOString(rStrm); rStrm >> nTemp; diff --git a/tools/source/inet/inetstrm.cxx b/tools/source/inet/inetstrm.cxx index d70d84d2c30c..5345067aa0f8 100644 --- a/tools/source/inet/inetstrm.cxx +++ b/tools/source/inet/inetstrm.cxx @@ -1608,7 +1608,7 @@ int INetMIMEMessageStream::PutMsgLine (const sal_Char *pData, sal_uIntPtr nSize) // Multipart message body. Initialize multipart delimiters. // Multipart message. - if (pMsg->GetMultipartBoundary().Len() == 0) + if (pMsg->GetMultipartBoundary().getLength() == 0) { // Determine boundary. rtl::OString aType(rtl::OUStringToOString( diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx index 5fa5b0e43380..b70195978008 100644 --- a/tools/source/stream/stream.cxx +++ b/tools/source/stream/stream.cxx @@ -806,7 +806,7 @@ sal_Bool SvStream::ReadUniOrByteStringLine( String& rStr, rtl_TextEncoding eSrcC return ReadByteStringLine( rStr, eSrcCharSet ); } -rtl::OString read_zeroTerminated_uInt8s_AsOString(SvStream& rStream) +rtl::OString read_zeroTerminated_uInt8s_ToOString(SvStream& rStream) { rtl::OStringBuffer aOutput; @@ -839,10 +839,10 @@ rtl::OString read_zeroTerminated_uInt8s_AsOString(SvStream& rStream) return aOutput.makeStringAndClear(); } -rtl::OUString read_zeroTerminated_uInt8s_AsOUString(SvStream& rStream, rtl_TextEncoding eEnc) +rtl::OUString read_zeroTerminated_uInt8s_ToOUString(SvStream& rStream, rtl_TextEncoding eEnc) { return rtl::OStringToOUString( - read_zeroTerminated_uInt8s_AsOString(rStream), eEnc); + read_zeroTerminated_uInt8s_ToOString(rStream), eEnc); } /************************************************************************* @@ -1517,19 +1517,7 @@ SvStream& SvStream::ReadByteString( UniString& rStr, rtl_TextEncoding eSrcCharSe return *this; } - ByteString aStr; - ReadByteString( aStr ); - rStr = UniString( aStr, eSrcCharSet ); - return *this; -} - -// ----------------------------------------------------------------------- - -SvStream& SvStream::ReadByteString( ByteString& rStr ) -{ - sal_uInt16 nLen = 0; - operator>>( nLen ); - rStr = read_uInt8s_AsOString(*this, nLen); + rStr = read_lenPrefixed_uInt8s_ToOUString(*this, eSrcCharSet); return *this; } @@ -1563,17 +1551,7 @@ SvStream& SvStream::WriteByteString( const UniString& rStr, rtl_TextEncoding eDe return *this; } - return WriteByteString(rtl::OUStringToOString(rStr, eDestCharSet)); -} - -// ----------------------------------------------------------------------- - -SvStream& SvStream::WriteByteString( const ByteString& rStr) -{ - sal_uInt16 nLen = rStr.Len(); - operator<< ( nLen ); - if( nLen != 0 ) - Write( rStr.GetBuffer(), nLen ); + write_lenPrefixed_uInt8s_FromOUString(*this, rStr, eDestCharSet); return *this; } @@ -2454,7 +2432,7 @@ void SvDataCopyStream::Assign( const SvDataCopyStream& ) } //Create a OString of nLen bytes from rStream -rtl::OString read_uInt8s_AsOString(SvStream& rStrm, sal_Size nLen) +rtl::OString read_uInt8s_ToOString(SvStream& rStrm, sal_Size nLen) { using comphelper::string::rtl_string_alloc; @@ -2481,7 +2459,7 @@ rtl::OString read_uInt8s_AsOString(SvStream& rStrm, sal_Size nLen) } //Create a OUString of nLen little endian sal_Unicodes from rStream -rtl::OUString read_LEuInt16s_AsOUString(SvStream& rStrm, sal_Size nLen) +rtl::OUString read_LEuInt16s_ToOUString(SvStream& rStrm, sal_Size nLen) { using comphelper::string::rtl_uString_alloc; diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx index 30a23372661c..636df96a6c66 100644 --- a/vcl/source/gdi/animate.cxx +++ b/vcl/source/gdi/animate.cxx @@ -795,7 +795,6 @@ SvStream& operator<<( SvStream& rOStm, const Animation& rAnimation ) if( nCount ) { - const ByteString aDummyStr; const sal_uInt32 nDummy32 = 0UL; // Falls keine BitmapEx gesetzt wurde, schreiben wir @@ -825,7 +824,7 @@ SvStream& operator<<( SvStream& rOStm, const Animation& rAnimation ) rOStm << nDummy32; // unbenutzt rOStm << nDummy32; // unbenutzt rOStm << nDummy32; // unbenutzt - rOStm.WriteByteString(aDummyStr); // unbenutzt + write_lenPrefixed_uInt8s_FromOString(rOStm, rtl::OString()); // dummy rOStm << nRest; // Anzahl der Strukturen, die noch _folgen_ } } @@ -872,7 +871,6 @@ SvStream& operator>>( SvStream& rIStm, Animation& rAnimation ) { AnimationBitmap aAnimBmp; BitmapEx aBmpEx; - ByteString aDummyStr; sal_uInt32 nTmp32; sal_uInt16 nTmp16; sal_uInt8 cTmp; @@ -890,7 +888,7 @@ SvStream& operator>>( SvStream& rIStm, Animation& rAnimation ) rIStm >> nTmp32; // unbenutzt rIStm >> nTmp32; // unbenutzt rIStm >> nTmp32; // unbenutzt - rIStm.ReadByteString(aDummyStr); // unbenutzt + read_lenPrefixed_uInt8s_ToOString(rIStm); // unbenutzt rIStm >> nTmp16; // Rest zu lesen rAnimation.Insert( aAnimBmp ); diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx index 7efd1f6f6e82..738a5907172b 100644 --- a/vcl/source/gdi/cvtsvm.cxx +++ b/vcl/source/gdi/cvtsvm.cxx @@ -877,7 +877,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) rIStm >> aPt >> nIndex >> nLen >> nTmp; if ( nTmp && ( static_cast< sal_uInt32 >( nTmp ) < ( SAL_MAX_UINT16 - 1 ) ) ) { - rtl::OString aByteStr = read_uInt8s_AsOString(rIStm, nTmp); + rtl::OString aByteStr = read_uInt8s_ToOString(rIStm, nTmp); sal_uInt8 nTerminator = 0; rIStm >> nTerminator; DBG_ASSERT( nTerminator == 0, "expected string to be NULL terminated" ); @@ -899,7 +899,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) rIStm >> aPt >> nIndex >> nLen >> nTmp >> nAryLen; if ( nTmp && ( static_cast< sal_uInt32 >( nTmp ) < ( SAL_MAX_UINT16 - 1 ) ) ) { - rtl::OString aByteStr = read_uInt8s_AsOString(rIStm, nTmp); + rtl::OString aByteStr = read_uInt8s_ToOString(rIStm, nTmp); sal_uInt8 nTerminator = 0; rIStm >> nTerminator; DBG_ASSERT( nTerminator == 0, "expected string to be NULL terminated" ); @@ -962,7 +962,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) rIStm >> aPt >> nIndex >> nLen >> nTmp >> nWidth; if ( nTmp && ( static_cast< sal_uInt32 >( nTmp ) < ( SAL_MAX_INT16 - 1 ) ) ) { - rtl::OString aByteStr = read_uInt8s_AsOString(rIStm, nTmp); + rtl::OString aByteStr = read_uInt8s_ToOString(rIStm, nTmp); sal_uInt8 nTerminator = 0; rIStm >> nTerminator; DBG_ASSERT( nTerminator == 0, "expected string to be NULL terminated" ); @@ -1322,13 +1322,12 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) case( GDI_COMMENT_COMMENT ): { - ByteString aComment; sal_Int32 nValue; sal_uInt32 nDataSize; sal_uInt8* pData; sal_Int32 nFollowingActionCount; - rIStm.ReadByteString(aComment); + rtl::OString aComment = read_lenPrefixed_uInt8s_ToOString(rIStm); rIStm >> nValue >> nDataSize; if( nDataSize ) @@ -2413,7 +2412,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, rOStm.SeekRel( 4 ); // write data - rOStm.WriteByteString(pA->GetComment()); + write_lenPrefixed_uInt8s_FromOString(rOStm, pA->GetComment()); rOStm << pA->GetValue() << nDataSize; if( nDataSize ) diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx index 14b86b236068..796659cfdaa5 100644 --- a/vcl/source/gdi/jobset.cxx +++ b/vcl/source/gdi/jobset.cxx @@ -410,13 +410,21 @@ SvStream& operator<<( SvStream& rOStream, const JobSetup& rJobSetup ) rOStream.WriteByteString( it->first, RTL_TEXTENCODING_UTF8 ); rOStream.WriteByteString( it->second, RTL_TEXTENCODING_UTF8 ); } - rOStream.WriteByteString( "COMPAT_DUPLEX_MODE" ) ; + write_lenPrefixed_uInt8s_FromOString(rOStream, "COMPAT_DUPLEX_MODE"); switch( pJobData->meDuplexMode ) { - case DUPLEX_UNKNOWN: rOStream.WriteByteString( "DUPLEX_UNKNOWN" );break; - case DUPLEX_OFF: rOStream.WriteByteString( "DUPLEX_OFF" );break; - case DUPLEX_SHORTEDGE: rOStream.WriteByteString( "DUPLEX_SHORTEDGE" );break; - case DUPLEX_LONGEDGE: rOStream.WriteByteString( "DUPLEX_LONGEDGE" );break; + case DUPLEX_UNKNOWN: + write_lenPrefixed_uInt8s_FromOString(rOStream, "DUPLEX_UNKNOWN"); + break; + case DUPLEX_OFF: + write_lenPrefixed_uInt8s_FromOString(rOStream, "DUPLEX_OFF"); + break; + case DUPLEX_SHORTEDGE: + write_lenPrefixed_uInt8s_FromOString(rOStream, "DUPLEX_SHORTEDGE"); + break; + case DUPLEX_LONGEDGE: + write_lenPrefixed_uInt8s_FromOString(rOStream, "DUPLEX_LONGEDGE"); + break; } nLen = sal::static_int_cast(rOStream.Tell() - nPos); rOStream.Seek( nPos ); diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx index a0b6c3b27c6b..9961705cbb6c 100644 --- a/vcl/source/gdi/metaact.cxx +++ b/vcl/source/gdi/metaact.cxx @@ -4198,7 +4198,7 @@ sal_Bool MetaCommentAction::Compare( const MetaAction& rMetaAction ) const void MetaCommentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); - rOStm.WriteByteString(maComment); + write_lenPrefixed_uInt8s_FromOString(rOStm, maComment); rOStm << mnValue << mnDataSize; if ( mnDataSize ) @@ -4210,13 +4210,10 @@ void MetaCommentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) void MetaCommentAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); - ByteString sTmp; - rIStm.ReadByteString(sTmp); - maComment = sTmp; + maComment = read_lenPrefixed_uInt8s_ToOString(rIStm); rIStm >> mnValue >> mnDataSize; - if( mpData ) - delete[] mpData; + delete[] mpData; if( mnDataSize ) { -- cgit v1.2.3 From 5c24789ca33d7b2b0c39626208cf0708fb470d95 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 21 Dec 2011 10:45:54 +0000 Subject: disentangle Read/WriteByteString OUString variants The ones which use a definite 8-bit encoding read/write pascal-style strings with a 16bit length prefix. The ones which use a definite 16-bit encoding read/write pascal-style UTF-16 strings with a 32bit length prefix, i.e. not ByteStrings at all The "I dunno" ones might be UTF-16 strings or 8-bit strings, depending on the charset. Rename to ReadUniOrByteString like the other similar horrors to flag this misery --- basic/source/basmgr/basmgr.cxx | 11 ++++--- basic/source/classes/image.cxx | 16 +++++----- basic/source/classes/sbxmod.cxx | 4 +-- basic/source/runtime/methods1.cxx | 4 +-- basic/source/sbx/sbxbase.cxx | 18 +++++++---- basic/source/sbx/sbxcoll.cxx | 6 ++-- basic/source/sbx/sbxobj.cxx | 14 +++++---- basic/source/sbx/sbxvalue.cxx | 23 +++++++------- basic/source/sbx/sbxvar.cxx | 19 +++++++----- dbaccess/source/ui/tabledesign/TableRow.cxx | 16 +++++----- editeng/source/editeng/editobj.cxx | 6 ++-- editeng/source/items/bulitem.cxx | 12 ++++---- editeng/source/items/flditem.cxx | 4 +-- editeng/source/items/frmitems.cxx | 8 ++--- editeng/source/items/numitem.cxx | 6 ++-- editeng/source/items/textitem.cxx | 16 +++++----- idl/source/objects/module.cxx | 8 ++--- sc/source/core/data/patattr.cxx | 8 ++--- sc/source/core/tool/autoform.cxx | 14 ++++++--- sc/source/core/tool/ddelink.cxx | 12 ++++---- sc/source/core/tool/zforauto.cxx | 4 +-- sd/source/filter/html/pubdlg.cxx | 48 +++++++++++++++++++---------- sfx2/source/appl/appmisc.cxx | 4 +-- sot/source/sdstor/ucbstorage.cxx | 2 +- svl/source/items/poolitem.cxx | 8 ++--- svl/source/numbers/zformat.cxx | 10 +++--- svtools/source/misc/templatefoldercache.cxx | 6 ++-- svtools/source/misc/transfer.cxx | 8 ++--- svx/source/items/hlnkitem.cxx | 32 +++++++++---------- svx/source/items/pageitem.cxx | 4 +-- sw/source/core/doc/tblafmt.cxx | 14 +++++---- sw/source/ui/config/uinums.cxx | 24 +++++++-------- tools/inc/tools/stream.hxx | 11 ++++--- tools/source/inet/inetmsg.cxx | 4 +-- tools/source/stream/stream.cxx | 4 +-- vcl/source/gdi/font.cxx | 8 ++--- vcl/source/gdi/jobset.cxx | 9 +++--- vcl/source/gdi/metaact.cxx | 16 +++++----- vcl/source/gdi/print.cxx | 21 +++++-------- vcl/source/gdi/rendergraphic.cxx | 6 ++-- vcl/win/source/gdi/salgdi3.cxx | 13 ++++---- 41 files changed, 257 insertions(+), 224 deletions(-) (limited to 'sd') diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx index e6c829adbe2c..9052458e84db 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -643,17 +643,17 @@ BasicLibInfo* BasicLibInfo::Create( SotStorageStream& rSStream ) // The name of the lib... String aName; - rSStream.ReadByteString(aName); + rSStream.ReadUniOrByteString(aName, rSStream.GetStreamCharSet()); pInfo->SetLibName( aName ); // Absolute path... String aStorageName; - rSStream.ReadByteString(aStorageName); + rSStream.ReadUniOrByteString(aStorageName, rSStream.GetStreamCharSet()); pInfo->SetStorageName( aStorageName ); // Relative path... String aRelStorageName; - rSStream.ReadByteString(aRelStorageName); + rSStream.ReadUniOrByteString(aRelStorageName, rSStream.GetStreamCharSet()); pInfo->SetRelStorageName( aRelStorageName ); if ( nVer >= 2 ) @@ -1041,7 +1041,7 @@ void BasicManager::LoadOldBasicManager( SotStorage& rStorage ) } xManagerStream->Seek( nBasicEndOff+1 ); // +1: 0x00 as separator String aLibs; - xManagerStream->ReadByteString(aLibs); + xManagerStream->ReadUniOrByteString(aLibs, xManagerStream->GetStreamCharSet()); xManagerStream->SetBufferSize( 0 ); xManagerStream.Clear(); // Close stream @@ -1235,7 +1235,8 @@ sal_Bool BasicManager::ImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* pCurSt if ( ( nPasswordMarker == PASSWORD_MARKER ) && !xBasicStream->IsEof() ) { String aPassword; - xBasicStream->ReadByteString(aPassword); + xBasicStream->ReadUniOrByteString(aPassword, + xBasicStream->GetStreamCharSet()); pLibInfo->SetPassword( aPassword ); } xBasicStream->SetCryptMaskKey(rtl::OString()); diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx index 1208184b5672..79b3765fa1fc 100644 --- a/basic/source/classes/image.cxx +++ b/basic/source/classes/image.cxx @@ -147,15 +147,15 @@ sal_Bool SbiImage::Load( SvStream& r, sal_uInt32& nVersion ) switch( nSign ) { case B_NAME: - r.ReadByteString( aName, eCharSet ); + r.ReadUniOrByteString( aName, eCharSet ); break; case B_COMMENT: - r.ReadByteString( aComment, eCharSet ); + r.ReadUniOrByteString( aComment, eCharSet ); break; case B_SOURCE: { String aTmp; - r.ReadByteString( aTmp, eCharSet ); + r.ReadUniOrByteString( aTmp, eCharSet ); aOUSource = aTmp; break; } @@ -164,7 +164,7 @@ sal_Bool SbiImage::Load( SvStream& r, sal_uInt32& nVersion ) for( sal_uInt16 j = 0 ; j < nCount ; j++ ) { String aTmp; - r.ReadByteString( aTmp, eCharSet ); + r.ReadUniOrByteString( aTmp, eCharSet ); aOUSource += aTmp; } break; @@ -274,14 +274,14 @@ sal_Bool SbiImage::Save( SvStream& r, sal_uInt32 nVer ) if( aName.Len() && SbiGood( r ) ) { nPos = SbiOpenRecord( r, B_NAME, 1 ); - r.WriteByteString( aName, eCharSet ); + r.WriteUniOrByteString( aName, eCharSet ); SbiCloseRecord( r, nPos ); } // Comment? if( aComment.Len() && SbiGood( r ) ) { nPos = SbiOpenRecord( r, B_COMMENT, 1 ); - r.WriteByteString( aComment, eCharSet ); + r.WriteUniOrByteString( aComment, eCharSet ); SbiCloseRecord( r, nPos ); } // Source? @@ -295,7 +295,7 @@ sal_Bool SbiImage::Save( SvStream& r, sal_uInt32 nVer ) aTmp = aOUSource.copy( 0, nMaxUnitSize ); else aTmp = aOUSource; - r.WriteByteString( aTmp, eCharSet ); + r.WriteUniOrByteString( aTmp, eCharSet ); SbiCloseRecord( r, nPos ); if( nLen > STRING_MAXLEN ) @@ -309,7 +309,7 @@ sal_Bool SbiImage::Save( SvStream& r, sal_uInt32 nVer ) (nRemainingLen > nMaxUnitSize) ? nMaxUnitSize : nRemainingLen; String aTmp2 = aOUSource.copy( (i+1) * nMaxUnitSize, nCopyLen ); nRemainingLen -= nCopyLen; - r.WriteByteString( aTmp2, eCharSet ); + r.WriteUniOrByteString( aTmp2, eCharSet ); } SbiCloseRecord( r, nPos ); } diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index 07194fafc966..975ecc20a0a2 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -2002,7 +2002,7 @@ sal_Bool SbJScriptModule::LoadData( SvStream& rStrm, sal_uInt16 nVer ) // Get the source string String aTmp; - rStrm.ReadByteString( aTmp, osl_getThreadTextEncoding() ); + rStrm.ReadUniOrByteString( aTmp, osl_getThreadTextEncoding() ); aOUSource = aTmp; return sal_True; } @@ -2014,7 +2014,7 @@ sal_Bool SbJScriptModule::StoreData( SvStream& rStrm ) const // Write the source string String aTmp = aOUSource; - rStrm.WriteByteString( aTmp, osl_getThreadTextEncoding() ); + rStrm.WriteUniOrByteString( aTmp, osl_getThreadTextEncoding() ); return sal_True; } diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx index 2ff6990e215d..5b25252a780d 100644 --- a/basic/source/runtime/methods1.cxx +++ b/basic/source/runtime/methods1.cxx @@ -991,7 +991,7 @@ sal_Bool lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm, { if( bIsVariant ) *pStrm << (sal_uInt16)SbxSTRING; - pStrm->WriteByteString( rStr, osl_getThreadTextEncoding() ); + pStrm->WriteUniOrByteString( rStr, osl_getThreadTextEncoding() ); } else { @@ -1107,7 +1107,7 @@ sal_Bool lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm, case SbxLPSTR: { String aStr; - pStrm->ReadByteString( aStr, osl_getThreadTextEncoding() ); + pStrm->ReadUniOrByteString( aStr, osl_getThreadTextEncoding() ); rVar.PutString( aStr ); } break; diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx index 711efdcb5afc..7ab2d6c15b37 100644 --- a/basic/source/sbx/sbxbase.cxx +++ b/basic/source/sbx/sbxbase.cxx @@ -383,15 +383,18 @@ sal_Bool SbxInfo::LoadData( SvStream& rStrm, sal_uInt16 nVer ) { aParams.Remove( 0, aParams.Count() ); sal_uInt16 nParam; - rStrm.ReadByteString( aComment, RTL_TEXTENCODING_ASCII_US ); - rStrm.ReadByteString( aHelpFile, RTL_TEXTENCODING_ASCII_US ); + aComment = read_lenPrefixed_uInt8s_ToOUString(rStrm, + RTL_TEXTENCODING_ASCII_US); + aHelpFile = read_lenPrefixed_uInt8s_ToOUString(rStrm, + RTL_TEXTENCODING_ASCII_US); rStrm >> nHelpId >> nParam; while( nParam-- ) { XubString aName; sal_uInt16 nType, nFlags; sal_uInt32 nUserData = 0; - rStrm.ReadByteString( aName, RTL_TEXTENCODING_ASCII_US ); + aName = read_lenPrefixed_uInt8s_ToOUString(rStrm, + RTL_TEXTENCODING_ASCII_US); rStrm >> nType >> nFlags; if( nVer > 1 ) rStrm >> nUserData; @@ -404,13 +407,16 @@ sal_Bool SbxInfo::LoadData( SvStream& rStrm, sal_uInt16 nVer ) sal_Bool SbxInfo::StoreData( SvStream& rStrm ) const { - rStrm.WriteByteString( aComment, RTL_TEXTENCODING_ASCII_US ); - rStrm.WriteByteString( aHelpFile, RTL_TEXTENCODING_ASCII_US ); + write_lenPrefixed_uInt8s_FromOUString(rStrm, aComment, + RTL_TEXTENCODING_ASCII_US ); + write_lenPrefixed_uInt8s_FromOUString(rStrm, aHelpFile, + RTL_TEXTENCODING_ASCII_US); rStrm << nHelpId << aParams.Count(); for( sal_uInt16 i = 0; i < aParams.Count(); i++ ) { SbxParamInfo* p = aParams.GetObject( i ); - rStrm.WriteByteString( p->aName, RTL_TEXTENCODING_ASCII_US ); + write_lenPrefixed_uInt8s_FromOUString(rStrm, p->aName, + RTL_TEXTENCODING_ASCII_US); rStrm << (sal_uInt16) p->eType << (sal_uInt16) p->nFlags << (sal_uInt32) p->nUserData; diff --git a/basic/source/sbx/sbxcoll.cxx b/basic/source/sbx/sbxcoll.cxx index 7803ee013b2f..97573876064c 100644 --- a/basic/source/sbx/sbxcoll.cxx +++ b/basic/source/sbx/sbxcoll.cxx @@ -279,7 +279,8 @@ sal_Bool SbxStdCollection::LoadData( SvStream& rStrm, sal_uInt16 nVer ) sal_Bool bRes = SbxCollection::LoadData( rStrm, nVer ); if( bRes ) { - rStrm.ReadByteString( aElemClass, RTL_TEXTENCODING_ASCII_US ); + aElemClass = read_lenPrefixed_uInt8s_ToOUString(rStrm, + RTL_TEXTENCODING_ASCII_US); rStrm >> bAddRemoveOk; } return bRes; @@ -290,7 +291,8 @@ sal_Bool SbxStdCollection::StoreData( SvStream& rStrm ) const sal_Bool bRes = SbxCollection::StoreData( rStrm ); if( bRes ) { - rStrm.WriteByteString( aElemClass, RTL_TEXTENCODING_ASCII_US ); + write_lenPrefixed_uInt8s_FromOUString(rStrm, aElemClass, + RTL_TEXTENCODING_ASCII_US); rStrm << bAddRemoveOk; } return bRes; diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx index 81574efd0fba..0c98fca20049 100644 --- a/basic/source/sbx/sbxobj.cxx +++ b/basic/source/sbx/sbxobj.cxx @@ -591,8 +591,10 @@ sal_Bool SbxObject::LoadData( SvStream& rStrm, sal_uInt16 nVer ) aData.pObj = this; sal_uInt32 nSize; XubString aDfltProp; - rStrm.ReadByteString( aClassName, RTL_TEXTENCODING_ASCII_US ); - rStrm.ReadByteString( aDfltProp, RTL_TEXTENCODING_ASCII_US ); + aClassName = read_lenPrefixed_uInt8s_ToOUString(rStrm, + RTL_TEXTENCODING_ASCII_US); + aDfltProp = read_lenPrefixed_uInt8s_ToOUString(rStrm, + RTL_TEXTENCODING_ASCII_US); sal_uIntPtr nPos = rStrm.Tell(); rStrm >> nSize; if( !LoadPrivateData( rStrm, nVer ) ) @@ -620,8 +622,8 @@ sal_Bool SbxObject::StoreData( SvStream& rStrm ) const XubString aDfltProp; if( pDfltProp ) aDfltProp = pDfltProp->GetName(); - rStrm.WriteByteString( aClassName, RTL_TEXTENCODING_ASCII_US ); - rStrm.WriteByteString( aDfltProp, RTL_TEXTENCODING_ASCII_US ); + write_lenPrefixed_uInt8s_FromOUString(rStrm, aClassName, RTL_TEXTENCODING_ASCII_US); + write_lenPrefixed_uInt8s_FromOUString(rStrm, aDfltProp, RTL_TEXTENCODING_ASCII_US); sal_uIntPtr nPos = rStrm.Tell(); rStrm << (sal_uInt32) 0L; if( !StorePrivateData( rStrm ) ) @@ -797,7 +799,7 @@ void SbxObject::Dump( SvStream& rStrm, sal_Bool bFill ) aLine += aAttrs2; if( !pVar->IsA( TYPE(SbxMethod) ) ) aLine.AppendAscii( " !! Not a Method !!" ); - rStrm.WriteByteString( aLine, RTL_TEXTENCODING_ASCII_US ); + write_lenPrefixed_uInt8s_FromOUString(rStrm, aLine, RTL_TEXTENCODING_ASCII_US); // Output also the object at object-methods if ( pVar->GetValues_Impl().eType == SbxOBJECT && @@ -830,7 +832,7 @@ void SbxObject::Dump( SvStream& rStrm, sal_Bool bFill ) aLine += aAttrs3; if( !pVar->IsA( TYPE(SbxProperty) ) ) aLine.AppendAscii( " !! Not a Property !!" ); - rStrm.WriteByteString( aLine, RTL_TEXTENCODING_ASCII_US ); + write_lenPrefixed_uInt8s_FromOUString(rStrm, aLine, RTL_TEXTENCODING_ASCII_US); // output also the object at object properties if ( pVar->GetValues_Impl().eType == SbxOBJECT && diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx index 0d6aa84e19c7..692959aa9c18 100644 --- a/basic/source/sbx/sbxvalue.cxx +++ b/basic/source/sbx/sbxvalue.cxx @@ -1479,8 +1479,8 @@ sal_Bool SbxValue::LoadData( SvStream& r, sal_uInt16 ) case SbxSINGLE: { // Floats as ASCII - XubString aVal; - r.ReadByteString( aVal, RTL_TEXTENCODING_ASCII_US ); + XubString aVal = read_lenPrefixed_uInt8s_ToOUString(r, + RTL_TEXTENCODING_ASCII_US); double d; SbxDataType t; if( ImpScan( aVal, d, t, NULL ) != SbxERR_OK || t == SbxDOUBLE ) @@ -1495,8 +1495,8 @@ sal_Bool SbxValue::LoadData( SvStream& r, sal_uInt16 ) case SbxDOUBLE: { // Floats as ASCII - XubString aVal; - r.ReadByteString( aVal, RTL_TEXTENCODING_ASCII_US ); + XubString aVal = read_lenPrefixed_uInt8s_ToOUString(r, + RTL_TEXTENCODING_ASCII_US); SbxDataType t; if( ImpScan( aVal, aData.nDouble, t, NULL ) != SbxERR_OK ) { @@ -1524,9 +1524,9 @@ sal_Bool SbxValue::LoadData( SvStream& r, sal_uInt16 ) } case SbxSTRING: { - XubString aVal; - r.ReadByteString( aVal, RTL_TEXTENCODING_ASCII_US ); - if( aVal.Len() ) + rtl::OUString aVal = read_lenPrefixed_uInt8s_ToOUString(r, + RTL_TEXTENCODING_ASCII_US); + if( aVal.getLength() ) aData.pOUString = new ::rtl::OUString( aVal ); else aData.pOUString = NULL; // JSM 1995-09-22 @@ -1621,12 +1621,12 @@ sal_Bool SbxValue::StoreData( SvStream& r ) const case SbxDATE: // #49935: Save as double, elsewise an error during the read in ((SbxValue*)this)->aData.eType = (SbxDataType)( ( nType & 0xF000 ) | SbxDOUBLE ); - r.WriteByteString( GetCoreString(), RTL_TEXTENCODING_ASCII_US ); + write_lenPrefixed_uInt8s_FromOUString(r, GetCoreString(), RTL_TEXTENCODING_ASCII_US); ((SbxValue*)this)->aData.eType = (SbxDataType)nType; break; case SbxSINGLE: case SbxDOUBLE: - r.WriteByteString( GetCoreString(), RTL_TEXTENCODING_ASCII_US ); + write_lenPrefixed_uInt8s_FromOUString(r, GetCoreString(), RTL_TEXTENCODING_ASCII_US); break; case SbxSALUINT64: case SbxSALINT64: @@ -1643,12 +1643,11 @@ sal_Bool SbxValue::StoreData( SvStream& r ) const case SbxSTRING: if( aData.pOUString ) { - r.WriteByteString( *aData.pOUString, RTL_TEXTENCODING_ASCII_US ); + write_lenPrefixed_uInt8s_FromOUString(r, *aData.pOUString, RTL_TEXTENCODING_ASCII_US); } else { - String aEmpty; - r.WriteByteString( aEmpty, RTL_TEXTENCODING_ASCII_US ); + write_lenPrefixed_uInt8s_FromOUString(r, rtl::OUString(), RTL_TEXTENCODING_ASCII_US); } break; case SbxERROR: diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx index 58b3cb73f9d4..6ca253355603 100644 --- a/basic/source/sbx/sbxvar.cxx +++ b/basic/source/sbx/sbxvar.cxx @@ -445,7 +445,8 @@ sal_Bool SbxVariable::LoadData( SvStream& rStrm, sal_uInt16 nVer ) { if( !SbxValue::LoadData( rStrm, nVer ) ) return sal_False; - rStrm.ReadByteString( maName, RTL_TEXTENCODING_ASCII_US ); + maName = read_lenPrefixed_uInt8s_ToOUString(rStrm, + RTL_TEXTENCODING_ASCII_US); sal_uInt32 nTemp; rStrm >> nTemp; nUserData = nTemp; @@ -454,7 +455,8 @@ sal_Bool SbxVariable::LoadData( SvStream& rStrm, sal_uInt16 nVer ) { rStrm.SeekRel( -1L ); rStrm >> nType; - rStrm.ReadByteString( maName, RTL_TEXTENCODING_ASCII_US ); + maName = read_lenPrefixed_uInt8s_ToOUString(rStrm, + RTL_TEXTENCODING_ASCII_US); sal_uInt32 nTemp; rStrm >> nTemp; nUserData = nTemp; @@ -477,7 +479,8 @@ sal_Bool SbxVariable::LoadData( SvStream& rStrm, sal_uInt16 nVer ) case SbxSINGLE: { // Floats as ASCII - rStrm.ReadByteString( aTmpString, RTL_TEXTENCODING_ASCII_US ); + aTmpString = read_lenPrefixed_uInt8s_ToOUString( + rStrm, RTL_TEXTENCODING_ASCII_US); double d; SbxDataType t; if( ImpScan( aTmpString, d, t, NULL ) != SbxERR_OK || t == SbxDOUBLE ) @@ -492,7 +495,8 @@ sal_Bool SbxVariable::LoadData( SvStream& rStrm, sal_uInt16 nVer ) case SbxDOUBLE: { // Floats as ASCII - rStrm.ReadByteString( aTmpString, RTL_TEXTENCODING_ASCII_US ); + aTmpString = read_lenPrefixed_uInt8s_ToOUString(rStrm, + RTL_TEXTENCODING_ASCII_US); SbxDataType t; if( ImpScan( aTmpString, aTmp.nDouble, t, NULL ) != SbxERR_OK ) { @@ -502,8 +506,8 @@ sal_Bool SbxVariable::LoadData( SvStream& rStrm, sal_uInt16 nVer ) break; } case SbxSTRING: - rStrm.ReadByteString( aTmpString, RTL_TEXTENCODING_ASCII_US ); - aVal = aTmpString; + aVal = read_lenPrefixed_uInt8s_ToOUString(rStrm, + RTL_TEXTENCODING_ASCII_US); break; case SbxEMPTY: case SbxNULL: @@ -561,7 +565,8 @@ sal_Bool SbxVariable::StoreData( SvStream& rStrm ) const bValStore = SbxValue::StoreData( rStrm ); if( !bValStore ) return sal_False; - rStrm.WriteByteString( maName, RTL_TEXTENCODING_ASCII_US ); + write_lenPrefixed_uInt8s_FromOUString(rStrm, maName, + RTL_TEXTENCODING_ASCII_US); rStrm << (sal_uInt32)nUserData; if( pInfo.Is() ) { diff --git a/dbaccess/source/ui/tabledesign/TableRow.cxx b/dbaccess/source/ui/tabledesign/TableRow.cxx index b4ed28a4f0f4..35be52c28521 100644 --- a/dbaccess/source/ui/tabledesign/TableRow.cxx +++ b/dbaccess/source/ui/tabledesign/TableRow.cxx @@ -128,9 +128,9 @@ namespace dbaui if(pFieldDesc) { _rStr << (sal_Int32)1; - _rStr.WriteByteString(pFieldDesc->GetName()); - _rStr.WriteByteString(pFieldDesc->GetDescription()); - _rStr.WriteByteString(pFieldDesc->GetHelpText()); + _rStr.WriteUniOrByteString(pFieldDesc->GetName(), _rStr.GetStreamCharSet()); + _rStr.WriteUniOrByteString(pFieldDesc->GetDescription(), _rStr.GetStreamCharSet()); + _rStr.WriteUniOrByteString(pFieldDesc->GetHelpText(), _rStr.GetStreamCharSet()); double nValue = 0.0; Any aValue = pFieldDesc->GetControlDefault(); if ( aValue >>= nValue ) @@ -141,7 +141,7 @@ namespace dbaui else { _rStr << sal_Int32(2); - _rStr.WriteByteString(::comphelper::getString(aValue)); + _rStr.WriteUniOrByteString(::comphelper::getString(aValue), _rStr.GetStreamCharSet()); } _rStr << pFieldDesc->GetType(); @@ -170,12 +170,12 @@ namespace dbaui OFieldDescription* pFieldDesc = new OFieldDescription(); _rRow.m_pActFieldDescr = pFieldDesc; String sValue; - _rStr.ReadByteString(sValue); + _rStr.ReadUniOrByteString(sValue, _rStr.GetStreamCharSet()); pFieldDesc->SetName(sValue); - _rStr.ReadByteString(sValue); + _rStr.ReadUniOrByteString(sValue, _rStr.GetStreamCharSet()); pFieldDesc->SetDescription(sValue); - _rStr.ReadByteString(sValue); + _rStr.ReadUniOrByteString(sValue, _rStr.GetStreamCharSet()); pFieldDesc->SetHelpText(sValue); _rStr >> nValue; @@ -190,7 +190,7 @@ namespace dbaui break; } case 2: - _rStr.ReadByteString(sValue); + _rStr.ReadUniOrByteString(sValue, _rStr.GetStreamCharSet()); aControlDefault <<= ::rtl::OUString(sValue); break; } diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx index 0fd144b42514..8435e66d923f 100644 --- a/editeng/source/editeng/editobj.cxx +++ b/editeng/source/editeng/editobj.cxx @@ -1230,7 +1230,7 @@ void BinTextObject::CreateData( SvStream& rIStream ) pC->GetText() = rtl::OStringToOUString(aByteString, eSrcEncoding); // StyleName and Family... - rIStream.ReadByteString( pC->GetStyle(), eSrcEncoding ); + rIStream.ReadUniOrByteString( pC->GetStyle(), eSrcEncoding ); sal_uInt16 nStyleFamily; rIStream >> nStyleFamily; pC->GetFamily() = (SfxStyleFamily)nStyleFamily; @@ -1522,10 +1522,10 @@ void BinTextObject::CreateData300( SvStream& rIStream ) ContentInfo* pC = CreateAndInsertContent(); // The Text... - rIStream.ReadByteString( pC->GetText() ); + rIStream.ReadUniOrByteString( pC->GetText(), rIStream.GetStreamCharSet() ); // StyleName and Family... - rIStream.ReadByteString( pC->GetStyle() ); + rIStream.ReadUniOrByteString( pC->GetStyle(), rIStream.GetStreamCharSet() ); sal_uInt16 nStyleFamily; rIStream >> nStyleFamily; pC->GetFamily() = (SfxStyleFamily)nStyleFamily; diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx index 2d0e066e4091..caca392a6d18 100644 --- a/editeng/source/items/bulitem.cxx +++ b/editeng/source/items/bulitem.cxx @@ -64,7 +64,7 @@ void SvxBulletItem::StoreFont( SvStream& rStream, const Font& rFont ) nTemp = (sal_uInt16)rFont.GetItalic(); rStream << nTemp; // UNICODE: rStream << rFont.GetName(); - rStream.WriteByteString(rFont.GetName()); + rStream.WriteUniOrByteString(rFont.GetName(), rStream.GetStreamCharSet()); rStream << rFont.IsOutline(); rStream << rFont.IsShadow(); @@ -94,7 +94,7 @@ Font SvxBulletItem::CreateFont( SvStream& rStream, sal_uInt16 nVer ) // UNICODE: rStream >> aName; aFont.SetName( aName ); String aName; - rStream.ReadByteString(aName); + rStream.ReadUniOrByteString(aName, rStream.GetStreamCharSet()); aFont.SetName( aName ); if( nVer == 1 ) @@ -217,10 +217,10 @@ SvxBulletItem::SvxBulletItem( SvStream& rStrm, sal_uInt16 _nWhich ) : rStrm >> nScale; // UNICODE: rStrm >> aPrevText; - rStrm.ReadByteString(aPrevText); + rStrm.ReadUniOrByteString(aPrevText, rStrm.GetStreamCharSet()); // UNICODE: rStrm >> aFollowText; - rStrm.ReadByteString(aFollowText); + rStrm.ReadUniOrByteString(aFollowText, rStrm.GetStreamCharSet()); nValidMask = 0xFFFF; } @@ -416,10 +416,10 @@ SvStream& SvxBulletItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) c rStrm << nScale; // UNICODE: rStrm << aPrevText; - rStrm.WriteByteString(aPrevText); + rStrm.WriteUniOrByteString(aPrevText, rStrm.GetStreamCharSet()); // UNICODE: rStrm << aFollowText; - rStrm.WriteByteString(aFollowText); + rStrm.WriteUniOrByteString(aFollowText, rStrm.GetStreamCharSet()); return rStrm; } diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx index 56b2d71f68fa..bafb976f057b 100644 --- a/editeng/source/items/flditem.cxx +++ b/editeng/source/items/flditem.cxx @@ -735,7 +735,7 @@ void SvxExtFileField::Load( SvPersistStream & rStm ) sal_uInt16 nType, nFormat; // UNICODE: rStm >> aFile; - rStm.ReadByteString(aFile); + rStm.ReadUniOrByteString(aFile, rStm.GetStreamCharSet()); rStm >> nType; rStm >> nFormat; @@ -749,7 +749,7 @@ void SvxExtFileField::Load( SvPersistStream & rStm ) void SvxExtFileField::Save( SvPersistStream & rStm ) { // UNICODE: rStm << aFile; - rStm.WriteByteString(aFile); + rStm.WriteUniOrByteString(aFile, rStm.GetStreamCharSet()); rStm << (sal_uInt16) eType; rStm << (sal_uInt16) eFormat; diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index addb3f630a68..18af4a61ec7b 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -3443,7 +3443,7 @@ SvxBrushItem::SvxBrushItem( SvStream& rStream, sal_uInt16 nVersion, { String aRel; // UNICODE: rStream >> aRel; - rStream.ReadByteString(aRel); + rStream.ReadUniOrByteString(aRel, rStream.GetStreamCharSet()); // TODO/MBA: how can we get a BaseURL here?! OSL_FAIL("No BaseURL!"); @@ -3456,7 +3456,7 @@ SvxBrushItem::SvxBrushItem( SvStream& rStream, sal_uInt16 nVersion, { pStrFilter = new String; // UNICODE: rStream >> *pStrFilter; - rStream.ReadByteString(*pStrFilter); + rStream.ReadUniOrByteString(*pStrFilter, rStream.GetStreamCharSet()); } rStream >> nPos; @@ -3834,12 +3834,12 @@ SvStream& SvxBrushItem::Store( SvStream& rStream , sal_uInt16 /*nItemVersion*/ ) // TODO/MBA: how to get a BaseURL?! String aRel = INetURLObject::GetRelURL( String(), *pStrLink ); // UNICODE: rStream << aRel; - rStream.WriteByteString(aRel); + rStream.WriteUniOrByteString(aRel, rStream.GetStreamCharSet()); } if ( pStrFilter ) { // UNICODE: rStream << *pStrFilter; - rStream.WriteByteString(*pStrFilter); + rStream.WriteUniOrByteString(*pStrFilter, rStream.GetStreamCharSet()); } rStream << (sal_Int8)eGraphicPos; return rStream; diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx index 8f71ff238b11..01fc4630ff23 100644 --- a/editeng/source/items/numitem.cxx +++ b/editeng/source/items/numitem.cxx @@ -219,9 +219,9 @@ SvStream& SvxNumberFormat::Store(SvStream &rStream, FontToSubsFontConverter pC rStream << nCharTextDistance; rtl_TextEncoding eEnc = osl_getThreadTextEncoding(); - rStream.WriteByteString(sPrefix, eEnc); - rStream.WriteByteString(sSuffix, eEnc); - rStream.WriteByteString(sCharStyleName, eEnc); + rStream.WriteUniOrByteString(sPrefix, eEnc); + rStream.WriteUniOrByteString(sSuffix, eEnc); + rStream.WriteUniOrByteString(sCharStyleName, eEnc); if(pGraphicBrush) { rStream << (sal_uInt16)1; diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index 4f5dc8dc29e6..e3069074573a 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -398,16 +398,16 @@ SvStream& SvxFontItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) co String aStoreFamilyName( GetFamilyName() ); if( bToBats ) aStoreFamilyName = String( "StarBats", sizeof("StarBats")-1, RTL_TEXTENCODING_ASCII_US ); - rStrm.WriteByteString(aStoreFamilyName); - rStrm.WriteByteString(GetStyleName()); + rStrm.WriteUniOrByteString(aStoreFamilyName, rStrm.GetStreamCharSet()); + rStrm.WriteUniOrByteString(GetStyleName(), rStrm.GetStreamCharSet()); // cach for EditEngine, only set while creating clipboard stream. if ( bEnableStoreUnicodeNames ) { sal_uInt32 nMagic = STORE_UNICODE_MAGIC_MARKER; rStrm << nMagic; - rStrm.WriteByteString( aStoreFamilyName, RTL_TEXTENCODING_UNICODE ); - rStrm.WriteByteString( GetStyleName(), RTL_TEXTENCODING_UNICODE ); + rStrm.WriteUniOrByteString( aStoreFamilyName, RTL_TEXTENCODING_UNICODE ); + rStrm.WriteUniOrByteString( GetStyleName(), RTL_TEXTENCODING_UNICODE ); } return rStrm; @@ -424,10 +424,10 @@ SfxPoolItem* SvxFontItem::Create(SvStream& rStrm, sal_uInt16) const rStrm >> eFontTextEncoding; // UNICODE: rStrm >> aName; - rStrm.ReadByteString(aName); + rStrm.ReadUniOrByteString(aName, rStrm.GetStreamCharSet()); // UNICODE: rStrm >> aStyle; - rStrm.ReadByteString(aStyle); + rStrm.ReadUniOrByteString(aStyle, rStrm.GetStreamCharSet()); // Set the "correct" textencoding eFontTextEncoding = (sal_uInt8)GetSOLoadTextEncoding( eFontTextEncoding, (sal_uInt16)rStrm.GetVersion() ); @@ -442,8 +442,8 @@ SfxPoolItem* SvxFontItem::Create(SvStream& rStrm, sal_uInt16) const rStrm >> nMagic; if ( nMagic == STORE_UNICODE_MAGIC_MARKER ) { - rStrm.ReadByteString( aName, RTL_TEXTENCODING_UNICODE ); - rStrm.ReadByteString( aStyle, RTL_TEXTENCODING_UNICODE ); + rStrm.ReadUniOrByteString( aName, RTL_TEXTENCODING_UNICODE ); + rStrm.ReadUniOrByteString( aStyle, RTL_TEXTENCODING_UNICODE ); } else { diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx index 4fd5c78f7f6f..e8e6542eb1b0 100644 --- a/idl/source/objects/module.cxx +++ b/idl/source/objects/module.cxx @@ -65,7 +65,7 @@ void SvMetaModule::Load( SvPersistStream & rStm ) rStm >> aTypeList; rStm >> aAttrList; // browser - rStm.ReadByteString( aIdlFileName ); + rStm.ReadUniOrByteString( aIdlFileName, rStm.GetStreamCharSet() ); aHelpFileName = read_lenPrefixed_uInt8s_ToOString(rStm); aSlotIdFile = read_lenPrefixed_uInt8s_ToOString(rStm); aModulePrefix = read_lenPrefixed_uInt8s_ToOString(rStm); @@ -90,7 +90,7 @@ void SvMetaModule::Save( SvPersistStream & rStm ) rStm << aTypeList; rStm << aAttrList; // browser - rStm.WriteByteString( aIdlFileName ); + rStm.WriteUniOrByteString( aIdlFileName, rStm.GetStreamCharSet() ); write_lenPrefixed_uInt8s_FromOString(rStm, aHelpFileName); write_lenPrefixed_uInt8s_FromOString(rStm, aSlotIdFile); write_lenPrefixed_uInt8s_FromOString(rStm, aModulePrefix); @@ -368,9 +368,9 @@ void SvMetaModule::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, { rOutStm << SvHash_module()->GetName().GetBuffer() << endl << '\"'; - rOutStm.WriteByteString( aBeginName.GetHexName() ); + rOutStm.WriteUniOrByteString( aBeginName.GetHexName(), rOutStm.GetStreamCharSet() ); rOutStm << '\"' << endl << '\"'; - rOutStm.WriteByteString( aEndName.GetHexName() ); + rOutStm.WriteUniOrByteString( aEndName.GetHexName(), rOutStm.GetStreamCharSet() ); rOutStm << '\"' << endl; SvMetaExtern::WriteSvIdl( rBase, rOutStm, nTab ); } diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx index fbd982db364a..93adcfeea75e 100644 --- a/sc/source/core/data/patattr.cxx +++ b/sc/source/core/data/patattr.cxx @@ -172,7 +172,7 @@ SfxPoolItem* ScPatternAttr::Create( SvStream& rStream, sal_uInt16 /* nVersion */ { short eFamDummy; pStr = new String; - rStream.ReadByteString( *pStr, rStream.GetStreamCharSet() ); + rStream.ReadUniOrByteString( *pStr, rStream.GetStreamCharSet() ); rStream >> eFamDummy; // wg. altem Dateiformat } else @@ -194,11 +194,11 @@ SvStream& ScPatternAttr::Store(SvStream& rStream, sal_uInt16 /* nItemVersion */) rStream << (sal_Bool)sal_True; if ( pStyle ) - rStream.WriteByteString( pStyle->GetName(), rStream.GetStreamCharSet() ); + rStream.WriteUniOrByteString( pStyle->GetName(), rStream.GetStreamCharSet() ); else if ( pName ) // wenn Style geloescht ist/war - rStream.WriteByteString( *pName, rStream.GetStreamCharSet() ); + rStream.WriteUniOrByteString( *pName, rStream.GetStreamCharSet() ); else - rStream.WriteByteString( ScGlobal::GetRscString(STR_STYLENAME_STANDARD), + rStream.WriteUniOrByteString( ScGlobal::GetRscString(STR_STYLENAME_STANDARD), rStream.GetStreamCharSet() ); rStream << (short)SFX_STYLE_FAMILY_PARA; // wg. altem Dateiformat diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx index fa7836bc604a..61b8355826f8 100644 --- a/sc/source/core/tool/autoform.cxx +++ b/sc/source/core/tool/autoform.cxx @@ -797,8 +797,14 @@ sal_Bool ScAutoFormatData::Load( SvStream& rStream, const ScAfVersions& rVersion (AUTOFORMAT_DATA_ID_504 <= nVer && nVer <= AUTOFORMAT_DATA_ID)) ) { // --- from 680/dr25 on: store strings as UTF-8 - CharSet eCharSet = (nVer >= AUTOFORMAT_ID_680DR25) ? RTL_TEXTENCODING_UTF8 : rStream.GetStreamCharSet(); - rStream.ReadByteString( aName, eCharSet ); + if (nVer >= AUTOFORMAT_ID_680DR25) + { + aName = read_lenPrefixed_uInt8s_ToOUString(rStream, + RTL_TEXTENCODING_UTF8); + } + else + rStream.ReadUniOrByteString( aName, rStream.GetStreamCharSet() ); + if( AUTOFORMAT_DATA_ID_552 <= nVer ) { rStream >> nStrResId; @@ -838,7 +844,7 @@ sal_Bool ScAutoFormatData::LoadOld( SvStream& rStream, const ScAfVersions& rVers bRet = (rStream.GetError() == 0); if (bRet && (nVal == AUTOFORMAT_OLD_DATA_ID)) { - rStream.ReadByteString( aName, rStream.GetStreamCharSet() ); + rStream.ReadUniOrByteString( aName, rStream.GetStreamCharSet() ); sal_Bool b; rStream >> b; bIncludeFont = b; rStream >> b; bIncludeJustify = b; @@ -863,7 +869,7 @@ sal_Bool ScAutoFormatData::Save(SvStream& rStream) sal_Bool b; rStream << nVal; // --- from 680/dr25 on: store strings as UTF-8 - rStream.WriteByteString( aName, RTL_TEXTENCODING_UTF8 ); + write_lenPrefixed_uInt8s_FromOUString(rStream, aName, RTL_TEXTENCODING_UTF8); rStream << nStrResId; rStream << ( b = bIncludeFont ); diff --git a/sc/source/core/tool/ddelink.cxx b/sc/source/core/tool/ddelink.cxx index 7fbb58b0ea4f..ca956813697b 100644 --- a/sc/source/core/tool/ddelink.cxx +++ b/sc/source/core/tool/ddelink.cxx @@ -92,9 +92,9 @@ ScDdeLink::ScDdeLink( ScDocument* pD, SvStream& rStream, ScMultipleReadHeader& r rHdr.StartEntry(); rtl_TextEncoding eCharSet = rStream.GetStreamCharSet(); - rStream.ReadByteString( aAppl, eCharSet ); - rStream.ReadByteString( aTopic, eCharSet ); - rStream.ReadByteString( aItem, eCharSet ); + rStream.ReadUniOrByteString( aAppl, eCharSet ); + rStream.ReadUniOrByteString( aTopic, eCharSet ); + rStream.ReadUniOrByteString( aItem, eCharSet ); sal_Bool bHasValue; rStream >> bHasValue; @@ -114,9 +114,9 @@ void ScDdeLink::Store( SvStream& rStream, ScMultipleWriteHeader& rHdr ) const rHdr.StartEntry(); rtl_TextEncoding eCharSet = rStream.GetStreamCharSet(); - rStream.WriteByteString( aAppl, eCharSet ); - rStream.WriteByteString( aTopic, eCharSet ); - rStream.WriteByteString( aItem, eCharSet ); + rStream.WriteUniOrByteString( aAppl, eCharSet ); + rStream.WriteUniOrByteString( aTopic, eCharSet ); + rStream.WriteUniOrByteString( aItem, eCharSet ); sal_Bool bHasValue = ( pResult != NULL ); rStream << bHasValue; diff --git a/sc/source/core/tool/zforauto.cxx b/sc/source/core/tool/zforauto.cxx index 4ebbee3551c0..048c981df3bf 100644 --- a/sc/source/core/tool/zforauto.cxx +++ b/sc/source/core/tool/zforauto.cxx @@ -61,7 +61,7 @@ ScNumFormatAbbrev::ScNumFormatAbbrev(sal_uLong nFormat, void ScNumFormatAbbrev::Load( SvStream& rStream, CharSet eByteStrSet ) { sal_uInt16 nSysLang, nLang; - rStream.ReadByteString( sFormatstring, eByteStrSet ); + rStream.ReadUniOrByteString( sFormatstring, eByteStrSet ); rStream >> nSysLang >> nLang; eLnge = (LanguageType) nLang; eSysLnge = (LanguageType) nSysLang; @@ -71,7 +71,7 @@ void ScNumFormatAbbrev::Load( SvStream& rStream, CharSet eByteStrSet ) void ScNumFormatAbbrev::Save( SvStream& rStream, CharSet eByteStrSet ) const { - rStream.WriteByteString( sFormatstring, eByteStrSet ); + rStream.WriteUniOrByteString( sFormatstring, eByteStrSet ); rStream << (sal_uInt16) eSysLnge << (sal_uInt16) eLnge; } diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index 6a9515d4f540..55714612b2df 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -267,19 +267,25 @@ SvStream& operator >> (SvStream& rIn, SdPublishingDesign& rDesign) sal_uInt16 nTemp16; - rIn.ReadByteString( rDesign.m_aDesignName, RTL_TEXTENCODING_UTF8 ); + rDesign.m_aDesignName = read_lenPrefixed_uInt8s_ToOUString(rIn, + RTL_TEXTENCODING_UTF8); rIn >> nTemp16; rDesign.m_eMode = (HtmlPublishMode)nTemp16; rIn >> rDesign.m_bContentPage; rIn >> rDesign.m_bNotes; rIn >> rDesign.m_nResolution; - rIn.ReadByteString( rDesign.m_aCompression, RTL_TEXTENCODING_UTF8 ); + rDesign.m_aCompression = read_lenPrefixed_uInt8s_ToOUString(rIn, + RTL_TEXTENCODING_UTF8); rIn >> nTemp16; rDesign.m_eFormat = (PublishingFormat)nTemp16; - rIn.ReadByteString( rDesign.m_aAuthor, RTL_TEXTENCODING_UTF8 ); - rIn.ReadByteString( rDesign.m_aEMail, RTL_TEXTENCODING_UTF8 ); - rIn.ReadByteString( rDesign.m_aWWW, RTL_TEXTENCODING_UTF8 ); - rIn.ReadByteString( rDesign.m_aMisc, RTL_TEXTENCODING_UTF8 ); + rDesign.m_aAuthor = read_lenPrefixed_uInt8s_ToOUString(rIn, + RTL_TEXTENCODING_UTF8); + rDesign.m_aEMail = read_lenPrefixed_uInt8s_ToOUString(rIn, + RTL_TEXTENCODING_UTF8); + rDesign.m_aWWW = read_lenPrefixed_uInt8s_ToOUString(rIn, + RTL_TEXTENCODING_UTF8); + rDesign.m_aMisc = read_lenPrefixed_uInt8s_ToOUString(rIn, + RTL_TEXTENCODING_UTF8); rIn >> rDesign.m_bDownload; rIn >> rDesign.m_bCreated; // not used rIn >> rDesign.m_nButtonThema; @@ -294,8 +300,10 @@ SvStream& operator >> (SvStream& rIn, SdPublishingDesign& rDesign) rIn >> nTemp16; rDesign.m_eScript = (PublishingScript)nTemp16; - rIn.ReadByteString( rDesign.m_aURL, RTL_TEXTENCODING_UTF8 ); - rIn.ReadByteString( rDesign.m_aCGI, RTL_TEXTENCODING_UTF8 ); + rDesign.m_aURL = read_lenPrefixed_uInt8s_ToOUString(rIn, + RTL_TEXTENCODING_UTF8); + rDesign.m_aCGI = read_lenPrefixed_uInt8s_ToOUString(rIn, + RTL_TEXTENCODING_UTF8); rIn >> rDesign.m_bAutoSlide; rIn >> rDesign.m_nSlideDuration; @@ -315,18 +323,24 @@ SvStream& operator << (SvStream& rOut, const SdPublishingDesign& rDesign) SdIOCompat aIO(rOut, STREAM_WRITE, 0); // Name - rOut.WriteByteString( rDesign.m_aDesignName, RTL_TEXTENCODING_UTF8 ); + write_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aDesignName, + RTL_TEXTENCODING_UTF8); rOut << (sal_uInt16)rDesign.m_eMode; rOut << rDesign.m_bContentPage; rOut << rDesign.m_bNotes; rOut << rDesign.m_nResolution; - rOut.WriteByteString( rDesign.m_aCompression, RTL_TEXTENCODING_UTF8 ); + write_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aCompression, + RTL_TEXTENCODING_UTF8); rOut << (sal_uInt16)rDesign.m_eFormat; - rOut.WriteByteString( rDesign.m_aAuthor, RTL_TEXTENCODING_UTF8 ); - rOut.WriteByteString( rDesign.m_aEMail, RTL_TEXTENCODING_UTF8 ); - rOut.WriteByteString( rDesign.m_aWWW, RTL_TEXTENCODING_UTF8 ); - rOut.WriteByteString( rDesign.m_aMisc, RTL_TEXTENCODING_UTF8 ); + write_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aAuthor, + RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aEMail, + RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aWWW, + RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aMisc, + RTL_TEXTENCODING_UTF8); rOut << rDesign.m_bDownload; rOut << rDesign.m_bCreated; // not used rOut << rDesign.m_nButtonThema; @@ -340,8 +354,10 @@ SvStream& operator << (SvStream& rOut, const SdPublishingDesign& rDesign) rOut << rDesign.m_bUseColor; rOut << (sal_uInt16)rDesign.m_eScript; - rOut.WriteByteString( rDesign.m_aURL, RTL_TEXTENCODING_UTF8 ); - rOut.WriteByteString( rDesign.m_aCGI, RTL_TEXTENCODING_UTF8 ); + write_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aURL, + RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aCGI, + RTL_TEXTENCODING_UTF8); rOut << rDesign.m_bAutoSlide; rOut << rDesign.m_nSlideDuration; diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx index e323361ed09c..eaef4b41ce49 100644 --- a/sfx2/source/appl/appmisc.cxx +++ b/sfx2/source/appl/appmisc.cxx @@ -192,7 +192,7 @@ std::vector* SfxApplication::GetDisabledSlotList_Impl() { // Read Slot file String aTitle; - pStream->ReadByteString(aTitle); + pStream->ReadUniOrByteString(aTitle, pStream->GetStreamCharSet()); if ( aTitle.CompareToAscii("SfxSlotFile" ) == COMPARE_EQUAL ) { sal_uInt16 nCount; @@ -207,7 +207,7 @@ std::vector* SfxApplication::GetDisabledSlotList_Impl() pList->push_back( nSlot ); } - pStream->ReadByteString(aTitle); + pStream->ReadUniOrByteString(aTitle, pStream->GetStreamCharSet()); if ( aTitle.CompareToAscii("END" ) != COMPARE_EQUAL || pStream->GetError() ) { // Read failed diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx index f1cf5c0c3127..49c7bd3cdcc6 100644 --- a/sot/source/sdstor/ucbstorage.cxx +++ b/sot/source/sdstor/ucbstorage.cxx @@ -3375,7 +3375,7 @@ String UCBStorage::CreateLinkFile( const String& rName ) // store it as key/value pair String aLink = String::CreateFromAscii("ContentURL="); aLink += aURL; - pStream->WriteByteString( aLink, RTL_TEXTENCODING_UTF8 ); + write_lenPrefixed_uInt8s_FromOUString(*pStream, aLink, RTL_TEXTENCODING_UTF8); pStream->Flush(); // move the stream to its desired location diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx index e6dab39b6706..8970688be602 100644 --- a/svl/source/items/poolitem.cxx +++ b/svl/source/items/poolitem.cxx @@ -187,7 +187,7 @@ SvStream& SfxPoolItem::Store(SvStream &rStream, sal_uInt16 ) const // static bool SfxPoolItem::readByteString(SvStream & rStream, UniString & rString) { - rStream.ReadByteString(rString); + rStream.ReadUniOrByteString(rString, rStream.GetStreamCharSet()); return rStream.GetError() == ERRCODE_NONE; } @@ -196,7 +196,7 @@ bool SfxPoolItem::readByteString(SvStream & rStream, UniString & rString) void SfxPoolItem::writeByteString(SvStream & rStream, UniString const & rString) { - rStream.WriteByteString(rString); + rStream.WriteUniOrByteString(rString, rStream.GetStreamCharSet()); } //============================================================================ @@ -204,7 +204,7 @@ void SfxPoolItem::writeByteString(SvStream & rStream, bool SfxPoolItem::readUnicodeString(SvStream & rStream, UniString & rString, bool bUnicode) { - rStream.ReadByteString(rString, + rStream.ReadUniOrByteString(rString, bUnicode ? RTL_TEXTENCODING_UCS2 : rStream.GetStreamCharSet()); return rStream.GetError() == ERRCODE_NONE; @@ -215,7 +215,7 @@ bool SfxPoolItem::readUnicodeString(SvStream & rStream, UniString & rString, void SfxPoolItem::writeUnicodeString(SvStream & rStream, UniString const & rString) { - rStream.WriteByteString(rString, RTL_TEXTENCODING_UCS2); + rStream.WriteUniOrByteString(rString, RTL_TEXTENCODING_UCS2); } // ------------------------------------------------------------------------ diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index 424aaa0204ce..852e16d32487 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -154,7 +154,7 @@ void ImpSvNumberformatInfo::Save(SvStream& rStream, sal_uInt16 nAnz) const { for (sal_uInt16 i = 0; i < nAnz; i++) { - rStream.WriteByteString( sStrArray[i], rStream.GetStreamCharSet() ); + rStream.WriteUniOrByteString( sStrArray[i], rStream.GetStreamCharSet() ); short nType = nTypeArray[i]; switch ( nType ) { // der Krampf fuer Versionen vor SV_NUMBERFORMATTER_VERSION_NEW_CURR @@ -392,7 +392,7 @@ void ImpSvNumFor::Save(SvStream& rStream) const { rStream << nAnzStrings; aI.Save(rStream, nAnzStrings); - rStream.WriteByteString( sColorName, rStream.GetStreamCharSet() ); + rStream.WriteUniOrByteString( sColorName, rStream.GetStreamCharSet() ); } void ImpSvNumFor::Load(SvStream& rStream, ImpSvNumberformatScan& rSc, @@ -402,7 +402,7 @@ void ImpSvNumFor::Load(SvStream& rStream, ImpSvNumberformatScan& rSc, rStream >> nAnz; //! noch nicht direkt nAnzStrings wg. Enlarge Enlarge( nAnz ); aI.Load( rStream, nAnz ); - rStream.ReadByteString( sColorName, rStream.GetStreamCharSet() ); + rStream.ReadUniOrByteString( sColorName, rStream.GetStreamCharSet() ); rLoadedColorName = sColorName; pColor = rSc.GetColor(sColorName); } @@ -1828,13 +1828,13 @@ void SvNumberformat::Save( SvStream& rStream, ImpSvNumMultipleWriteHeader& rHdr } rHdr.StartEntry(); - rStream.WriteByteString( aFormatstring, rStream.GetStreamCharSet() ); + rStream.WriteUniOrByteString( aFormatstring, rStream.GetStreamCharSet() ); rStream << eType << fLimit1 << fLimit2 << (sal_uInt16) eOp1 << (sal_uInt16) eOp2 << sal_Bool(bOldStandard) << sal_Bool(bIsUsed); for (sal_uInt16 i = 0; i < 4; i++) NumFor[i].Save(rStream); // ab SV_NUMBERFORMATTER_VERSION_NEWSTANDARD - rStream.WriteByteString( aComment, rStream.GetStreamCharSet() ); + rStream.WriteUniOrByteString( aComment, rStream.GetStreamCharSet() ); rStream << nNewStandardDefined; // ab SV_NUMBERFORMATTER_VERSION_NEW_CURR rStream << nNewCurrencyVersionId; diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx index 41f0af0839cd..e2a340a8291b 100644 --- a/svtools/source/misc/templatefoldercache.cxx +++ b/svtools/source/misc/templatefoldercache.cxx @@ -292,7 +292,7 @@ namespace svt void operator() ( const String& _rString ) const { - m_rStorage.WriteByteString( _rString ); + m_rStorage.WriteUniOrByteString( _rString, m_rStorage.GetStreamCharSet() ); } }; @@ -418,7 +418,7 @@ namespace svt while ( nChildren-- ) { String sURL; - m_rStorage.ReadByteString( sURL ); + m_rStorage.ReadUniOrByteString( sURL, m_rStorage.GetStreamCharSet() ); sURL = m_xOfficeInstDirs->makeAbsoluteURL( sURL ); INetURLObject aChildURL( sURL ); rChildren.push_back( new TemplateContent( aChildURL ) ); @@ -736,7 +736,7 @@ namespace svt while ( nRootDirectories-- ) { String sURL; - m_pCacheStream->ReadByteString( sURL ); + m_pCacheStream->ReadUniOrByteString( sURL, m_pCacheStream->GetStreamCharSet() ); // #116281# Keep office installtion relocatable. Never store // any direct references to office installation directory. sURL = getOfficeInstDirs()->makeAbsoluteURL( sURL ); diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index aac712644d95..c8158d19b52a 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -96,8 +96,8 @@ SvStream& operator>>( SvStream& rIStm, TransferableObjectDescriptor& rObjDesc ) rIStm >> rObjDesc.maSize.Height(); rIStm >> rObjDesc.maDragStartPos.X(); rIStm >> rObjDesc.maDragStartPos.Y(); - rIStm.ReadByteString( rObjDesc.maTypeName, osl_getThreadTextEncoding() ); - rIStm.ReadByteString( rObjDesc.maDisplayName, osl_getThreadTextEncoding() ); + rIStm.ReadUniOrByteString( rObjDesc.maTypeName, osl_getThreadTextEncoding() ); + rIStm.ReadUniOrByteString( rObjDesc.maDisplayName, osl_getThreadTextEncoding() ); rIStm >> nSig1 >> nSig2; rObjDesc.mnViewAspect = static_cast< sal_uInt16 >( nViewAspect ); @@ -126,8 +126,8 @@ SvStream& operator<<( SvStream& rOStm, const TransferableObjectDescriptor& rObjD rOStm << rObjDesc.maSize.Height(); rOStm << rObjDesc.maDragStartPos.X(); rOStm << rObjDesc.maDragStartPos.Y(); - rOStm.WriteByteString( rObjDesc.maTypeName, osl_getThreadTextEncoding() ); - rOStm.WriteByteString( rObjDesc.maDisplayName, osl_getThreadTextEncoding() ); + rOStm.WriteUniOrByteString( rObjDesc.maTypeName, osl_getThreadTextEncoding() ); + rOStm.WriteUniOrByteString( rObjDesc.maDisplayName, osl_getThreadTextEncoding() ); rOStm << nSig1 << nSig2; const sal_uInt32 nLastPos = rOStm.Tell(); diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx index 11a26aa04d49..1f6dfa83a794 100644 --- a/svx/source/items/hlnkitem.cxx +++ b/svx/source/items/hlnkitem.cxx @@ -49,13 +49,13 @@ SvStream& SvxHyperlinkItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ { // store 'simple' data // UNICODE: rStrm << sName; - rStrm.WriteByteString(sName); + rStrm.WriteUniOrByteString(sName, rStrm.GetStreamCharSet()); // UNICODE: rStrm << sURL; - rStrm.WriteByteString(sURL); + rStrm.WriteUniOrByteString(sURL, rStrm.GetStreamCharSet()); // UNICODE: rStrm << sTarget; - rStrm.WriteByteString(sTarget); + rStrm.WriteUniOrByteString(sTarget, rStrm.GetStreamCharSet()); rStrm << (sal_uInt32) eType; @@ -64,7 +64,7 @@ SvStream& SvxHyperlinkItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ // new data // UNICODE: rStrm << sIntName; - rStrm.WriteByteString(sIntName); + rStrm.WriteUniOrByteString(sIntName, rStrm.GetStreamCharSet()); // macro-events rStrm << nMacroEvents; @@ -91,10 +91,10 @@ SvStream& SvxHyperlinkItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ rStrm << (sal_uInt16)pMacroTable->GetCurKey(); // UNICODE: rStrm << pMac->GetLibName(); - rStrm.WriteByteString(pMac->GetLibName()); + rStrm.WriteUniOrByteString(pMac->GetLibName(), rStrm.GetStreamCharSet()); // UNICODE: rStrm << pMac->GetMacName(); - rStrm.WriteByteString(pMac->GetMacName()); + rStrm.WriteUniOrByteString(pMac->GetMacName(), rStrm.GetStreamCharSet()); } } } @@ -111,10 +111,10 @@ SvStream& SvxHyperlinkItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ rStrm << (sal_uInt16)pMacroTable->GetCurKey(); // UNICODE: rStrm << pMac->GetLibName(); - rStrm.WriteByteString(pMac->GetLibName()); + rStrm.WriteUniOrByteString(pMac->GetLibName(), rStrm.GetStreamCharSet()); // UNICODE: rStrm << pMac->GetMacName(); - rStrm.WriteByteString(pMac->GetMacName()); + rStrm.WriteUniOrByteString(pMac->GetMacName(), rStrm.GetStreamCharSet()); rStrm << (sal_uInt16)pMac->GetScriptType(); } @@ -131,13 +131,13 @@ SfxPoolItem* SvxHyperlinkItem::Create( SvStream &rStrm, sal_uInt16 /*nItemVer // simple data-types // UNICODE: rStrm >> pNew->sName; - rStrm.ReadByteString(pNew->sName); + rStrm.ReadUniOrByteString(pNew->sName, rStrm.GetStreamCharSet()); // UNICODE: rStrm >> pNew->sURL; - rStrm.ReadByteString(pNew->sURL); + rStrm.ReadUniOrByteString(pNew->sURL, rStrm.GetStreamCharSet()); // UNICODE: rStrm >> pNew->sTarget; - rStrm.ReadByteString(pNew->sTarget); + rStrm.ReadUniOrByteString(pNew->sTarget, rStrm.GetStreamCharSet()); rStrm >> nType; pNew->eType = (SvxLinkInsertMode) nType; @@ -149,7 +149,7 @@ SfxPoolItem* SvxHyperlinkItem::Create( SvStream &rStrm, sal_uInt16 /*nItemVer { // new data // UNICODE: rStrm >> pNew->sIntName; - rStrm.ReadByteString(pNew->sIntName); + rStrm.ReadUniOrByteString(pNew->sIntName, rStrm.GetStreamCharSet()); // macro-events rStrm >> pNew->nMacroEvents; @@ -164,10 +164,10 @@ SfxPoolItem* SvxHyperlinkItem::Create( SvStream &rStrm, sal_uInt16 /*nItemVer rStrm >> nCurKey; // UNICODE: rStrm >> aLibName; - rStrm.ReadByteString(aLibName); + rStrm.ReadUniOrByteString(aLibName, rStrm.GetStreamCharSet()); // UNICODE: rStrm >> aMacName; - rStrm.ReadByteString(aMacName); + rStrm.ReadUniOrByteString(aMacName, rStrm.GetStreamCharSet()); pNew->SetMacro( nCurKey, SvxMacro( aMacName, aLibName, STARBASIC ) ); } @@ -181,10 +181,10 @@ SfxPoolItem* SvxHyperlinkItem::Create( SvStream &rStrm, sal_uInt16 /*nItemVer rStrm >> nCurKey; // UNICODE: rStrm >> aLibName; - rStrm.ReadByteString(aLibName); + rStrm.ReadUniOrByteString(aLibName, rStrm.GetStreamCharSet()); // UNICODE: rStrm >> aMacName; - rStrm.ReadByteString(aMacName); + rStrm.ReadUniOrByteString(aMacName, rStrm.GetStreamCharSet()); rStrm >> nScriptType; diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx index 0ac676debe0a..7dcffd0c9dd4 100644 --- a/svx/source/items/pageitem.cxx +++ b/svx/source/items/pageitem.cxx @@ -251,7 +251,7 @@ SfxPoolItem* SvxPageItem::Create( SvStream& rStream, sal_uInt16 ) const sal_uInt16 nUse; // UNICODE: rStream >> sStr; - rStream.ReadByteString( sStr ); + rStream.ReadUniOrByteString( sStr, rStream.GetStreamCharSet() ); rStream >> eType; rStream >> bLand; @@ -270,7 +270,7 @@ SfxPoolItem* SvxPageItem::Create( SvStream& rStream, sal_uInt16 ) const SvStream& SvxPageItem::Store( SvStream &rStrm, sal_uInt16 /*nItemVersion*/ ) const { // UNICODE: rStrm << aDescName; - rStrm.WriteByteString(aDescName); + rStrm.WriteUniOrByteString(aDescName, rStrm.GetStreamCharSet()); rStrm << (sal_uInt8)eNumType << bLandscape << eUse; return rStrm; diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx index d9c3a010eccd..be2d325aef8f 100644 --- a/sw/source/core/doc/tblafmt.cxx +++ b/sw/source/core/doc/tblafmt.cxx @@ -401,7 +401,7 @@ sal_Bool SwBoxAutoFmt::Load( SvStream& rStream, const SwAfVersions& rVersions, s sal_uInt16 eSys, eLge; // --- from 680/dr25 on: store strings as UTF-8 CharSet eCharSet = (nVer >= AUTOFORMAT_ID_680DR25) ? RTL_TEXTENCODING_UTF8 : rStream.GetStreamCharSet(); - rStream.ReadByteString( sNumFmtString, eCharSet ) + rStream.ReadUniOrByteString( sNumFmtString, eCharSet ) >> eSys >> eLge; eSysLanguage = (LanguageType) eSys; eNumFmtLanguage = (LanguageType) eLge; @@ -486,8 +486,9 @@ sal_Bool SwBoxAutoFmt::Save( SvStream& rStream ) const aRotateMode.Store( rStream, aRotateMode.GetVersion(SOFFICE_FILEFORMAT_40) ); // --- from 680/dr25 on: store strings as UTF-8 - rStream.WriteByteString( sNumFmtString, RTL_TEXTENCODING_UTF8 ) - << (sal_uInt16)eSysLanguage << (sal_uInt16)eNumFmtLanguage; + write_lenPrefixed_uInt8s_FromOUString(rStream, sNumFmtString, + RTL_TEXTENCODING_UTF8); + rStream << (sal_uInt16)eSysLanguage << (sal_uInt16)eNumFmtLanguage; return 0 == rStream.GetError(); } @@ -779,7 +780,7 @@ sal_Bool SwTableAutoFmt::Load( SvStream& rStream, const SwAfVersions& rVersions sal_Bool b; // --- from 680/dr25 on: store strings as UTF-8 CharSet eCharSet = (nVal >= AUTOFORMAT_ID_680DR25) ? RTL_TEXTENCODING_UTF8 : rStream.GetStreamCharSet(); - rStream.ReadByteString( aName, eCharSet ); + rStream.ReadUniOrByteString( aName, eCharSet ); if( AUTOFORMAT_DATA_ID_552 <= nVal ) { rStream >> nStrResId; @@ -829,7 +830,7 @@ sal_Bool SwTableAutoFmt::LoadOld( SvStream& rStream, sal_uInt16 aLoadVer[] ) if( bRet && ( AUTOFORMAT_OLD_DATA_ID == nVal )) { sal_Bool b; - rStream.ReadByteString( aName, rStream.GetStreamCharSet() ); + rStream.ReadUniOrByteString( aName, rStream.GetStreamCharSet() ); rStream >> b; bInclFont = b; rStream >> b; bInclJustify = b; rStream >> b; bInclFrame = b; @@ -860,7 +861,8 @@ sal_Bool SwTableAutoFmt::Save( SvStream& rStream ) const sal_Bool b; rStream << nVal; // --- from 680/dr25 on: store strings as UTF-8 - rStream.WriteByteString( aName, RTL_TEXTENCODING_UTF8 ); + write_lenPrefixed_uInt8s_FromOUString(rStream, aName, + RTL_TEXTENCODING_UTF8 ); rStream << nStrResId; rStream << ( b = bInclFont ); rStream << ( b = bInclJustify ); diff --git a/sw/source/ui/config/uinums.cxx b/sw/source/ui/config/uinums.cxx index b521578f605b..c43a2f4ed99b 100644 --- a/sw/source/ui/config/uinums.cxx +++ b/sw/source/ui/config/uinums.cxx @@ -235,7 +235,7 @@ const SwNumRulesWithName& SwNumRulesWithName::operator=(const SwNumRulesWithName SwNumRulesWithName::SwNumRulesWithName( SvStream &rStream, sal_uInt16 nVersion ) { CharSet eEncoding = osl_getThreadTextEncoding(); - rStream.ReadByteString(aName, eEncoding); + rStream.ReadUniOrByteString(aName, eEncoding); char c; for(sal_uInt16 n = 0; n < MAXLEVEL; ++n ) @@ -274,7 +274,7 @@ void SwNumRulesWithName::MakeNumRule( SwWrtShell& rSh, SwNumRule& rChg ) const void SwNumRulesWithName::Store( SvStream &rStream ) { CharSet eEncoding = osl_getThreadTextEncoding(); - rStream.WriteByteString(aName, eEncoding); + rStream.WriteUniOrByteString(aName, eEncoding); for( sal_uInt16 n = 0; n < MAXLEVEL; ++n ) { @@ -354,9 +354,9 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( SvStream& rStream, long nL; rStream >> cChar; aFmt.SetStart( (sal_uInt16)cChar ); - rStream.ReadByteString(sStr, eEncoding); + rStream.ReadUniOrByteString(sStr, eEncoding); aFmt.SetPrefix( sStr ); - rStream.ReadByteString(sStr, eEncoding); + rStream.ReadUniOrByteString(sStr, eEncoding); aFmt.SetSuffix( sStr ); rStream >> nUS; aFmt.SetNumAdjust( SvxAdjust( nUS ) ); rStream >> nL; aFmt.SetLSpace( lNumIndent ); @@ -366,9 +366,9 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( SvStream& rStream, { short nShort; rStream >> nUS; aFmt.SetStart( nUS ); - rStream.ReadByteString(sStr, eEncoding); + rStream.ReadUniOrByteString(sStr, eEncoding); aFmt.SetPrefix( sStr ); - rStream.ReadByteString(sStr, eEncoding); + rStream.ReadUniOrByteString(sStr, eEncoding); aFmt.SetSuffix( sStr ); rStream >> nUS; aFmt.SetNumAdjust( SvxAdjust( nUS ) ); rStream >> nUS; aFmt.SetAbsLSpace( nUS ); @@ -385,7 +385,7 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( SvStream& rStream, sal_uInt16 nPitch; String aName; - rStream.ReadByteString(aName, eEncoding); + rStream.ReadUniOrByteString(aName, eEncoding); rStream >> nFamily >> nCharSet >> nWidth >> nHeight >> nPitch; if( aName.Len() ) @@ -411,7 +411,7 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( SvStream& rStream, { sal_uInt16 nItemCount; rStream >> nCharPoolId; - rStream.ReadByteString(sCharFmtName, eEncoding); + rStream.ReadUniOrByteString(sCharFmtName, eEncoding); rStream >> nItemCount; while( nItemCount-- ) @@ -485,15 +485,15 @@ void SwNumRulesWithName::_SwNumFmtGlobal::Store( SvStream& rStream ) << aFmt.GetBulletChar() << static_cast(aFmt.GetIncludeUpperLevels() > 0) << aFmt.GetStart(); - rStream.WriteByteString( aFmt.GetPrefix(), eEncoding ); - rStream.WriteByteString( aFmt.GetSuffix(), eEncoding ); + rStream.WriteUniOrByteString( aFmt.GetPrefix(), eEncoding ); + rStream.WriteUniOrByteString( aFmt.GetSuffix(), eEncoding ); rStream << sal_uInt16( aFmt.GetNumAdjust() ) << aFmt.GetAbsLSpace() << aFmt.GetFirstLineOffset() << aFmt.GetCharTextDistance() << aFmt.GetLSpace() << sal_False;//aFmt.IsRelLSpace(); - rStream.WriteByteString( aName, eEncoding ); + rStream.WriteUniOrByteString( aName, eEncoding ); rStream << nFamily << nCharSet << nWidth @@ -501,7 +501,7 @@ void SwNumRulesWithName::_SwNumFmtGlobal::Store( SvStream& rStream ) << nPitch; } rStream << nCharPoolId; - rStream.WriteByteString( sCharFmtName, eEncoding ); + rStream.WriteUniOrByteString( sCharFmtName, eEncoding ); rStream << aItems.Count(); for( sal_uInt16 n = aItems.Count(); n; ) diff --git a/tools/inc/tools/stream.hxx b/tools/inc/tools/stream.hxx index e6e939bbbd1b..4d316708b152 100644 --- a/tools/inc/tools/stream.hxx +++ b/tools/inc/tools/stream.hxx @@ -363,11 +363,6 @@ public: SvStream& operator<<( const unsigned char* pBuf ); SvStream& operator<<( SvStream& rStream ); - SvStream& ReadByteString( UniString& rStr, rtl_TextEncoding eSrcCharSet ); - SvStream& ReadByteString( UniString& rStr ) { return ReadByteString( rStr, GetStreamCharSet() ); } - SvStream& WriteByteString( const UniString& rStr, rtl_TextEncoding eDestCharSet ); - SvStream& WriteByteString( const UniString& rStr ) { return WriteByteString( rStr, GetStreamCharSet() ); } - SvStream& WriteNumber( sal_uInt32 nUInt32 ); SvStream& WriteNumber( sal_Int32 nInt32 ); @@ -412,6 +407,12 @@ public: /// Read a line of Unicode sal_Bool ReadUniStringLine( String& rStr ); + /// Read a 32bit length prefixed sequence of utf-16 if eSrcCharSet==RTL_TEXTENCODING_UNICODE, + /// otherwise read a 16bit length prefixed sequence of bytes and convert from eSrcCharSet + SvStream& ReadUniOrByteString( UniString& rStr, rtl_TextEncoding eSrcCharSet ); + /// Write a 32bit length prefixed sequence of utf-16 if eSrcCharSet==RTL_TEXTENCODING_UNICODE, + /// otherwise convert to eSrcCharSet and write a 16bit length prefixed sequence of bytes + SvStream& WriteUniOrByteString( const UniString& rStr, rtl_TextEncoding eDestCharSet ); /// 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 ); diff --git a/tools/source/inet/inetmsg.cxx b/tools/source/inet/inetmsg.cxx index f626dcccd508..a49d382ef158 100644 --- a/tools/source/inet/inetmsg.cxx +++ b/tools/source/inet/inetmsg.cxx @@ -137,7 +137,7 @@ sal_uIntPtr INetMessage::SetHeaderField ( SvStream& INetMessage::operator<< (SvStream& rStrm) const { rStrm << static_cast(m_nDocSize); - rStrm.WriteByteString (m_aDocName, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString(rStrm, m_aDocName, RTL_TEXTENCODING_UTF8); sal_uIntPtr i, n = m_aHeaderList.size(); rStrm << static_cast(n); @@ -163,7 +163,7 @@ SvStream& INetMessage::operator>> (SvStream& rStrm) // Copy. rStrm >> nTemp; m_nDocSize = nTemp; - rStrm.ReadByteString (m_aDocName, RTL_TEXTENCODING_UTF8); + m_aDocName = read_lenPrefixed_uInt8s_ToOUString(rStrm, RTL_TEXTENCODING_UTF8); sal_uIntPtr i, n = 0; rStrm >> nTemp; diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx index b70195978008..aab11a6ffc51 100644 --- a/tools/source/stream/stream.cxx +++ b/tools/source/stream/stream.cxx @@ -1489,7 +1489,7 @@ SvStream& SvStream::operator<< ( SvStream& rStream ) // ----------------------------------------------------------------------- -SvStream& SvStream::ReadByteString( UniString& rStr, rtl_TextEncoding eSrcCharSet ) +SvStream& SvStream::ReadUniOrByteString( UniString& rStr, rtl_TextEncoding eSrcCharSet ) { // read UTF-16 string directly from stream ? if (eSrcCharSet == RTL_TEXTENCODING_UNICODE) @@ -1523,7 +1523,7 @@ SvStream& SvStream::ReadByteString( UniString& rStr, rtl_TextEncoding eSrcCharSe // ----------------------------------------------------------------------- -SvStream& SvStream::WriteByteString( const UniString& rStr, rtl_TextEncoding eDestCharSet ) +SvStream& SvStream::WriteUniOrByteString( const UniString& rStr, rtl_TextEncoding eDestCharSet ) { // write UTF-16 string directly into stream ? if (eDestCharSet == RTL_TEXTENCODING_UNICODE) diff --git a/vcl/source/gdi/font.cxx b/vcl/source/gdi/font.cxx index 017042692225..059b1fe85320 100644 --- a/vcl/source/gdi/font.cxx +++ b/vcl/source/gdi/font.cxx @@ -780,8 +780,8 @@ SvStream& operator>>( SvStream& rIStm, Impl_Font& rImpl_Font ) sal_Bool bTmp; sal_uInt8 nTmp8; - rIStm.ReadByteString( rImpl_Font.maFamilyName, rIStm.GetStreamCharSet() ); - rIStm.ReadByteString( rImpl_Font.maStyleName, rIStm.GetStreamCharSet() ); + rIStm.ReadUniOrByteString( rImpl_Font.maFamilyName, rIStm.GetStreamCharSet() ); + rIStm.ReadUniOrByteString( rImpl_Font.maStyleName, rIStm.GetStreamCharSet() ); rIStm >> rImpl_Font.maSize; rIStm >> nTmp16; rImpl_Font.meCharSet = (rtl_TextEncoding) nTmp16; @@ -823,8 +823,8 @@ SvStream& operator>>( SvStream& rIStm, Impl_Font& rImpl_Font ) SvStream& operator<<( SvStream& rOStm, const Impl_Font& rImpl_Font ) { VersionCompat aCompat( rOStm, STREAM_WRITE, 3 ); - rOStm.WriteByteString( rImpl_Font.maFamilyName, rOStm.GetStreamCharSet() ); - rOStm.WriteByteString( rImpl_Font.maStyleName, rOStm.GetStreamCharSet() ); + rOStm.WriteUniOrByteString( rImpl_Font.maFamilyName, rOStm.GetStreamCharSet() ); + rOStm.WriteUniOrByteString( rImpl_Font.maStyleName, rOStm.GetStreamCharSet() ); rOStm << rImpl_Font.maSize; rOStm << (sal_uInt16) GetStoreCharSet( rImpl_Font.meCharSet ); diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx index 796659cfdaa5..8d3ef576690e 100644 --- a/vcl/source/gdi/jobset.cxx +++ b/vcl/source/gdi/jobset.cxx @@ -334,9 +334,8 @@ SvStream& operator>>( SvStream& rIStream, JobSetup& rJobSetup ) rIStream.Seek( nFirstPos + sizeof( ImplOldJobSetupData ) + 4 + sizeof( Impl364JobSetupData ) + pJobData->mnDriverDataLen ); while( rIStream.Tell() < nFirstPos + nLen ) { - String aKey, aValue; - rIStream.ReadByteString( aKey, RTL_TEXTENCODING_UTF8 ); - rIStream.ReadByteString( aValue, RTL_TEXTENCODING_UTF8 ); + String aKey = read_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8); + String aValue = read_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8); if( aKey.EqualsAscii( "COMPAT_DUPLEX_MODE" ) ) { if( aValue.EqualsAscii( "DUPLEX_UNKNOWN" ) ) @@ -407,8 +406,8 @@ SvStream& operator<<( SvStream& rOStream, const JobSetup& rJobSetup ) ::boost::unordered_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash >::const_iterator it; for( it = pJobData->maValueMap.begin(); it != pJobData->maValueMap.end(); ++it ) { - rOStream.WriteByteString( it->first, RTL_TEXTENCODING_UTF8 ); - rOStream.WriteByteString( it->second, RTL_TEXTENCODING_UTF8 ); + write_lenPrefixed_uInt8s_FromOUString(rOStream, it->first, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString(rOStream, it->second, RTL_TEXTENCODING_UTF8); } write_lenPrefixed_uInt8s_FromOString(rOStream, "COMPAT_DUPLEX_MODE"); switch( pJobData->meDuplexMode ) diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx index 9961705cbb6c..2fd96e835910 100644 --- a/vcl/source/gdi/metaact.cxx +++ b/vcl/source/gdi/metaact.cxx @@ -1259,7 +1259,7 @@ void MetaTextAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 2, pData ); rOStm << maPt; - rOStm.WriteByteString( maStr, pData->meActualCharSet ); + rOStm.WriteUniOrByteString( maStr, pData->meActualCharSet ); rOStm << mnIndex; rOStm << mnLen; @@ -1278,7 +1278,7 @@ void MetaTextAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) { COMPAT( rIStm ); rIStm >> maPt; - rIStm.ReadByteString( maStr, pData->meActualCharSet ); + rIStm.ReadUniOrByteString( maStr, pData->meActualCharSet ); rIStm >> mnIndex; rIStm >> mnLen; @@ -1408,7 +1408,7 @@ void MetaTextArrayAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) WRITE_BASE_COMPAT( rOStm, 2, pData ); rOStm << maStartPt; - rOStm.WriteByteString( maStr, pData->meActualCharSet ); + rOStm.WriteUniOrByteString( maStr, pData->meActualCharSet ); rOStm << mnIndex; rOStm << mnLen; rOStm << nAryLen; @@ -1435,7 +1435,7 @@ void MetaTextArrayAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) COMPAT( rIStm ); rIStm >> maStartPt; - rIStm.ReadByteString( maStr, pData->meActualCharSet ); + rIStm.ReadUniOrByteString( maStr, pData->meActualCharSet ); rIStm >> mnIndex; rIStm >> mnLen; rIStm >> nAryLen; @@ -1555,7 +1555,7 @@ void MetaStretchTextAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 2, pData ); rOStm << maPt; - rOStm.WriteByteString( maStr, pData->meActualCharSet ); + rOStm.WriteUniOrByteString( maStr, pData->meActualCharSet ); rOStm << mnWidth; rOStm << mnIndex; rOStm << mnLen; @@ -1575,7 +1575,7 @@ void MetaStretchTextAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) { COMPAT( rIStm ); rIStm >> maPt; - rIStm.ReadByteString( maStr, pData->meActualCharSet ); + rIStm.ReadUniOrByteString( maStr, pData->meActualCharSet ); rIStm >> mnWidth; rIStm >> mnIndex; rIStm >> mnLen; @@ -1650,7 +1650,7 @@ void MetaTextRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 2, pData ); rOStm << maRect; - rOStm.WriteByteString( maStr, pData->meActualCharSet ); + rOStm.WriteUniOrByteString( maStr, pData->meActualCharSet ); rOStm << mnStyle; sal_uInt16 i, nLen = maStr.Len(); // version 2 @@ -1668,7 +1668,7 @@ void MetaTextRectAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) { COMPAT( rIStm ); rIStm >> maRect; - rIStm.ReadByteString( maStr, pData->meActualCharSet ); + rIStm.ReadUniOrByteString( maStr, pData->meActualCharSet ); rIStm >> mnStyle; if ( aCompat.GetVersion() >= 2 ) // Version 2 diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index 6a4cabaecbfe..9cede2527aaa 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -280,10 +280,10 @@ SvStream& operator<<( SvStream& rOStream, const QueueInfo& rInfo ) { VersionCompat aCompat( rOStream, STREAM_WRITE, 1 ); - rOStream.WriteByteString( rInfo.maPrinterName, RTL_TEXTENCODING_UTF8 ); - rOStream.WriteByteString( rInfo.maDriver, RTL_TEXTENCODING_UTF8 ); - rOStream.WriteByteString( rInfo.maLocation, RTL_TEXTENCODING_UTF8 ); - rOStream.WriteByteString( rInfo.maComment, RTL_TEXTENCODING_UTF8 ); + write_lenPrefixed_uInt8s_FromOUString(rOStream, rInfo.maPrinterName, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString(rOStream, rInfo.maDriver, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString(rOStream, rInfo.maLocation, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString(rOStream, rInfo.maComment, RTL_TEXTENCODING_UTF8); rOStream << rInfo.mnStatus; rOStream << rInfo.mnJobs; @@ -296,15 +296,10 @@ SvStream& operator>>( SvStream& rIStream, QueueInfo& rInfo ) { VersionCompat aCompat( rIStream, STREAM_READ ); - String aTmp; - rIStream.ReadByteString( aTmp, RTL_TEXTENCODING_UTF8 ); - rInfo.maPrinterName = aTmp; - rIStream.ReadByteString( aTmp, RTL_TEXTENCODING_UTF8 ); - rInfo.maDriver = aTmp; - rIStream.ReadByteString( aTmp, RTL_TEXTENCODING_UTF8 ); - rInfo.maLocation = aTmp; - rIStream.ReadByteString( aTmp, RTL_TEXTENCODING_UTF8 ); - rInfo.maComment = aTmp; + rInfo.maPrinterName = read_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8); + rInfo.maDriver = read_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8); + rInfo.maLocation = read_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8); + rInfo.maComment = read_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8); rIStream >> rInfo.mnStatus; rIStream >> rInfo.mnJobs; diff --git a/vcl/source/gdi/rendergraphic.cxx b/vcl/source/gdi/rendergraphic.cxx index 2077eedc4acd..16b08c4de17a 100644 --- a/vcl/source/gdi/rendergraphic.cxx +++ b/vcl/source/gdi/rendergraphic.cxx @@ -192,10 +192,9 @@ void RenderGraphic::ImplGetDefaults() const ::SvStream& operator>>( ::SvStream& rIStm, RenderGraphic& rRenderGraphic ) { ::VersionCompat aVCompat( rIStm, STREAM_READ ); - String aGraphicDataMimeType; sal_uInt32 nGraphicDataLength = 0; - rIStm.ReadByteString( aGraphicDataMimeType, RTL_TEXTENCODING_ASCII_US ); + rtl::OUString aGraphicDataMimeType = read_lenPrefixed_uInt8s_ToOUString(rIStm, RTL_TEXTENCODING_ASCII_US); rIStm >> nGraphicDataLength; rRenderGraphic = RenderGraphic( aGraphicDataMimeType, nGraphicDataLength ); @@ -215,7 +214,8 @@ void RenderGraphic::ImplGetDefaults() const ::VersionCompat aVCompat( rOStm, STREAM_WRITE, 1 ); const sal_uInt32 nGraphicDataLength = rRenderGraphic.GetGraphicDataLength(); - rOStm.WriteByteString( rRenderGraphic.GetGraphicDataMimeType(), RTL_TEXTENCODING_ASCII_US ); + write_lenPrefixed_uInt8s_FromOUString(rOStm, rRenderGraphic.GetGraphicDataMimeType(), + RTL_TEXTENCODING_ASCII_US); rOStm << nGraphicDataLength; if( nGraphicDataLength ) diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index cf7941e67805..44ca911f6987 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -160,10 +160,10 @@ ImplFontAttrCache::ImplFontAttrCache( const String& rFileNameURL, const String& ImplDevFontAttributes aDFA; for(;;) { - aCacheFile.ReadByteString( aFontFileURL, RTL_TEXTENCODING_UTF8 ); + aFontFileURL = read_lenPrefixed_uInt8s_ToOUString(aCacheFile, RTL_TEXTENCODING_UTF8); if( !aFontFileURL.Len() ) break; - aCacheFile.ReadByteString( aDFA.maName, RTL_TEXTENCODING_UTF8 ); + aDFA.maName = read_lenPrefixed_uInt8s_ToOUString(aCacheFile, RTL_TEXTENCODING_UTF8); short n; aCacheFile >> n; aDFA.meWeight = static_cast(n); @@ -195,8 +195,8 @@ ImplFontAttrCache::~ImplFontAttrCache() { const String rFontFileURL( (*aIter).first ); const ImplDevFontAttributes& rDFA( (*aIter).second ); - aCacheFile.WriteByteString( rFontFileURL, RTL_TEXTENCODING_UTF8 ); - aCacheFile.WriteByteString( rDFA.maName, RTL_TEXTENCODING_UTF8 ); + write_lenPrefixed_uInt8s_FromOUString(aCacheFile, rFontFileURL, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString(aCacheFile, rDFA.maName, RTL_TEXTENCODING_UTF8); aCacheFile << static_cast(rDFA.meWeight); aCacheFile << static_cast(rDFA.meItalic); @@ -205,13 +205,12 @@ ImplFontAttrCache::~ImplFontAttrCache() aCacheFile << static_cast(rDFA.meFamily); aCacheFile << static_cast(rDFA.mbSymbolFlag != false); - aCacheFile.WriteByteStringLine( rDFA.maStyleName, RTL_TEXTENCODING_UTF8 ); + write_lenPrefixed_uInt8s_FromOUString(aCacheFile, rDFA.maStyleName, RTL_TEXTENCODING_UTF8); ++aIter; } // EOF Marker - String aEmptyStr; - aCacheFile.WriteByteString( aEmptyStr, RTL_TEXTENCODING_UTF8 ); + write_lenPrefixed_uInt8s_FromOString(aCacheFile, rtl::OString(), RTL_TEXTENCODING_UTF8); } } } -- cgit v1.2.3 From c1d49234e5e8e7faa84f4d118500a138decfb04e Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 21 Dec 2011 13:33:58 +0000 Subject: tweak for pre language-defect #77 --- basic/source/sbx/sbxbase.cxx | 12 ++++++------ basic/source/sbx/sbxcoll.cxx | 4 ++-- basic/source/sbx/sbxobj.cxx | 12 ++++++------ basic/source/sbx/sbxvalue.cxx | 14 +++++++------- basic/source/sbx/sbxvar.cxx | 12 ++++++------ editeng/source/editeng/editobj.cxx | 6 +++--- idl/source/objects/bastype.cxx | 8 ++++---- idl/source/objects/module.cxx | 12 ++++++------ idl/source/objects/object.cxx | 4 ++-- idl/source/objects/types.cxx | 8 ++++---- sc/source/core/tool/autoform.cxx | 4 ++-- sd/source/filter/html/pubdlg.cxx | 32 ++++++++++++++++---------------- sot/source/sdstor/ucbstorage.cxx | 4 ++-- svl/source/items/cntwall.cxx | 2 +- svl/source/numbers/zformat.cxx | 2 +- svtools/source/graphic/grfmgr.cxx | 4 ++-- svtools/source/misc/imap.cxx | 28 ++++++++++++++-------------- svx/source/gallery2/gallery1.cxx | 20 ++++++++++---------- svx/source/gallery2/galobj.cxx | 20 ++++++++++---------- svx/source/gallery2/galtheme.cxx | 10 +++++----- sw/source/core/doc/tblafmt.cxx | 4 ++-- tools/inc/tools/inetmsg.hxx | 8 ++++---- tools/inc/tools/stream.hxx | 8 ++++---- tools/source/inet/inetmsg.cxx | 8 ++++---- tools/source/stream/stream.cxx | 4 ++-- vcl/source/gdi/animate.cxx | 4 ++-- vcl/source/gdi/cvtsvm.cxx | 4 ++-- vcl/source/gdi/jobset.cxx | 18 +++++++++--------- vcl/source/gdi/metaact.cxx | 4 ++-- vcl/source/gdi/print.cxx | 16 ++++++++-------- vcl/source/gdi/rendergraphic.cxx | 4 ++-- vcl/win/source/gdi/salgdi3.cxx | 10 +++++----- 32 files changed, 155 insertions(+), 155 deletions(-) (limited to 'sd') diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx index 7ab2d6c15b37..9e1baf39f0ef 100644 --- a/basic/source/sbx/sbxbase.cxx +++ b/basic/source/sbx/sbxbase.cxx @@ -383,9 +383,9 @@ sal_Bool SbxInfo::LoadData( SvStream& rStrm, sal_uInt16 nVer ) { aParams.Remove( 0, aParams.Count() ); sal_uInt16 nParam; - aComment = read_lenPrefixed_uInt8s_ToOUString(rStrm, + aComment = read_lenPrefixed_uInt8s_ToOUString(rStrm, RTL_TEXTENCODING_ASCII_US); - aHelpFile = read_lenPrefixed_uInt8s_ToOUString(rStrm, + aHelpFile = read_lenPrefixed_uInt8s_ToOUString(rStrm, RTL_TEXTENCODING_ASCII_US); rStrm >> nHelpId >> nParam; while( nParam-- ) @@ -393,7 +393,7 @@ sal_Bool SbxInfo::LoadData( SvStream& rStrm, sal_uInt16 nVer ) XubString aName; sal_uInt16 nType, nFlags; sal_uInt32 nUserData = 0; - aName = read_lenPrefixed_uInt8s_ToOUString(rStrm, + aName = read_lenPrefixed_uInt8s_ToOUString(rStrm, RTL_TEXTENCODING_ASCII_US); rStrm >> nType >> nFlags; if( nVer > 1 ) @@ -407,15 +407,15 @@ sal_Bool SbxInfo::LoadData( SvStream& rStrm, sal_uInt16 nVer ) sal_Bool SbxInfo::StoreData( SvStream& rStrm ) const { - write_lenPrefixed_uInt8s_FromOUString(rStrm, aComment, + write_lenPrefixed_uInt8s_FromOUString(rStrm, aComment, RTL_TEXTENCODING_ASCII_US ); - write_lenPrefixed_uInt8s_FromOUString(rStrm, aHelpFile, + write_lenPrefixed_uInt8s_FromOUString(rStrm, aHelpFile, RTL_TEXTENCODING_ASCII_US); rStrm << nHelpId << aParams.Count(); for( sal_uInt16 i = 0; i < aParams.Count(); i++ ) { SbxParamInfo* p = aParams.GetObject( i ); - write_lenPrefixed_uInt8s_FromOUString(rStrm, p->aName, + write_lenPrefixed_uInt8s_FromOUString(rStrm, p->aName, RTL_TEXTENCODING_ASCII_US); rStrm << (sal_uInt16) p->eType << (sal_uInt16) p->nFlags diff --git a/basic/source/sbx/sbxcoll.cxx b/basic/source/sbx/sbxcoll.cxx index 97573876064c..0e3f911fb5b0 100644 --- a/basic/source/sbx/sbxcoll.cxx +++ b/basic/source/sbx/sbxcoll.cxx @@ -279,7 +279,7 @@ sal_Bool SbxStdCollection::LoadData( SvStream& rStrm, sal_uInt16 nVer ) sal_Bool bRes = SbxCollection::LoadData( rStrm, nVer ); if( bRes ) { - aElemClass = read_lenPrefixed_uInt8s_ToOUString(rStrm, + aElemClass = read_lenPrefixed_uInt8s_ToOUString(rStrm, RTL_TEXTENCODING_ASCII_US); rStrm >> bAddRemoveOk; } @@ -291,7 +291,7 @@ sal_Bool SbxStdCollection::StoreData( SvStream& rStrm ) const sal_Bool bRes = SbxCollection::StoreData( rStrm ); if( bRes ) { - write_lenPrefixed_uInt8s_FromOUString(rStrm, aElemClass, + write_lenPrefixed_uInt8s_FromOUString(rStrm, aElemClass, RTL_TEXTENCODING_ASCII_US); rStrm << bAddRemoveOk; } diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx index 0c98fca20049..fd919d6f11da 100644 --- a/basic/source/sbx/sbxobj.cxx +++ b/basic/source/sbx/sbxobj.cxx @@ -591,9 +591,9 @@ sal_Bool SbxObject::LoadData( SvStream& rStrm, sal_uInt16 nVer ) aData.pObj = this; sal_uInt32 nSize; XubString aDfltProp; - aClassName = read_lenPrefixed_uInt8s_ToOUString(rStrm, + aClassName = read_lenPrefixed_uInt8s_ToOUString(rStrm, RTL_TEXTENCODING_ASCII_US); - aDfltProp = read_lenPrefixed_uInt8s_ToOUString(rStrm, + aDfltProp = read_lenPrefixed_uInt8s_ToOUString(rStrm, RTL_TEXTENCODING_ASCII_US); sal_uIntPtr nPos = rStrm.Tell(); rStrm >> nSize; @@ -622,8 +622,8 @@ sal_Bool SbxObject::StoreData( SvStream& rStrm ) const XubString aDfltProp; if( pDfltProp ) aDfltProp = pDfltProp->GetName(); - write_lenPrefixed_uInt8s_FromOUString(rStrm, aClassName, RTL_TEXTENCODING_ASCII_US); - write_lenPrefixed_uInt8s_FromOUString(rStrm, aDfltProp, RTL_TEXTENCODING_ASCII_US); + write_lenPrefixed_uInt8s_FromOUString(rStrm, aClassName, RTL_TEXTENCODING_ASCII_US); + write_lenPrefixed_uInt8s_FromOUString(rStrm, aDfltProp, RTL_TEXTENCODING_ASCII_US); sal_uIntPtr nPos = rStrm.Tell(); rStrm << (sal_uInt32) 0L; if( !StorePrivateData( rStrm ) ) @@ -799,7 +799,7 @@ void SbxObject::Dump( SvStream& rStrm, sal_Bool bFill ) aLine += aAttrs2; if( !pVar->IsA( TYPE(SbxMethod) ) ) aLine.AppendAscii( " !! Not a Method !!" ); - write_lenPrefixed_uInt8s_FromOUString(rStrm, aLine, RTL_TEXTENCODING_ASCII_US); + write_lenPrefixed_uInt8s_FromOUString(rStrm, aLine, RTL_TEXTENCODING_ASCII_US); // Output also the object at object-methods if ( pVar->GetValues_Impl().eType == SbxOBJECT && @@ -832,7 +832,7 @@ void SbxObject::Dump( SvStream& rStrm, sal_Bool bFill ) aLine += aAttrs3; if( !pVar->IsA( TYPE(SbxProperty) ) ) aLine.AppendAscii( " !! Not a Property !!" ); - write_lenPrefixed_uInt8s_FromOUString(rStrm, aLine, RTL_TEXTENCODING_ASCII_US); + write_lenPrefixed_uInt8s_FromOUString(rStrm, aLine, RTL_TEXTENCODING_ASCII_US); // output also the object at object properties if ( pVar->GetValues_Impl().eType == SbxOBJECT && diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx index 692959aa9c18..7f00eccb3a51 100644 --- a/basic/source/sbx/sbxvalue.cxx +++ b/basic/source/sbx/sbxvalue.cxx @@ -1479,7 +1479,7 @@ sal_Bool SbxValue::LoadData( SvStream& r, sal_uInt16 ) case SbxSINGLE: { // Floats as ASCII - XubString aVal = read_lenPrefixed_uInt8s_ToOUString(r, + XubString aVal = read_lenPrefixed_uInt8s_ToOUString(r, RTL_TEXTENCODING_ASCII_US); double d; SbxDataType t; @@ -1495,7 +1495,7 @@ sal_Bool SbxValue::LoadData( SvStream& r, sal_uInt16 ) case SbxDOUBLE: { // Floats as ASCII - XubString aVal = read_lenPrefixed_uInt8s_ToOUString(r, + XubString aVal = read_lenPrefixed_uInt8s_ToOUString(r, RTL_TEXTENCODING_ASCII_US); SbxDataType t; if( ImpScan( aVal, aData.nDouble, t, NULL ) != SbxERR_OK ) @@ -1524,7 +1524,7 @@ sal_Bool SbxValue::LoadData( SvStream& r, sal_uInt16 ) } case SbxSTRING: { - rtl::OUString aVal = read_lenPrefixed_uInt8s_ToOUString(r, + rtl::OUString aVal = read_lenPrefixed_uInt8s_ToOUString(r, RTL_TEXTENCODING_ASCII_US); if( aVal.getLength() ) aData.pOUString = new ::rtl::OUString( aVal ); @@ -1621,12 +1621,12 @@ sal_Bool SbxValue::StoreData( SvStream& r ) const case SbxDATE: // #49935: Save as double, elsewise an error during the read in ((SbxValue*)this)->aData.eType = (SbxDataType)( ( nType & 0xF000 ) | SbxDOUBLE ); - write_lenPrefixed_uInt8s_FromOUString(r, GetCoreString(), RTL_TEXTENCODING_ASCII_US); + write_lenPrefixed_uInt8s_FromOUString(r, GetCoreString(), RTL_TEXTENCODING_ASCII_US); ((SbxValue*)this)->aData.eType = (SbxDataType)nType; break; case SbxSINGLE: case SbxDOUBLE: - write_lenPrefixed_uInt8s_FromOUString(r, GetCoreString(), RTL_TEXTENCODING_ASCII_US); + write_lenPrefixed_uInt8s_FromOUString(r, GetCoreString(), RTL_TEXTENCODING_ASCII_US); break; case SbxSALUINT64: case SbxSALINT64: @@ -1643,11 +1643,11 @@ sal_Bool SbxValue::StoreData( SvStream& r ) const case SbxSTRING: if( aData.pOUString ) { - write_lenPrefixed_uInt8s_FromOUString(r, *aData.pOUString, RTL_TEXTENCODING_ASCII_US); + write_lenPrefixed_uInt8s_FromOUString(r, *aData.pOUString, RTL_TEXTENCODING_ASCII_US); } else { - write_lenPrefixed_uInt8s_FromOUString(r, rtl::OUString(), RTL_TEXTENCODING_ASCII_US); + write_lenPrefixed_uInt8s_FromOUString(r, rtl::OUString(), RTL_TEXTENCODING_ASCII_US); } break; case SbxERROR: diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx index 6ca253355603..386c8d3473c4 100644 --- a/basic/source/sbx/sbxvar.cxx +++ b/basic/source/sbx/sbxvar.cxx @@ -445,7 +445,7 @@ sal_Bool SbxVariable::LoadData( SvStream& rStrm, sal_uInt16 nVer ) { if( !SbxValue::LoadData( rStrm, nVer ) ) return sal_False; - maName = read_lenPrefixed_uInt8s_ToOUString(rStrm, + maName = read_lenPrefixed_uInt8s_ToOUString(rStrm, RTL_TEXTENCODING_ASCII_US); sal_uInt32 nTemp; rStrm >> nTemp; @@ -455,7 +455,7 @@ sal_Bool SbxVariable::LoadData( SvStream& rStrm, sal_uInt16 nVer ) { rStrm.SeekRel( -1L ); rStrm >> nType; - maName = read_lenPrefixed_uInt8s_ToOUString(rStrm, + maName = read_lenPrefixed_uInt8s_ToOUString(rStrm, RTL_TEXTENCODING_ASCII_US); sal_uInt32 nTemp; rStrm >> nTemp; @@ -479,7 +479,7 @@ sal_Bool SbxVariable::LoadData( SvStream& rStrm, sal_uInt16 nVer ) case SbxSINGLE: { // Floats as ASCII - aTmpString = read_lenPrefixed_uInt8s_ToOUString( + aTmpString = read_lenPrefixed_uInt8s_ToOUString( rStrm, RTL_TEXTENCODING_ASCII_US); double d; SbxDataType t; @@ -495,7 +495,7 @@ sal_Bool SbxVariable::LoadData( SvStream& rStrm, sal_uInt16 nVer ) case SbxDOUBLE: { // Floats as ASCII - aTmpString = read_lenPrefixed_uInt8s_ToOUString(rStrm, + aTmpString = read_lenPrefixed_uInt8s_ToOUString(rStrm, RTL_TEXTENCODING_ASCII_US); SbxDataType t; if( ImpScan( aTmpString, aTmp.nDouble, t, NULL ) != SbxERR_OK ) @@ -506,7 +506,7 @@ sal_Bool SbxVariable::LoadData( SvStream& rStrm, sal_uInt16 nVer ) break; } case SbxSTRING: - aVal = read_lenPrefixed_uInt8s_ToOUString(rStrm, + aVal = read_lenPrefixed_uInt8s_ToOUString(rStrm, RTL_TEXTENCODING_ASCII_US); break; case SbxEMPTY: @@ -565,7 +565,7 @@ sal_Bool SbxVariable::StoreData( SvStream& rStrm ) const bValStore = SbxValue::StoreData( rStrm ); if( !bValStore ) return sal_False; - write_lenPrefixed_uInt8s_FromOUString(rStrm, maName, + write_lenPrefixed_uInt8s_FromOUString(rStrm, maName, RTL_TEXTENCODING_ASCII_US); rStrm << (sal_uInt32)nUserData; if( pInfo.Is() ) diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx index 8435e66d923f..e6ca9a513e10 100644 --- a/editeng/source/editeng/editobj.cxx +++ b/editeng/source/editeng/editobj.cxx @@ -1131,10 +1131,10 @@ void BinTextObject::StoreData( SvStream& rOStream ) const // Convert CH_FEATURE to CH_FEATURE_OLD aText.SearchAndReplaceAll( cFeatureConverted, CH_FEATURE_OLD ); - write_lenPrefixed_uInt8s_FromOString(rOStream, aText); + write_lenPrefixed_uInt8s_FromOString(rOStream, aText); // StyleName and Family... - write_lenPrefixed_uInt8s_FromOUString(rOStream, pC->GetStyle(), eEncoding); + write_lenPrefixed_uInt8s_FromOUString(rOStream, pC->GetStyle(), eEncoding); rOStream << (sal_uInt16)pC->GetFamily(); // Paragraph attributes ... @@ -1226,7 +1226,7 @@ void BinTextObject::CreateData( SvStream& rIStream ) ContentInfo* pC = CreateAndInsertContent(); // The Text... - ByteString aByteString = read_lenPrefixed_uInt8s_ToOString(rIStream); + ByteString aByteString = read_lenPrefixed_uInt8s_ToOString(rIStream); pC->GetText() = rtl::OStringToOUString(aByteString, eSrcEncoding); // StyleName and Family... diff --git a/idl/source/objects/bastype.cxx b/idl/source/objects/bastype.cxx index afeb0046730d..365d5f3ba910 100644 --- a/idl/source/objects/bastype.cxx +++ b/idl/source/objects/bastype.cxx @@ -228,13 +228,13 @@ sal_Bool SvIdentifier::WriteSvIdl( SvStringHashEntry * pName, SvStream& operator << (SvStream & rStm, const SvIdentifier & r ) { - write_lenPrefixed_uInt8s_FromOString(rStm, r); + write_lenPrefixed_uInt8s_FromOString(rStm, r); return rStm; } SvStream& operator >> (SvStream & rStm, SvIdentifier & r ) { - r = read_lenPrefixed_uInt8s_ToOString(rStm); + r = read_lenPrefixed_uInt8s_ToOString(rStm); return rStm; } @@ -343,13 +343,13 @@ sal_Bool SvString::WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm, SvStream& operator << (SvStream & rStm, const SvString & r ) { - write_lenPrefixed_uInt8s_FromOString(rStm, r); + write_lenPrefixed_uInt8s_FromOString(rStm, r); return rStm; } SvStream& operator >> (SvStream & rStm, SvString & r ) { - r = read_lenPrefixed_uInt8s_ToOString(rStm); + r = read_lenPrefixed_uInt8s_ToOString(rStm); return rStm; } diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx index e8e6542eb1b0..8766f105a201 100644 --- a/idl/source/objects/module.cxx +++ b/idl/source/objects/module.cxx @@ -66,9 +66,9 @@ void SvMetaModule::Load( SvPersistStream & rStm ) rStm >> aAttrList; // browser rStm.ReadUniOrByteString( aIdlFileName, rStm.GetStreamCharSet() ); - aHelpFileName = read_lenPrefixed_uInt8s_ToOString(rStm); - aSlotIdFile = read_lenPrefixed_uInt8s_ToOString(rStm); - aModulePrefix = read_lenPrefixed_uInt8s_ToOString(rStm); + aHelpFileName = read_lenPrefixed_uInt8s_ToOString(rStm); + aSlotIdFile = read_lenPrefixed_uInt8s_ToOString(rStm); + aModulePrefix = read_lenPrefixed_uInt8s_ToOString(rStm); // read compiler data sal_uInt16 nCmpLen; @@ -91,9 +91,9 @@ void SvMetaModule::Save( SvPersistStream & rStm ) rStm << aAttrList; // browser rStm.WriteUniOrByteString( aIdlFileName, rStm.GetStreamCharSet() ); - write_lenPrefixed_uInt8s_FromOString(rStm, aHelpFileName); - write_lenPrefixed_uInt8s_FromOString(rStm, aSlotIdFile); - write_lenPrefixed_uInt8s_FromOString(rStm, aModulePrefix); + write_lenPrefixed_uInt8s_FromOString(rStm, aHelpFileName); + write_lenPrefixed_uInt8s_FromOString(rStm, aSlotIdFile); + write_lenPrefixed_uInt8s_FromOString(rStm, aModulePrefix); // write compiler data sal_uInt16 nCmpLen = 0; diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx index 798acbc1e180..9388843dc7cf 100644 --- a/idl/source/objects/object.cxx +++ b/idl/source/objects/object.cxx @@ -55,7 +55,7 @@ void SvClassElement::Load( SvPersistStream & rStm ) return; } if( nMask & 0x01 ) rStm >> aAutomation; - if( nMask & 0x02 ) aPrefix = read_lenPrefixed_uInt8s_ToOString(rStm); + if( nMask & 0x02 ) aPrefix = read_lenPrefixed_uInt8s_ToOString(rStm); if( nMask & 0x04 ) { SvMetaClass * p; @@ -75,7 +75,7 @@ void SvClassElement::Save( SvPersistStream & rStm ) // write data rStm << nMask; if( nMask & 0x01 ) rStm << aAutomation; - if( nMask & 0x02 ) write_lenPrefixed_uInt8s_FromOString(rStm, aPrefix); + if( nMask & 0x02 ) write_lenPrefixed_uInt8s_FromOString(rStm, aPrefix); if( nMask & 0x04 ) rStm << xClass; } diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx index f2488aa0498b..1063baa6ccc0 100644 --- a/idl/source/objects/types.cxx +++ b/idl/source/objects/types.cxx @@ -1780,7 +1780,7 @@ void SvMetaEnumValue::Load( SvPersistStream & rStm ) OSL_FAIL( "wrong format" ); return; } - if( nMask & 0x01 ) aEnumValue = read_lenPrefixed_uInt8s_ToOString(rStm); + if( nMask & 0x01 ) aEnumValue = read_lenPrefixed_uInt8s_ToOString(rStm); } void SvMetaEnumValue::Save( SvPersistStream & rStm ) @@ -1793,7 +1793,7 @@ void SvMetaEnumValue::Save( SvPersistStream & rStm ) // write data rStm << nMask; - if( nMask & 0x01 ) write_lenPrefixed_uInt8s_FromOString(rStm, aEnumValue); + if( nMask & 0x01 ) write_lenPrefixed_uInt8s_FromOString(rStm, aEnumValue); } sal_Bool SvMetaEnumValue::ReadSvIdl( SvIdlDataBase & rBase, @@ -1837,7 +1837,7 @@ void SvMetaTypeEnum::Load( SvPersistStream & rStm ) return; } if( nMask & 0x01 ) rStm >> aEnumValueList; - if( nMask & 0x02 ) aPrefix = read_lenPrefixed_uInt8s_ToOString(rStm); + if( nMask & 0x02 ) aPrefix = read_lenPrefixed_uInt8s_ToOString(rStm); } void SvMetaTypeEnum::Save( SvPersistStream & rStm ) @@ -1852,7 +1852,7 @@ void SvMetaTypeEnum::Save( SvPersistStream & rStm ) // write data rStm << nMask; if( nMask & 0x01 ) rStm << aEnumValueList; - if( nMask & 0x02 ) write_lenPrefixed_uInt8s_FromOString(rStm, aPrefix); + if( nMask & 0x02 ) write_lenPrefixed_uInt8s_FromOString(rStm, aPrefix); } void SvMetaTypeEnum::ReadContextSvIdl( SvIdlDataBase & rBase, diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx index 61b8355826f8..c938a1796c6b 100644 --- a/sc/source/core/tool/autoform.cxx +++ b/sc/source/core/tool/autoform.cxx @@ -799,7 +799,7 @@ sal_Bool ScAutoFormatData::Load( SvStream& rStream, const ScAfVersions& rVersion // --- from 680/dr25 on: store strings as UTF-8 if (nVer >= AUTOFORMAT_ID_680DR25) { - aName = read_lenPrefixed_uInt8s_ToOUString(rStream, + aName = read_lenPrefixed_uInt8s_ToOUString(rStream, RTL_TEXTENCODING_UTF8); } else @@ -869,7 +869,7 @@ sal_Bool ScAutoFormatData::Save(SvStream& rStream) sal_Bool b; rStream << nVal; // --- from 680/dr25 on: store strings as UTF-8 - write_lenPrefixed_uInt8s_FromOUString(rStream, aName, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString(rStream, aName, RTL_TEXTENCODING_UTF8); rStream << nStrResId; rStream << ( b = bIncludeFont ); diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index 55714612b2df..0e4129845e29 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -267,24 +267,24 @@ SvStream& operator >> (SvStream& rIn, SdPublishingDesign& rDesign) sal_uInt16 nTemp16; - rDesign.m_aDesignName = read_lenPrefixed_uInt8s_ToOUString(rIn, + rDesign.m_aDesignName = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); rIn >> nTemp16; rDesign.m_eMode = (HtmlPublishMode)nTemp16; rIn >> rDesign.m_bContentPage; rIn >> rDesign.m_bNotes; rIn >> rDesign.m_nResolution; - rDesign.m_aCompression = read_lenPrefixed_uInt8s_ToOUString(rIn, + rDesign.m_aCompression = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); rIn >> nTemp16; rDesign.m_eFormat = (PublishingFormat)nTemp16; - rDesign.m_aAuthor = read_lenPrefixed_uInt8s_ToOUString(rIn, + rDesign.m_aAuthor = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); - rDesign.m_aEMail = read_lenPrefixed_uInt8s_ToOUString(rIn, + rDesign.m_aEMail = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); - rDesign.m_aWWW = read_lenPrefixed_uInt8s_ToOUString(rIn, + rDesign.m_aWWW = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); - rDesign.m_aMisc = read_lenPrefixed_uInt8s_ToOUString(rIn, + rDesign.m_aMisc = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); rIn >> rDesign.m_bDownload; rIn >> rDesign.m_bCreated; // not used @@ -300,9 +300,9 @@ SvStream& operator >> (SvStream& rIn, SdPublishingDesign& rDesign) rIn >> nTemp16; rDesign.m_eScript = (PublishingScript)nTemp16; - rDesign.m_aURL = read_lenPrefixed_uInt8s_ToOUString(rIn, + rDesign.m_aURL = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); - rDesign.m_aCGI = read_lenPrefixed_uInt8s_ToOUString(rIn, + rDesign.m_aCGI = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); rIn >> rDesign.m_bAutoSlide; @@ -323,23 +323,23 @@ SvStream& operator << (SvStream& rOut, const SdPublishingDesign& rDesign) SdIOCompat aIO(rOut, STREAM_WRITE, 0); // Name - write_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aDesignName, + write_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aDesignName, RTL_TEXTENCODING_UTF8); rOut << (sal_uInt16)rDesign.m_eMode; rOut << rDesign.m_bContentPage; rOut << rDesign.m_bNotes; rOut << rDesign.m_nResolution; - write_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aCompression, + write_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aCompression, RTL_TEXTENCODING_UTF8); rOut << (sal_uInt16)rDesign.m_eFormat; - write_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aAuthor, + write_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aAuthor, RTL_TEXTENCODING_UTF8); - write_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aEMail, + write_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aEMail, RTL_TEXTENCODING_UTF8); - write_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aWWW, + write_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aWWW, RTL_TEXTENCODING_UTF8); - write_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aMisc, + write_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aMisc, RTL_TEXTENCODING_UTF8); rOut << rDesign.m_bDownload; rOut << rDesign.m_bCreated; // not used @@ -354,9 +354,9 @@ SvStream& operator << (SvStream& rOut, const SdPublishingDesign& rDesign) rOut << rDesign.m_bUseColor; rOut << (sal_uInt16)rDesign.m_eScript; - write_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aURL, + write_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aURL, RTL_TEXTENCODING_UTF8); - write_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aCGI, + write_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aCGI, RTL_TEXTENCODING_UTF8); rOut << rDesign.m_bAutoSlide; diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx index 49c7bd3cdcc6..6fdf5fb84e26 100644 --- a/sot/source/sdstor/ucbstorage.cxx +++ b/sot/source/sdstor/ucbstorage.cxx @@ -3303,7 +3303,7 @@ String UCBStorage::GetLinkedFile( SvStream &rStream ) rStream >> nBytes; if( nBytes == 0x04034b50 ) { - ByteString aTmp = read_lenPrefixed_uInt8s_ToOString(rStream); + ByteString aTmp = read_lenPrefixed_uInt8s_ToOString(rStream); if ( aTmp.CompareTo( "ContentURL=", 11 ) == COMPARE_EQUAL ) { aTmp.Erase( 0, 11 ); @@ -3375,7 +3375,7 @@ String UCBStorage::CreateLinkFile( const String& rName ) // store it as key/value pair String aLink = String::CreateFromAscii("ContentURL="); aLink += aURL; - write_lenPrefixed_uInt8s_FromOUString(*pStream, aLink, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString(*pStream, aLink, RTL_TEXTENCODING_UTF8); pStream->Flush(); // move the stream to its desired location diff --git a/svl/source/items/cntwall.cxx b/svl/source/items/cntwall.cxx index 31ef07e8a06e..245596e7fa8e 100644 --- a/svl/source/items/cntwall.cxx +++ b/svl/source/items/cntwall.cxx @@ -80,7 +80,7 @@ CntWallpaperItem::CntWallpaperItem( sal_uInt16 which, SvStream& rStream, sal_uIn readUnicodeString(rStream, _aURL, false); // "Read" SfxWallpaperItem's string member _aFilter. - read_lenPrefixed_uInt8s_ToOString(rStream); + read_lenPrefixed_uInt8s_ToOString(rStream); } } diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index 852e16d32487..0414185896ba 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -1768,7 +1768,7 @@ void SvNumberformat::ConvertLanguage( SvNumberFormatter& rConverter, void SvNumberformat::LoadString( SvStream& rStream, String& rStr ) { CharSet eStream = rStream.GetStreamCharSet(); - ByteString aStr = read_lenPrefixed_uInt8s_ToOString(rStream); + ByteString aStr = read_lenPrefixed_uInt8s_ToOString(rStream); sal_Char cStream = NfCurrencyEntry::GetEuroSymbol( eStream ); if ( aStr.Search( cStream ) == STRING_NOTFOUND ) { // simple conversion to unicode diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx index db3e8728f8d2..eec9b4f241d7 100644 --- a/svtools/source/graphic/grfmgr.cxx +++ b/svtools/source/graphic/grfmgr.cxx @@ -1134,7 +1134,7 @@ SvStream& operator>>( SvStream& rIStm, GraphicObject& rGraphicObj ) if( bLink ) { - rtl::OUString aLink = read_lenPrefixed_uInt8s_ToOUString(rIStm, RTL_TEXTENCODING_UTF8); + rtl::OUString aLink = read_lenPrefixed_uInt8s_ToOUString(rIStm, RTL_TEXTENCODING_UTF8); rGraphicObj.SetLink(aLink); } else @@ -1153,7 +1153,7 @@ SvStream& operator<<( SvStream& rOStm, const GraphicObject& rGraphicObj ) rOStm << rGraphicObj.GetGraphic() << rGraphicObj.GetAttr() << bLink; if( bLink ) - write_lenPrefixed_uInt8s_FromOUString(rOStm, rGraphicObj.GetLink(), RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString(rOStm, rGraphicObj.GetLink(), RTL_TEXTENCODING_UTF8); return rOStm; } diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx index bb720f6838e7..d4199e2539e4 100644 --- a/svtools/source/misc/imap.cxx +++ b/svtools/source/misc/imap.cxx @@ -104,16 +104,16 @@ void IMapObject::Write( SvStream& rOStm, const String& rBaseURL ) const const rtl::OString aRelURL = rtl::OUStringToOString( URIHelper::simpleNormalizedMakeRelative(rBaseURL, aURL), eEncoding); - write_lenPrefixed_uInt8s_FromOString(rOStm, aRelURL); - write_lenPrefixed_uInt8s_FromOUString(rOStm, aAltText, eEncoding); + write_lenPrefixed_uInt8s_FromOString(rOStm, aRelURL); + write_lenPrefixed_uInt8s_FromOUString(rOStm, aAltText, eEncoding); rOStm << bActive; - write_lenPrefixed_uInt8s_FromOUString(rOStm, aTarget, eEncoding); + write_lenPrefixed_uInt8s_FromOUString(rOStm, aTarget, eEncoding); pCompat = new IMapCompat( rOStm, STREAM_WRITE ); WriteIMapObject( rOStm ); aEventList.Write( rOStm ); // V4 - write_lenPrefixed_uInt8s_FromOUString(rOStm, aName, eEncoding); // V5 + write_lenPrefixed_uInt8s_FromOUString(rOStm, aName, eEncoding); // V5 delete pCompat; } @@ -134,10 +134,10 @@ void IMapObject::Read( SvStream& rIStm, const String& rBaseURL ) rIStm.SeekRel( 2 ); rIStm >> nReadVersion; rIStm >> nTextEncoding; - aURL = read_lenPrefixed_uInt8s_ToOUString(rIStm, nTextEncoding); - aAltText = read_lenPrefixed_uInt8s_ToOUString(rIStm, nTextEncoding); + aURL = read_lenPrefixed_uInt8s_ToOUString(rIStm, nTextEncoding); + aAltText = read_lenPrefixed_uInt8s_ToOUString(rIStm, nTextEncoding); rIStm >> bActive; - aTarget = read_lenPrefixed_uInt8s_ToOUString(rIStm, nTextEncoding); + aTarget = read_lenPrefixed_uInt8s_ToOUString(rIStm, nTextEncoding); // URL absolut machen aURL = URIHelper::SmartRel2Abs( INetURLObject(rBaseURL), aURL, URIHelper::GetMaybeFileHdl(), true, false, INetURLObject::WAS_ENCODED, INetURLObject::DECODE_UNAMBIGUOUS ); @@ -152,7 +152,7 @@ void IMapObject::Read( SvStream& rIStm, const String& rBaseURL ) // ab Version 5 kann ein Objektname vorhanden sein if ( nReadVersion >= 0x0005 ) - aName = read_lenPrefixed_uInt8s_ToOUString(rIStm, nTextEncoding); + aName = read_lenPrefixed_uInt8s_ToOUString(rIStm, nTextEncoding); } delete pCompat; @@ -1123,10 +1123,10 @@ void ImageMap::Write( SvStream& rOStm, const String& rBaseURL ) const // MagicCode schreiben rOStm << IMAPMAGIC; rOStm << GetVersion(); - write_lenPrefixed_uInt8s_FromOUString(rOStm, aImageName, eEncoding); - write_lenPrefixed_uInt8s_FromOString(rOStm, rtl::OString()); //dummy + write_lenPrefixed_uInt8s_FromOUString(rOStm, aImageName, eEncoding); + write_lenPrefixed_uInt8s_FromOString(rOStm, rtl::OString()); //dummy rOStm << nCount; - write_lenPrefixed_uInt8s_FromOUString(rOStm, aImageName, eEncoding); + write_lenPrefixed_uInt8s_FromOUString(rOStm, aImageName, eEncoding); pCompat = new IMapCompat( rOStm, STREAM_WRITE ); @@ -1165,10 +1165,10 @@ void ImageMap::Read( SvStream& rIStm, const String& rBaseURL ) // Version ueberlesen wir rIStm.SeekRel( 2 ); - aName = read_lenPrefixed_uInt8s_ToOUString(rIStm, osl_getThreadTextEncoding()); - read_lenPrefixed_uInt8s_ToOString(rIStm); // Dummy + aName = read_lenPrefixed_uInt8s_ToOUString(rIStm, osl_getThreadTextEncoding()); + read_lenPrefixed_uInt8s_ToOString(rIStm); // Dummy rIStm >> nCount; - read_lenPrefixed_uInt8s_ToOString(rIStm); // Dummy + read_lenPrefixed_uInt8s_ToOString(rIStm); // Dummy pCompat = new IMapCompat( rIStm, STREAM_READ ); diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx index 9b7cfe2739e6..2170c1f218f1 100644 --- a/svx/source/gallery2/gallery1.cxx +++ b/svx/source/gallery2/gallery1.cxx @@ -132,12 +132,12 @@ void GalleryThemeEntry::SetId( sal_uInt32 nNewId, sal_Bool bResetThemeName ) SvStream& operator<<( SvStream& rOut, const GalleryImportThemeEntry& rEntry ) { - write_lenPrefixed_uInt8s_FromOUString(rOut, rEntry.aThemeName, RTL_TEXTENCODING_UTF8); - write_lenPrefixed_uInt8s_FromOUString(rOut, rEntry.aUIName, RTL_TEXTENCODING_UTF8); - write_lenPrefixed_uInt8s_FromOUString(rOut, (rEntry.aURL.GetMainURL( INetURLObject::NO_DECODE )), RTL_TEXTENCODING_UTF8); - write_lenPrefixed_uInt8s_FromOUString(rOut, rEntry.aImportName, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString(rOut, rEntry.aThemeName, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString(rOut, rEntry.aUIName, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString(rOut, (rEntry.aURL.GetMainURL( INetURLObject::NO_DECODE )), RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString(rOut, rEntry.aImportName, RTL_TEXTENCODING_UTF8); - write_lenPrefixed_uInt8s_FromOString(rOut, rtl::OString()); + write_lenPrefixed_uInt8s_FromOString(rOut, rtl::OString()); return rOut; } @@ -145,11 +145,11 @@ SvStream& operator<<( SvStream& rOut, const GalleryImportThemeEntry& rEntry ) SvStream& operator>>( SvStream& rIn, GalleryImportThemeEntry& rEntry ) { - rEntry.aThemeName = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); - rEntry.aUIName = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); - rEntry.aURL = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); - rEntry.aImportName = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); - read_lenPrefixed_uInt8s_ToOString(rIn); + rEntry.aThemeName = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); + rEntry.aUIName = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); + rEntry.aURL = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); + rEntry.aImportName = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); + read_lenPrefixed_uInt8s_ToOString(rIn); return rIn; } diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx index ddf56cbd7c01..9bfa16ba489a 100644 --- a/svx/source/gallery2/galobj.cxx +++ b/svx/source/gallery2/galobj.cxx @@ -168,7 +168,7 @@ void SgaObject::WriteData( SvStream& rOut, const String& rDestDir ) const String aURLWithoutDestDir = String(aURL.GetMainURL( INetURLObject::NO_DECODE )); aURLWithoutDestDir.SearchAndReplace(rDestDir, String()); - write_lenPrefixed_uInt8s_FromOUString(rOut, aURLWithoutDestDir, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString(rOut, aURLWithoutDestDir, RTL_TEXTENCODING_UTF8); } // ------------------------------------------------------------------------ @@ -185,7 +185,7 @@ void SgaObject::ReadData(SvStream& rIn, sal_uInt16& rReadVersion ) else rIn >> aThumbMtf; - rtl::OUString aTmpStr = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); + rtl::OUString aTmpStr = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); aURL = INetURLObject(aTmpStr); } @@ -293,8 +293,8 @@ void SgaObjectBmp::WriteData( SvStream& rOut, const String& rDestDir ) const SgaObject::WriteData( rOut, rDestDir ); char aDummy[ 10 ]; rOut.Write( aDummy, 10 ); - write_lenPrefixed_uInt8s_FromOString(rOut, rtl::OString()); //dummy - write_lenPrefixed_uInt8s_FromOUString(rOut, aTitle, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOString(rOut, rtl::OString()); //dummy + write_lenPrefixed_uInt8s_FromOUString(rOut, aTitle, RTL_TEXTENCODING_UTF8); } // ------------------------------------------------------------------------ @@ -304,10 +304,10 @@ void SgaObjectBmp::ReadData( SvStream& rIn, sal_uInt16& rReadVersion ) SgaObject::ReadData( rIn, rReadVersion ); rIn.SeekRel( 10 ); // 16, 16, 32, 16 - read_lenPrefixed_uInt8s_ToOString(rIn); //dummy + read_lenPrefixed_uInt8s_ToOString(rIn); //dummy if( rReadVersion >= 5 ) - aTitle = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); + aTitle = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); } // ------------------ @@ -374,7 +374,7 @@ void SgaObjectSound::WriteData( SvStream& rOut, const String& rDestDir ) const { SgaObject::WriteData( rOut, rDestDir ); rOut << (sal_uInt16) eSoundType; - write_lenPrefixed_uInt8s_FromOUString(rOut, aTitle, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString(rOut, aTitle, RTL_TEXTENCODING_UTF8); } // ------------------------------------------------------------------------ @@ -390,7 +390,7 @@ void SgaObjectSound::ReadData( SvStream& rIn, sal_uInt16& rReadVersion ) rIn >> nTmp16; eSoundType = (GalSoundType) nTmp16; if( rReadVersion >= 6 ) - aTitle = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); + aTitle = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); } } @@ -581,7 +581,7 @@ sal_Bool SgaObjectSvDraw::DrawCentered( OutputDevice* pOut, const FmFormModel& r void SgaObjectSvDraw::WriteData( SvStream& rOut, const String& rDestDir ) const { SgaObject::WriteData( rOut, rDestDir ); - write_lenPrefixed_uInt8s_FromOUString(rOut, aTitle, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString(rOut, aTitle, RTL_TEXTENCODING_UTF8); } // ------------------------------------------------------------------------ @@ -591,7 +591,7 @@ void SgaObjectSvDraw::ReadData( SvStream& rIn, sal_uInt16& rReadVersion ) SgaObject::ReadData( rIn, rReadVersion ); if( rReadVersion >= 5 ) - aTitle = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); + aTitle = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index 4a34a85ee611..9ce8d48d00e2 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -733,7 +733,7 @@ GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const INetURLObject& rURL, sa { sal_uInt32 nThemeId = 0; - rtl::OString aTmpStr = read_lenPrefixed_uInt8s_ToOString(*pIStm); + rtl::OString aTmpStr = read_lenPrefixed_uInt8s_ToOString(*pIStm); aThemeName = rtl::OStringToOUString(aTmpStr, RTL_TEXTENCODING_UTF8); // Charakterkonvertierung durchfuehren @@ -1354,7 +1354,7 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const sal_Bool bRel; rOStm << (sal_uInt16) 0x0004; - write_lenPrefixed_uInt8s_FromOUString(rOStm, GetRealName(), RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString(rOStm, GetRealName(), RTL_TEXTENCODING_UTF8); rOStm << nCount << (sal_uInt16) osl_getThreadTextEncoding(); for( sal_uInt32 i = 0; i < nCount; i++ ) @@ -1394,7 +1394,7 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const aPath.SearchAndReplace(m_aDestDir, String()); rOStm << bRel; - write_lenPrefixed_uInt8s_FromOUString(rOStm, aPath, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString(rOStm, aPath, RTL_TEXTENCODING_UTF8); rOStm << pObj->nOffset << (sal_uInt16) pObj->eObjKind; } @@ -1434,7 +1434,7 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm ) aImportName = rtl::OUString(); rIStm >> nVersion; - rtl::OString aTmpStr = read_lenPrefixed_uInt8s_ToOString(rIStm); + rtl::OString aTmpStr = read_lenPrefixed_uInt8s_ToOString(rIStm); rIStm >> nCount; if( nVersion >= 0x0004 ) @@ -1474,7 +1474,7 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm ) sal_uInt16 nTemp; rIStm >> bRel; - rtl::OString aTempFileName = read_lenPrefixed_uInt8s_ToOString(rIStm); + rtl::OString aTempFileName = read_lenPrefixed_uInt8s_ToOString(rIStm); rIStm >> pObj->nOffset; rIStm >> nTemp; pObj->eObjKind = (SgaObjKind) nTemp; diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx index be2d325aef8f..4ecbd2abe185 100644 --- a/sw/source/core/doc/tblafmt.cxx +++ b/sw/source/core/doc/tblafmt.cxx @@ -486,7 +486,7 @@ sal_Bool SwBoxAutoFmt::Save( SvStream& rStream ) const aRotateMode.Store( rStream, aRotateMode.GetVersion(SOFFICE_FILEFORMAT_40) ); // --- from 680/dr25 on: store strings as UTF-8 - write_lenPrefixed_uInt8s_FromOUString(rStream, sNumFmtString, + write_lenPrefixed_uInt8s_FromOUString(rStream, sNumFmtString, RTL_TEXTENCODING_UTF8); rStream << (sal_uInt16)eSysLanguage << (sal_uInt16)eNumFmtLanguage; @@ -861,7 +861,7 @@ sal_Bool SwTableAutoFmt::Save( SvStream& rStream ) const sal_Bool b; rStream << nVal; // --- from 680/dr25 on: store strings as UTF-8 - write_lenPrefixed_uInt8s_FromOUString(rStream, aName, + write_lenPrefixed_uInt8s_FromOUString(rStream, aName, RTL_TEXTENCODING_UTF8 ); rStream << nStrResId; rStream << ( b = bInclFont ); diff --git a/tools/inc/tools/inetmsg.hxx b/tools/inc/tools/inetmsg.hxx index 7c88b9c3aa7a..0c3468082b36 100644 --- a/tools/inc/tools/inetmsg.hxx +++ b/tools/inc/tools/inetmsg.hxx @@ -80,16 +80,16 @@ public: friend SvStream& operator<< ( SvStream& rStrm, const INetMessageHeader& rHdr) { - write_lenPrefixed_uInt8s_FromOString(rStrm, rHdr.m_aName); - write_lenPrefixed_uInt8s_FromOString(rStrm, rHdr.m_aValue); + write_lenPrefixed_uInt8s_FromOString(rStrm, rHdr.m_aName); + write_lenPrefixed_uInt8s_FromOString(rStrm, rHdr.m_aValue); return rStrm; } friend SvStream& operator>> ( SvStream& rStrm, INetMessageHeader& rHdr) { - rHdr.m_aName = read_lenPrefixed_uInt8s_ToOString(rStrm); - rHdr.m_aValue = read_lenPrefixed_uInt8s_ToOString(rStrm); + rHdr.m_aName = read_lenPrefixed_uInt8s_ToOString(rStrm); + rHdr.m_aValue = read_lenPrefixed_uInt8s_ToOString(rStrm); return rStrm; } }; diff --git a/tools/inc/tools/stream.hxx b/tools/inc/tools/stream.hxx index 4d316708b152..2270effbd074 100644 --- a/tools/inc/tools/stream.hxx +++ b/tools/inc/tools/stream.hxx @@ -566,7 +566,7 @@ TOOLS_DLLPUBLIC rtl::OUString read_zeroTerminated_uInt8s_ToOUString(SvStream& rS //Attempt to read a pascal-style length (of type prefix) prefixed sequence of //8bit units to an OString, returned rtl::OString's length is number of units //successfully read. -template rtl::OString read_lenPrefixed_uInt8s_ToOString(SvStream& rStrm) +template rtl::OString read_lenPrefixed_uInt8s_ToOString(SvStream& rStrm) { prefix nLen = 0; rStrm >> nLen; @@ -575,7 +575,7 @@ template rtl::OString read_lenPrefixed_uInt8s_ToOStr //Attempt to read a pascal-style length (of type prefix) prefixed sequence of //8bit units to an OUString -template rtl::OUString read_lenPrefixed_uInt8s_ToOUString(SvStream& rStrm, +template rtl::OUString read_lenPrefixed_uInt8s_ToOUString(SvStream& rStrm, rtl_TextEncoding eEnc) { return rtl::OStringToOUString(read_lenPrefixed_uInt8s_ToOString(rStrm), eEnc); @@ -584,7 +584,7 @@ template rtl::OUString read_lenPrefixed_uInt8s_ToOUS //Attempt to write a pascal-style length (of type prefix) prefixed sequence of //8bit units from an OString, returned value is number of bytes written (including //byte-count of prefix) -template sal_Size write_lenPrefixed_uInt8s_FromOString(SvStream& rStrm, +template sal_Size write_lenPrefixed_uInt8s_FromOString(SvStream& rStrm, const rtl::OString &rStr) { SAL_WARN_IF(rStr.getLength() > std::numeric_limits::max(), @@ -605,7 +605,7 @@ template sal_Size write_lenPrefixed_uInt8s_FromOStri //Attempt to write a pascal-style length (of type prefix) prefixed sequence of //8bit units from an OUString, returned value is number of bytes written (including //byte-count of prefix) -template sal_Size write_lenPrefixed_uInt8s_FromOUString(SvStream& rStrm, +template sal_Size write_lenPrefixed_uInt8s_FromOUString(SvStream& rStrm, const rtl::OUString &rStr, rtl_TextEncoding eEnc) { return write_lenPrefixed_uInt8s_FromOString(rStrm, rtl::OUStringToOString(rStr, eEnc)); diff --git a/tools/source/inet/inetmsg.cxx b/tools/source/inet/inetmsg.cxx index a49d382ef158..45bd0cb02a14 100644 --- a/tools/source/inet/inetmsg.cxx +++ b/tools/source/inet/inetmsg.cxx @@ -137,7 +137,7 @@ sal_uIntPtr INetMessage::SetHeaderField ( SvStream& INetMessage::operator<< (SvStream& rStrm) const { rStrm << static_cast(m_nDocSize); - write_lenPrefixed_uInt8s_FromOUString(rStrm, m_aDocName, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString(rStrm, m_aDocName, RTL_TEXTENCODING_UTF8); sal_uIntPtr i, n = m_aHeaderList.size(); rStrm << static_cast(n); @@ -163,7 +163,7 @@ SvStream& INetMessage::operator>> (SvStream& rStrm) // Copy. rStrm >> nTemp; m_nDocSize = nTemp; - m_aDocName = read_lenPrefixed_uInt8s_ToOUString(rStrm, RTL_TEXTENCODING_UTF8); + m_aDocName = read_lenPrefixed_uInt8s_ToOUString(rStrm, RTL_TEXTENCODING_UTF8); sal_uIntPtr i, n = 0; rStrm >> nTemp; @@ -1161,7 +1161,7 @@ SvStream& INetMIMEMessage::operator<< (SvStream& rStrm) const for (sal_uInt16 i = 0; i < INETMSG_MIME_NUMHDR; i++) rStrm << static_cast(m_nIndex[i]); - write_lenPrefixed_uInt8s_FromOString(rStrm, m_aBoundary); + write_lenPrefixed_uInt8s_FromOString(rStrm, m_aBoundary); rStrm << static_cast(aChildren.size()); return rStrm; @@ -1181,7 +1181,7 @@ SvStream& INetMIMEMessage::operator>> (SvStream& rStrm) m_nIndex[i] = nTemp; } - m_aBoundary = read_lenPrefixed_uInt8s_ToOString(rStrm); + m_aBoundary = read_lenPrefixed_uInt8s_ToOString(rStrm); rStrm >> nTemp; diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx index aab11a6ffc51..2a5cd4a79927 100644 --- a/tools/source/stream/stream.cxx +++ b/tools/source/stream/stream.cxx @@ -1517,7 +1517,7 @@ SvStream& SvStream::ReadUniOrByteString( UniString& rStr, rtl_TextEncoding eSrcC return *this; } - rStr = read_lenPrefixed_uInt8s_ToOUString(*this, eSrcCharSet); + rStr = read_lenPrefixed_uInt8s_ToOUString(*this, eSrcCharSet); return *this; } @@ -1551,7 +1551,7 @@ SvStream& SvStream::WriteUniOrByteString( const UniString& rStr, rtl_TextEncodin return *this; } - write_lenPrefixed_uInt8s_FromOUString(*this, rStr, eDestCharSet); + write_lenPrefixed_uInt8s_FromOUString(*this, rStr, eDestCharSet); return *this; } diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx index 636df96a6c66..28eca90b9d59 100644 --- a/vcl/source/gdi/animate.cxx +++ b/vcl/source/gdi/animate.cxx @@ -824,7 +824,7 @@ SvStream& operator<<( SvStream& rOStm, const Animation& rAnimation ) rOStm << nDummy32; // unbenutzt rOStm << nDummy32; // unbenutzt rOStm << nDummy32; // unbenutzt - write_lenPrefixed_uInt8s_FromOString(rOStm, rtl::OString()); // dummy + write_lenPrefixed_uInt8s_FromOString(rOStm, rtl::OString()); // dummy rOStm << nRest; // Anzahl der Strukturen, die noch _folgen_ } } @@ -888,7 +888,7 @@ SvStream& operator>>( SvStream& rIStm, Animation& rAnimation ) rIStm >> nTmp32; // unbenutzt rIStm >> nTmp32; // unbenutzt rIStm >> nTmp32; // unbenutzt - read_lenPrefixed_uInt8s_ToOString(rIStm); // unbenutzt + read_lenPrefixed_uInt8s_ToOString(rIStm); // unbenutzt rIStm >> nTmp16; // Rest zu lesen rAnimation.Insert( aAnimBmp ); diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx index 738a5907172b..2026cebf3c3e 100644 --- a/vcl/source/gdi/cvtsvm.cxx +++ b/vcl/source/gdi/cvtsvm.cxx @@ -1327,7 +1327,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) sal_uInt8* pData; sal_Int32 nFollowingActionCount; - rtl::OString aComment = read_lenPrefixed_uInt8s_ToOString(rIStm); + rtl::OString aComment = read_lenPrefixed_uInt8s_ToOString(rIStm); rIStm >> nValue >> nDataSize; if( nDataSize ) @@ -2412,7 +2412,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, rOStm.SeekRel( 4 ); // write data - write_lenPrefixed_uInt8s_FromOString(rOStm, pA->GetComment()); + write_lenPrefixed_uInt8s_FromOString(rOStm, pA->GetComment()); rOStm << pA->GetValue() << nDataSize; if( nDataSize ) diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx index 8d3ef576690e..2415500a905a 100644 --- a/vcl/source/gdi/jobset.cxx +++ b/vcl/source/gdi/jobset.cxx @@ -334,8 +334,8 @@ SvStream& operator>>( SvStream& rIStream, JobSetup& rJobSetup ) rIStream.Seek( nFirstPos + sizeof( ImplOldJobSetupData ) + 4 + sizeof( Impl364JobSetupData ) + pJobData->mnDriverDataLen ); while( rIStream.Tell() < nFirstPos + nLen ) { - String aKey = read_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8); - String aValue = read_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8); + String aKey = read_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8); + String aValue = read_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8); if( aKey.EqualsAscii( "COMPAT_DUPLEX_MODE" ) ) { if( aValue.EqualsAscii( "DUPLEX_UNKNOWN" ) ) @@ -406,23 +406,23 @@ SvStream& operator<<( SvStream& rOStream, const JobSetup& rJobSetup ) ::boost::unordered_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash >::const_iterator it; for( it = pJobData->maValueMap.begin(); it != pJobData->maValueMap.end(); ++it ) { - write_lenPrefixed_uInt8s_FromOUString(rOStream, it->first, RTL_TEXTENCODING_UTF8); - write_lenPrefixed_uInt8s_FromOUString(rOStream, it->second, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString(rOStream, it->first, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString(rOStream, it->second, RTL_TEXTENCODING_UTF8); } - write_lenPrefixed_uInt8s_FromOString(rOStream, "COMPAT_DUPLEX_MODE"); + write_lenPrefixed_uInt8s_FromOString(rOStream, "COMPAT_DUPLEX_MODE"); switch( pJobData->meDuplexMode ) { case DUPLEX_UNKNOWN: - write_lenPrefixed_uInt8s_FromOString(rOStream, "DUPLEX_UNKNOWN"); + write_lenPrefixed_uInt8s_FromOString(rOStream, "DUPLEX_UNKNOWN"); break; case DUPLEX_OFF: - write_lenPrefixed_uInt8s_FromOString(rOStream, "DUPLEX_OFF"); + write_lenPrefixed_uInt8s_FromOString(rOStream, "DUPLEX_OFF"); break; case DUPLEX_SHORTEDGE: - write_lenPrefixed_uInt8s_FromOString(rOStream, "DUPLEX_SHORTEDGE"); + write_lenPrefixed_uInt8s_FromOString(rOStream, "DUPLEX_SHORTEDGE"); break; case DUPLEX_LONGEDGE: - write_lenPrefixed_uInt8s_FromOString(rOStream, "DUPLEX_LONGEDGE"); + write_lenPrefixed_uInt8s_FromOString(rOStream, "DUPLEX_LONGEDGE"); break; } nLen = sal::static_int_cast(rOStream.Tell() - nPos); diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx index 2fd96e835910..74881f6fdc58 100644 --- a/vcl/source/gdi/metaact.cxx +++ b/vcl/source/gdi/metaact.cxx @@ -4198,7 +4198,7 @@ sal_Bool MetaCommentAction::Compare( const MetaAction& rMetaAction ) const void MetaCommentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); - write_lenPrefixed_uInt8s_FromOString(rOStm, maComment); + write_lenPrefixed_uInt8s_FromOString(rOStm, maComment); rOStm << mnValue << mnDataSize; if ( mnDataSize ) @@ -4210,7 +4210,7 @@ void MetaCommentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) void MetaCommentAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); - maComment = read_lenPrefixed_uInt8s_ToOString(rIStm); + maComment = read_lenPrefixed_uInt8s_ToOString(rIStm); rIStm >> mnValue >> mnDataSize; delete[] mpData; diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index 9cede2527aaa..e25aa3a92882 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -280,10 +280,10 @@ SvStream& operator<<( SvStream& rOStream, const QueueInfo& rInfo ) { VersionCompat aCompat( rOStream, STREAM_WRITE, 1 ); - write_lenPrefixed_uInt8s_FromOUString(rOStream, rInfo.maPrinterName, RTL_TEXTENCODING_UTF8); - write_lenPrefixed_uInt8s_FromOUString(rOStream, rInfo.maDriver, RTL_TEXTENCODING_UTF8); - write_lenPrefixed_uInt8s_FromOUString(rOStream, rInfo.maLocation, RTL_TEXTENCODING_UTF8); - write_lenPrefixed_uInt8s_FromOUString(rOStream, rInfo.maComment, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString(rOStream, rInfo.maPrinterName, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString(rOStream, rInfo.maDriver, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString(rOStream, rInfo.maLocation, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString(rOStream, rInfo.maComment, RTL_TEXTENCODING_UTF8); rOStream << rInfo.mnStatus; rOStream << rInfo.mnJobs; @@ -296,10 +296,10 @@ SvStream& operator>>( SvStream& rIStream, QueueInfo& rInfo ) { VersionCompat aCompat( rIStream, STREAM_READ ); - rInfo.maPrinterName = read_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8); - rInfo.maDriver = read_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8); - rInfo.maLocation = read_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8); - rInfo.maComment = read_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8); + rInfo.maPrinterName = read_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8); + rInfo.maDriver = read_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8); + rInfo.maLocation = read_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8); + rInfo.maComment = read_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8); rIStream >> rInfo.mnStatus; rIStream >> rInfo.mnJobs; diff --git a/vcl/source/gdi/rendergraphic.cxx b/vcl/source/gdi/rendergraphic.cxx index 16b08c4de17a..4f333cd1c5c0 100644 --- a/vcl/source/gdi/rendergraphic.cxx +++ b/vcl/source/gdi/rendergraphic.cxx @@ -194,7 +194,7 @@ void RenderGraphic::ImplGetDefaults() const ::VersionCompat aVCompat( rIStm, STREAM_READ ); sal_uInt32 nGraphicDataLength = 0; - rtl::OUString aGraphicDataMimeType = read_lenPrefixed_uInt8s_ToOUString(rIStm, RTL_TEXTENCODING_ASCII_US); + rtl::OUString aGraphicDataMimeType = read_lenPrefixed_uInt8s_ToOUString(rIStm, RTL_TEXTENCODING_ASCII_US); rIStm >> nGraphicDataLength; rRenderGraphic = RenderGraphic( aGraphicDataMimeType, nGraphicDataLength ); @@ -214,7 +214,7 @@ void RenderGraphic::ImplGetDefaults() const ::VersionCompat aVCompat( rOStm, STREAM_WRITE, 1 ); const sal_uInt32 nGraphicDataLength = rRenderGraphic.GetGraphicDataLength(); - write_lenPrefixed_uInt8s_FromOUString(rOStm, rRenderGraphic.GetGraphicDataMimeType(), + write_lenPrefixed_uInt8s_FromOUString(rOStm, rRenderGraphic.GetGraphicDataMimeType(), RTL_TEXTENCODING_ASCII_US); rOStm << nGraphicDataLength; diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index 44ca911f6987..32fd0f3be061 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -160,10 +160,10 @@ ImplFontAttrCache::ImplFontAttrCache( const String& rFileNameURL, const String& ImplDevFontAttributes aDFA; for(;;) { - aFontFileURL = read_lenPrefixed_uInt8s_ToOUString(aCacheFile, RTL_TEXTENCODING_UTF8); + aFontFileURL = read_lenPrefixed_uInt8s_ToOUString(aCacheFile, RTL_TEXTENCODING_UTF8); if( !aFontFileURL.Len() ) break; - aDFA.maName = read_lenPrefixed_uInt8s_ToOUString(aCacheFile, RTL_TEXTENCODING_UTF8); + aDFA.maName = read_lenPrefixed_uInt8s_ToOUString(aCacheFile, RTL_TEXTENCODING_UTF8); short n; aCacheFile >> n; aDFA.meWeight = static_cast(n); @@ -195,8 +195,8 @@ ImplFontAttrCache::~ImplFontAttrCache() { const String rFontFileURL( (*aIter).first ); const ImplDevFontAttributes& rDFA( (*aIter).second ); - write_lenPrefixed_uInt8s_FromOUString(aCacheFile, rFontFileURL, RTL_TEXTENCODING_UTF8); - write_lenPrefixed_uInt8s_FromOUString(aCacheFile, rDFA.maName, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString(aCacheFile, rFontFileURL, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString(aCacheFile, rDFA.maName, RTL_TEXTENCODING_UTF8); aCacheFile << static_cast(rDFA.meWeight); aCacheFile << static_cast(rDFA.meItalic); @@ -205,7 +205,7 @@ ImplFontAttrCache::~ImplFontAttrCache() aCacheFile << static_cast(rDFA.meFamily); aCacheFile << static_cast(rDFA.mbSymbolFlag != false); - write_lenPrefixed_uInt8s_FromOUString(aCacheFile, rDFA.maStyleName, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString(aCacheFile, rDFA.maStyleName, RTL_TEXTENCODING_UTF8); ++aIter; } -- cgit v1.2.3 From 5c1dc778d6ce38d563462a76cdc454ed476cf15b Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 22 Dec 2011 10:46:58 +0000 Subject: remove some unused code --- canvas/Library_canvastools.mk | 1 - canvas/Package_inc.mk | 1 - canvas/inc/canvas/prioritybooster.hxx | 69 ------------------ canvas/source/tools/prioritybooster.cxx | 83 ---------------------- chart2/source/controller/main/UndoGuard.cxx | 18 ----- chart2/source/controller/main/UndoGuard.hxx | 13 ---- comphelper/inc/comphelper/eventattachermgr.hxx | 7 -- .../source/eventattachermgr/eventattachermgr.cxx | 12 ---- sc/inc/clipparam.hxx | 13 ---- sc/inc/document.hxx | 1 - sc/source/core/data/clipparam.cxx | 17 ----- sd/source/ui/slideshow/slideshowimpl.cxx | 1 - unusedcode.easy | 8 --- 13 files changed, 244 deletions(-) delete mode 100644 canvas/inc/canvas/prioritybooster.hxx delete mode 100644 canvas/source/tools/prioritybooster.cxx (limited to 'sd') diff --git a/canvas/Library_canvastools.mk b/canvas/Library_canvastools.mk index d9adfca70fc8..d0b11a2316f7 100644 --- a/canvas/Library_canvastools.mk +++ b/canvas/Library_canvastools.mk @@ -64,7 +64,6 @@ $(eval $(call gb_Library_add_exception_objects,canvastools,\ canvas/source/tools/page \ canvas/source/tools/pagemanager \ canvas/source/tools/parametricpolypolygon \ - canvas/source/tools/prioritybooster \ canvas/source/tools/propertysethelper \ canvas/source/tools/spriteredrawmanager \ canvas/source/tools/surface \ diff --git a/canvas/Package_inc.mk b/canvas/Package_inc.mk index f3892ca98753..500ed443fc29 100644 --- a/canvas/Package_inc.mk +++ b/canvas/Package_inc.mk @@ -46,7 +46,6 @@ $(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/canvastoolsdllapi.h,canv $(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/debug.hxx,canvas/debug.hxx)) $(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/elapsedtime.hxx,canvas/elapsedtime.hxx)) $(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/parametricpolypolygon.hxx,canvas/parametricpolypolygon.hxx)) -$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/prioritybooster.hxx,canvas/prioritybooster.hxx)) $(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/propertysethelper.hxx,canvas/propertysethelper.hxx)) $(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/rendering/bitmap.hxx,canvas/rendering/bitmap.hxx)) $(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/rendering/icachedprimitive.hxx,canvas/rendering/icachedprimitive.hxx)) diff --git a/canvas/inc/canvas/prioritybooster.hxx b/canvas/inc/canvas/prioritybooster.hxx deleted file mode 100644 index dfa2196d9189..000000000000 --- a/canvas/inc/canvas/prioritybooster.hxx +++ /dev/null @@ -1,69 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef INCLUDED_CANVAS_PRIORITYBOOSTER_HXX -#define INCLUDED_CANVAS_PRIORITYBOOSTER_HXX - -#include - -#include -#include - - -namespace canvas -{ - namespace tools - { - struct PriorityBooster_Impl; - - /** Simplistic RAII object, to temporarily boost execution - priority for the current scope. - */ - class PriorityBooster - { - public: - /** Create booster, with given priority delta - - @param nDelta - Difference in execution priority. Positive values - increase prio, negative values decrease prio. - */ - CANVASTOOLS_DLLPUBLIC explicit PriorityBooster( sal_Int32 nDelta ); - CANVASTOOLS_DLLPUBLIC ~PriorityBooster(); - - private: - // also disables copy constructor and assignment operator - const ::std::auto_ptr< PriorityBooster_Impl > mpImpl; - }; - } -} - -#endif /* INCLUDED_CANVAS_PRIORITYBOOSTER_HXX */ -// eof - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/tools/prioritybooster.cxx b/canvas/source/tools/prioritybooster.cxx deleted file mode 100644 index 837ebb80d9c6..000000000000 --- a/canvas/source/tools/prioritybooster.cxx +++ /dev/null @@ -1,83 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - - - -#ifdef WNT -# if defined _MSC_VER -# pragma warning(push,1) -# endif - -# include - -# if defined _MSC_VER -# pragma warning(pop) -# endif -#endif - -#include "osl/diagnose.h" -#include "canvas/prioritybooster.hxx" - - -namespace canvas -{ - namespace tools - { - struct PriorityBooster_Impl - { - int mnOldPriority; - }; - - PriorityBooster::PriorityBooster( sal_Int32 nDelta ) : - mpImpl( new PriorityBooster_Impl ) - { -#ifdef WNT - HANDLE aCurrThread = GetCurrentThread(); - mpImpl->mnOldPriority = GetThreadPriority( aCurrThread ); - - if ( 0 == SetThreadPriority( aCurrThread, mpImpl->mnOldPriority + nDelta ) ) - { - OSL_FAIL( "PriorityBooster::PriorityBooster(): Was not able to modify thread priority" ); - } -#else - (void)nDelta; -#endif - } - - PriorityBooster::~PriorityBooster() - { -#ifdef WNT - SetThreadPriority( GetCurrentThread(), - mpImpl->mnOldPriority ); -#endif - } - } // namespace tools - -} // namespace canvas - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/main/UndoGuard.cxx b/chart2/source/controller/main/UndoGuard.cxx index 3bcdc9f5c45b..4069b3e1ffa9 100644 --- a/chart2/source/controller/main/UndoGuard.cxx +++ b/chart2/source/controller/main/UndoGuard.cxx @@ -145,24 +145,6 @@ UndoGuardWithSelection::~UndoGuardWithSelection() rollback(); } -//----------------------------------------------------------------------------- - -UndoContext::UndoContext( const Reference< document::XUndoManager > & i_undoManager, const ::rtl::OUString& i_undoTitle ) - :m_xUndoManager( i_undoManager ) -{ - ENSURE_OR_THROW( m_xUndoManager.is(), "invalid undo manager!" ); - m_xUndoManager->enterUndoContext( i_undoTitle ); -} - -//----------------------------------------------------------------------------- - -UndoContext::~UndoContext() -{ - m_xUndoManager->leaveUndoContext(); -} - -//----------------------------------------------------------------------------- - HiddenUndoContext::HiddenUndoContext( const Reference< document::XUndoManager > & i_undoManager ) :m_xUndoManager( i_undoManager ) { diff --git a/chart2/source/controller/main/UndoGuard.hxx b/chart2/source/controller/main/UndoGuard.hxx index ccf25048fd92..61e4a47ce81e 100644 --- a/chart2/source/controller/main/UndoGuard.hxx +++ b/chart2/source/controller/main/UndoGuard.hxx @@ -108,19 +108,6 @@ public: virtual ~UndoGuardWithSelection(); }; -class UndoContext -{ -public: - UndoContext( - const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > & i_undoManager, - const ::rtl::OUString& i_undoTitle - ); - ~UndoContext(); - -private: - const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > m_xUndoManager; -}; - class HiddenUndoContext { public: diff --git a/comphelper/inc/comphelper/eventattachermgr.hxx b/comphelper/inc/comphelper/eventattachermgr.hxx index f534ba26dbe5..6d2d7f5bf493 100644 --- a/comphelper/inc/comphelper/eventattachermgr.hxx +++ b/comphelper/inc/comphelper/eventattachermgr.hxx @@ -51,13 +51,6 @@ namespace beans { namespace comphelper { -COMPHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::script::XEventAttacherManager > -createEventAttacherManager( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XIntrospection > & rIntrospection, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr ) - throw( ::com::sun::star::uno::Exception ); - - COMPHELPER_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::script::XEventAttacherManager > createEventAttacherManager( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr ) diff --git a/comphelper/source/eventattachermgr/eventattachermgr.cxx b/comphelper/source/eventattachermgr/eventattachermgr.cxx index ca6372973778..9c119a1f5d5c 100644 --- a/comphelper/source/eventattachermgr/eventattachermgr.cxx +++ b/comphelper/source/eventattachermgr/eventattachermgr.cxx @@ -360,18 +360,6 @@ void SAL_CALL AttacherAllListener_Impl::disposing(const EventObject& ) } -//======================================================================== -//======================================================================== -//======================================================================== - -// Create-Methode fuer EventAttacherManager -Reference< XEventAttacherManager > createEventAttacherManager( const Reference< XIntrospection > & rIntrospection, - const Reference< XMultiServiceFactory > & rSMgr ) - throw( Exception ) -{ - return new ImplEventAttacherManager( rIntrospection, rSMgr ); -} - // Create-Methode fuer EventAttacherManager Reference< XEventAttacherManager > createEventAttacherManager( const Reference< XMultiServiceFactory > & rSMgr ) throw( Exception ) diff --git a/sc/inc/clipparam.hxx b/sc/inc/clipparam.hxx index f8a4038eaca4..63b4c9aecf53 100644 --- a/sc/inc/clipparam.hxx +++ b/sc/inc/clipparam.hxx @@ -79,19 +79,6 @@ struct ScClipParam void setSourceDocID( sal_uInt32 nVal ) { mnSourceDocID = nVal; } }; -// ============================================================================ - -struct ScClipRangeNameData -{ - ScRangeData::IndexMap maRangeMap; - ::std::vector mpRangeNames; // Don't insert NULL pointers. - bool mbReplace; - - ScClipRangeNameData(); - ~ScClipRangeNameData(); - void insert(sal_uInt16 nOldIndex, sal_uInt16 nNewIndex); -}; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 83ad4a1a6cae..8e41fea45158 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -146,7 +146,6 @@ struct ScLookupCacheMapImpl; class SfxUndoManager; class ScFormulaParserPool; struct ScClipParam; -struct ScClipRangeNameData; class ScRowBreakIterator; struct ScSetStringParam; class ScDocRowHeightUpdater; diff --git a/sc/source/core/data/clipparam.cxx b/sc/source/core/data/clipparam.cxx index b7e44144eb83..65155403f8bb 100644 --- a/sc/source/core/data/clipparam.cxx +++ b/sc/source/core/data/clipparam.cxx @@ -192,21 +192,4 @@ void ScClipParam::transpose() maRanges = aNewRanges; } -// ============================================================================ - -ScClipRangeNameData::ScClipRangeNameData() : - mbReplace(false) -{ -} - -ScClipRangeNameData::~ScClipRangeNameData() -{ -} - -void ScClipRangeNameData::insert(sal_uInt16 nOldIndex, sal_uInt16 nNewIndex) -{ - maRangeMap.insert( - ScRangeData::IndexMap::value_type(nOldIndex, nNewIndex)); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 1da357bfad4c..63eb11d1f673 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -80,7 +80,6 @@ #include "rtl/ref.hxx" #include "slideshow.hrc" #include "canvas/elapsedtime.hxx" -#include "canvas/prioritybooster.hxx" #include "avmedia/mediawindow.hxx" #include "svtools/colrdlg.hxx" diff --git a/unusedcode.easy b/unusedcode.easy index eadbb2fdcc8e..050005ddfd7b 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -298,9 +298,6 @@ ScCellObj::SetFormulaResultDouble(double) ScCellObj::SetFormulaResultString(rtl::OUString const&) ScCellObj::SetFormulaWithGrammar(rtl::OUString const&, rtl::OUString const&, formula::FormulaGrammar::Grammar) ScChangeActionContent::SetNewValue(String const&, ScDocument*) -ScClipRangeNameData::ScClipRangeNameData() -ScClipRangeNameData::insert(unsigned short, unsigned short) -ScClipRangeNameData::~ScClipRangeNameData() ScCompressedArray::GetEntryCount() const ScCompressedArray::CopyFrom(ScCompressedArray const&, int, int, long) ScCompressedArray::GetValue(int) const @@ -1607,8 +1604,6 @@ canvas::ParametricPolyPolygon::ParametricPolyPolygon(com::sun::star::uno::Refere canvas::PropertySetHelper::PropertySetHelper(std::__debug::vector::MapEntry, std::allocator::MapEntry> > const&) canvas::createSurfaceProxyManager(boost::shared_ptr const&) canvas::tools::ElapsedTime::getTimeBase() const -canvas::tools::PriorityBooster::PriorityBooster(int) -canvas::tools::PriorityBooster::~PriorityBooster() canvas::tools::appendToViewState(com::sun::star::rendering::ViewState&, basegfx::B2DHomMatrix const&) canvas::tools::calcRectToRectTransform(basegfx::B2DHomMatrix&, basegfx::B2DRange const&, basegfx::B2DRange const&, basegfx::B2DHomMatrix const&) canvas::tools::clipBlit(basegfx::B2IRange&, basegfx::B2IPoint&, basegfx::B2IRange const&, basegfx::B2IRange const&) @@ -1619,8 +1614,6 @@ canvas::tools::verifyInput(com::sun::star::rendering::FloatingPointBitmapLayout chart::EquidistantTickIter::getCurrentIndex() const chart::EquidistantTickIter::getMaxIndex() const chart::EquidistantTickIter::gotoIndex(int) -chart::UndoContext::UndoContext(com::sun::star::uno::Reference const&, rtl::OUString const&) -chart::UndoContext::~UndoContext() cmis::Content::exchangeIdentity(com::sun::star::uno::Reference const&) cmis::Content::queryChildren(std::__debug::list, std::allocator > >&) codemaker::cpp::typeToPrefix(TypeManager const&, rtl::OString const&) @@ -1651,7 +1644,6 @@ comphelper::PropertySetInfo::add(comphelper::PropertyMapEntry*, int) comphelper::ResourceBasedEventLogger::ResourceBasedEventLogger(com::sun::star::uno::Reference const&, rtl::OUString const&, rtl::OUString const&) comphelper::SequenceAsHashMap::getAsConstAnyList(unsigned char) const comphelper::ServiceInfoHelper::concatSequences(com::sun::star::uno::Sequence const&, com::sun::star::uno::Sequence const&) -comphelper::createEventAttacherManager(com::sun::star::uno::Reference const&, com::sun::star::uno::Reference const&) comphelper::findProperty(com::sun::star::beans::Property&, com::sun::star::uno::Sequence&, rtl::OUString const&) comphelper::string::isalnumAsciiString(rtl::OUString const&) comphelper::string::islowerAsciiString(rtl::OUString const&) -- cgit v1.2.3 From b769901d5a09d7c8bd9ef666a863ff5e7fce4c1e Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Thu, 22 Dec 2011 11:27:50 +0100 Subject: unusedcode: remove various unused classes --- basebmp/test/bmpdemo.cxx | 1 - basegfx/Library_basegfx.mk | 2 - basegfx/Package_inc.mk | 2 - basegfx/StaticLibrary_basegfx_s.mk | 2 - basegfx/inc/basegfx/curve/b2dquadraticbezier.hxx | 77 -- .../polygon/b2dpolypolygonrasterconverter.hxx | 145 --- basegfx/source/curve/b2dquadraticbezier.cxx | 106 -- .../polygon/b2dpolypolygonrasterconverter.cxx | 701 ---------- basegfx/source/range/b2drangeclipper.cxx | 3 - canvas/source/cairo/cairo_spritehelper.cxx | 1 - canvas/source/directx/dx_spritehelper.cxx | 1 - canvas/source/null/null_spritehelper.cxx | 1 - sd/source/ui/slidesorter/view/SlsButtonBar.cxx | 137 -- sdext/source/presenter/PresenterController.cxx | 16 - sdext/source/presenter/PresenterPaneAnimator.cxx | 1376 -------------------- sdext/source/presenter/PresenterPaneAnimator.hxx | 76 -- sdext/source/presenter/PresenterSlideSorter.cxx | 1 - sdext/source/presenter/makefile.mk | 1 - svx/Library_svx.mk | 1 - svx/source/table/celleditsource.cxx | 1056 --------------- svx/source/table/celleditsource.hxx | 92 -- unusedcode.easy | 18 - 22 files changed, 3816 deletions(-) delete mode 100644 basegfx/inc/basegfx/curve/b2dquadraticbezier.hxx delete mode 100644 basegfx/inc/basegfx/polygon/b2dpolypolygonrasterconverter.hxx delete mode 100644 basegfx/source/curve/b2dquadraticbezier.cxx delete mode 100644 basegfx/source/polygon/b2dpolypolygonrasterconverter.cxx delete mode 100644 sdext/source/presenter/PresenterPaneAnimator.cxx delete mode 100644 sdext/source/presenter/PresenterPaneAnimator.hxx delete mode 100644 svx/source/table/celleditsource.cxx delete mode 100644 svx/source/table/celleditsource.hxx (limited to 'sd') diff --git a/basebmp/test/bmpdemo.cxx b/basebmp/test/bmpdemo.cxx index f300a023c447..6b949218b451 100644 --- a/basebmp/test/bmpdemo.cxx +++ b/basebmp/test/bmpdemo.cxx @@ -51,7 +51,6 @@ #include #include #include -#include #include #include #include diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk index af629188b050..fa0607bff256 100644 --- a/basegfx/Library_basegfx.mk +++ b/basegfx/Library_basegfx.mk @@ -97,7 +97,6 @@ $(eval $(call gb_Library_add_exception_objects,basegfx,\ basegfx/source/polygon/b3dpolygonclipper \ basegfx/source/polygon/b2dpolygonclipper \ basegfx/source/polygon/b2dpolypolygoncutter \ - basegfx/source/polygon/b2dpolypolygonrasterconverter \ basegfx/source/polygon/b2dpolygon \ basegfx/source/polygon/b2dpolygontriangulator \ basegfx/source/polygon/b2dpolypolygon \ @@ -117,7 +116,6 @@ $(eval $(call gb_Library_add_exception_objects,basegfx,\ basegfx/source/point/b2ipoint \ basegfx/source/curve/b2dbeziertools \ basegfx/source/curve/b2dcubicbezier \ - basegfx/source/curve/b2dquadraticbezier \ basegfx/source/color/bcolormodifier \ basegfx/source/color/bcolortools \ basegfx/source/raster/rasterconvert3d \ diff --git a/basegfx/Package_inc.mk b/basegfx/Package_inc.mk index 6d1a4e745504..5767a8f8a954 100644 --- a/basegfx/Package_inc.mk +++ b/basegfx/Package_inc.mk @@ -80,7 +80,6 @@ $(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/polygon/b3dpolypolygon $(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/polygon/b2dpolygoncutandtouch.hxx,basegfx/polygon/b2dpolygoncutandtouch.hxx)) $(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/polygon/b2dlinegeometry.hxx,basegfx/polygon/b2dlinegeometry.hxx)) $(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/polygon/b3dpolypolygontools.hxx,basegfx/polygon/b3dpolypolygontools.hxx)) -$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/polygon/b2dpolypolygonrasterconverter.hxx,basegfx/polygon/b2dpolypolygonrasterconverter.hxx)) $(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/polygon/b3dpolygon.hxx,basegfx/polygon/b3dpolygon.hxx)) $(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/polygon/b3dpolygonclipper.hxx,basegfx/polygon/b3dpolygonclipper.hxx)) $(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/pixel/bpixel.hxx,basegfx/pixel/bpixel.hxx)) @@ -93,7 +92,6 @@ $(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/point/b2dpoint.hxx,bas $(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/point/b2dhompoint.hxx,basegfx/point/b2dhompoint.hxx)) $(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/point/b2ipoint.hxx,basegfx/point/b2ipoint.hxx)) $(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/curve/b2dcubicbezier.hxx,basegfx/curve/b2dcubicbezier.hxx)) -$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/curve/b2dquadraticbezier.hxx,basegfx/curve/b2dquadraticbezier.hxx)) $(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/curve/b2dbeziertools.hxx,basegfx/curve/b2dbeziertools.hxx)) $(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/color/bcolor.hxx,basegfx/color/bcolor.hxx)) $(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/color/bcolortools.hxx,basegfx/color/bcolortools.hxx)) diff --git a/basegfx/StaticLibrary_basegfx_s.mk b/basegfx/StaticLibrary_basegfx_s.mk index 891e23233be3..79d6ed9373db 100644 --- a/basegfx/StaticLibrary_basegfx_s.mk +++ b/basegfx/StaticLibrary_basegfx_s.mk @@ -102,7 +102,6 @@ $(eval $(call gb_StaticLibrary_add_generated_exception_objects,basegfx_s,\ CustomTarget/basegfx/source/polygon/b3dpolygonclipper \ CustomTarget/basegfx/source/polygon/b2dpolygonclipper \ CustomTarget/basegfx/source/polygon/b2dpolypolygoncutter \ - CustomTarget/basegfx/source/polygon/b2dpolypolygonrasterconverter \ CustomTarget/basegfx/source/polygon/b2dpolygon \ CustomTarget/basegfx/source/polygon/b2dpolygontriangulator \ CustomTarget/basegfx/source/polygon/b2dpolypolygon \ @@ -122,7 +121,6 @@ $(eval $(call gb_StaticLibrary_add_generated_exception_objects,basegfx_s,\ CustomTarget/basegfx/source/point/b2ipoint \ CustomTarget/basegfx/source/curve/b2dbeziertools \ CustomTarget/basegfx/source/curve/b2dcubicbezier \ - CustomTarget/basegfx/source/curve/b2dquadraticbezier \ CustomTarget/basegfx/source/color/bcolormodifier \ CustomTarget/basegfx/source/color/bcolortools \ CustomTarget/basegfx/source/raster/rasterconvert3d \ diff --git a/basegfx/inc/basegfx/curve/b2dquadraticbezier.hxx b/basegfx/inc/basegfx/curve/b2dquadraticbezier.hxx deleted file mode 100644 index 10f57670ecb4..000000000000 --- a/basegfx/inc/basegfx/curve/b2dquadraticbezier.hxx +++ /dev/null @@ -1,77 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _BGFX_CURVE_B2DQUADRATICBEZIER_HXX -#define _BGFX_CURVE_B2DQUADRATICBEZIER_HXX - -#include -#include - -////////////////////////////////////////////////////////////////////////////// - -namespace basegfx -{ - class BASEGFX_DLLPUBLIC B2DQuadraticBezier - { - ::basegfx::B2DPoint maStartPoint; - ::basegfx::B2DPoint maEndPoint; - ::basegfx::B2DPoint maControlPoint; - - public: - B2DQuadraticBezier(); - B2DQuadraticBezier(const B2DQuadraticBezier& rBezier); - B2DQuadraticBezier(const ::basegfx::B2DPoint& rStart, const ::basegfx::B2DPoint& rEnd); - B2DQuadraticBezier(const ::basegfx::B2DPoint& rStart, - const ::basegfx::B2DPoint& rControlPoint, const ::basegfx::B2DPoint& rEnd); - ~B2DQuadraticBezier(); - - // assignment operator - B2DQuadraticBezier& operator=(const B2DQuadraticBezier& rBezier); - - // compare operators - bool operator==(const B2DQuadraticBezier& rBezier) const; - bool operator!=(const B2DQuadraticBezier& rBezier) const; - - // test if control point is placed on the edge - bool isBezier() const; - - // data interface - ::basegfx::B2DPoint getStartPoint() const { return maStartPoint; } - void setStartPoint(const ::basegfx::B2DPoint& rValue) { maStartPoint = rValue; } - - ::basegfx::B2DPoint getEndPoint() const { return maEndPoint; } - void setEndPoint(const ::basegfx::B2DPoint& rValue) { maEndPoint = rValue; } - - ::basegfx::B2DPoint getControlPoint() const { return maControlPoint; } - void setControlPoint(const ::basegfx::B2DPoint& rValue) { maControlPoint = rValue; } - }; -} // end of namespace basegfx - -#endif /* _BGFX_CURVE_B2DQUADRATICBEZIER_HXX */ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basegfx/inc/basegfx/polygon/b2dpolypolygonrasterconverter.hxx b/basegfx/inc/basegfx/polygon/b2dpolypolygonrasterconverter.hxx deleted file mode 100644 index 36a4793f4c56..000000000000 --- a/basegfx/inc/basegfx/polygon/b2dpolypolygonrasterconverter.hxx +++ /dev/null @@ -1,145 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _BGFX_POLYGON_B2DPOLYPOLYGONRASTERCONVERTER_HXX -#define _BGFX_POLYGON_B2DPOLYPOLYGONRASTERCONVERTER_HXX - -#include -#include -#include -#include -#include -#include -#include - -////////////////////////////////////////////////////////////////////////////// - -namespace basegfx -{ - /** Raster-convert a poly-polygon. - - This class can raster-convert a given poly-polygon. Simply - derive from this, and override the span() method, which will - get called for every scanline span of the poly-polygon. - - @derive - Overwrite span() with the render output method of your choice. - */ - class BASEGFX_DLLPUBLIC B2DPolyPolygonRasterConverter - { - public: - /** Create raster-converter for given poly-polygon - */ - B2DPolyPolygonRasterConverter(const B2DPolyPolygon& rPolyPolyRaster); - - /** Create raster-converter for given poly-polygon and raster - area. - - @param rPolyPolyRaster - Poly-Polygon to raster convert - - @param rMinUpdateArea - Minimal area to touch when raster-converting. The - rectangle given here is guaranteed to be iterated through - scanline by scanline (but the raster converter might - actually use more scanlines, e.g. if the poly-polygon's - bound rect is larger). One of the cases where this - parameter comes in handy is when rendering in the 'off' - spans, and a certain area must be filled. Do not - use this for clipping, as described above, the touched - area might also be larger. - */ - B2DPolyPolygonRasterConverter(const B2DPolyPolygon& rPolyPolyRaster, - const B2DRectangle& rRasterArea ); - - virtual ~B2DPolyPolygonRasterConverter(); - - /** Raster-convert the contained poly-polygon - - @param eFillRule - Fill rule to use for span filling - */ - void rasterConvert( FillRule eFillRule); - - /** Override this method, to be called for every scanline span - of the poly-polygon - - @param rfXLeft - The left end of the current horizontal span - - @param rfXRight - The right end of the current horizontal span - - @param nY - The y position of the current horizontal span - - @param bOn - Denotes whether this span is on or off, according to the - active fill rule. - */ - virtual void span(const double& rfXLeft, - const double& rfXRight, - sal_Int32 nY, - bool bOn ) = 0; - - /// @internal - struct Vertex - { - inline Vertex(); - inline Vertex( const B2DPoint&, const B2DPoint&, bool ); - - B2DPoint aP1; - B2DPoint aP2; - bool bDownwards; - }; - - private: - // default: disabled copy/assignment - B2DPolyPolygonRasterConverter(const B2DPolyPolygonRasterConverter&); - B2DPolyPolygonRasterConverter& operator=( const B2DPolyPolygonRasterConverter& ); - - void init(); - - typedef ::std::vector VectorOfVertices; - typedef ::std::vector VectorOfVertexVectors; - - /// The poly-polygon to raster-convert - B2DPolyPolygon maPolyPolygon; - /// Total bound rect of the poly-polygon - const B2DRectangle maPolyPolyRectangle; - - /** Vector containing for each scanline a vector which in turn - contains all vertices that start on the specific scanline - */ - VectorOfVertexVectors maScanlines; - }; -} - -#endif /* _BGFX_POLYGON_B2DPOLYPOLYGONRASTERCONVERTER_HXX */ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basegfx/source/curve/b2dquadraticbezier.cxx b/basegfx/source/curve/b2dquadraticbezier.cxx deleted file mode 100644 index 4664f92a1ccf..000000000000 --- a/basegfx/source/curve/b2dquadraticbezier.cxx +++ /dev/null @@ -1,106 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include -#include - -////////////////////////////////////////////////////////////////////////////// - -namespace basegfx -{ - B2DQuadraticBezier::B2DQuadraticBezier(const B2DQuadraticBezier& rBezier) - : maStartPoint(rBezier.maStartPoint), - maEndPoint(rBezier.maEndPoint), - maControlPoint(rBezier.maControlPoint) - { - } - - B2DQuadraticBezier::B2DQuadraticBezier() - { - } - - B2DQuadraticBezier::B2DQuadraticBezier(const ::basegfx::B2DPoint& rStart, const ::basegfx::B2DPoint& rEnd) - : maStartPoint(rStart), - maEndPoint(rEnd) - { - } - - B2DQuadraticBezier::B2DQuadraticBezier(const ::basegfx::B2DPoint& rStart, const ::basegfx::B2DPoint& rControl, const ::basegfx::B2DPoint& rEnd) - : maStartPoint(rStart), - maEndPoint(rEnd), - maControlPoint(rControl) - { - } - - B2DQuadraticBezier::~B2DQuadraticBezier() - { - } - - // assignment operator - B2DQuadraticBezier& B2DQuadraticBezier::operator=(const B2DQuadraticBezier& rBezier) - { - maStartPoint = rBezier.maStartPoint; - maEndPoint = rBezier.maEndPoint; - maControlPoint = rBezier.maControlPoint; - - return *this; - } - - // compare operators - bool B2DQuadraticBezier::operator==(const B2DQuadraticBezier& rBezier) const - { - return ( - maStartPoint == rBezier.maStartPoint - && maEndPoint == rBezier.maEndPoint - && maControlPoint == rBezier.maControlPoint - ); - } - - bool B2DQuadraticBezier::operator!=(const B2DQuadraticBezier& rBezier) const - { - return ( - maStartPoint != rBezier.maStartPoint - || maEndPoint != rBezier.maEndPoint - || maControlPoint != rBezier.maControlPoint - ); - } - - // test if control vector is used - bool B2DQuadraticBezier::isBezier() const - { - // if control vector is empty, bezier is not used - if(maControlPoint == maStartPoint || maControlPoint == maEndPoint) - return false; - - return true; - } -} // end of namespace basegfx - -// eof - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basegfx/source/polygon/b2dpolypolygonrasterconverter.cxx b/basegfx/source/polygon/b2dpolypolygonrasterconverter.cxx deleted file mode 100644 index e0a4b5837461..000000000000 --- a/basegfx/source/polygon/b2dpolypolygonrasterconverter.cxx +++ /dev/null @@ -1,701 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include - -#include -#include -#include -#include - -#include - -#include - -namespace basegfx -{ - class radixSort { - - //! public interface - public: - - //! default constructor - radixSort( void ); - - //! destructor - ~radixSort( void ); - - bool sort( const float *pInput, sal_uInt32 nNumElements, sal_uInt32 dwStride ); - - inline sal_uInt32 *indices( void ) const { return m_indices1; } - - //! private attributes - private: - - // current size of index list - sal_uInt32 m_current_size; - - // last known size of index list - sal_uInt32 m_previous_size; - - // index lists - sal_uInt32 *m_indices1; - sal_uInt32 *m_indices2; - - sal_uInt32 m_counter[256*4]; - sal_uInt32 m_offset[256]; - - //! private methods - private: - - bool resize( sal_uInt32 nNumElements ); - inline void reset_indices( void ); - bool prepareCounters( const float *pInput, sal_uInt32 nNumElements, sal_uInt32 dwStride ); - }; - - inline radixSort::radixSort( void ) { - - m_indices1 = NULL; - m_indices2 = NULL; - m_current_size = 0; - m_previous_size = 0; - - reset_indices(); - } - - inline radixSort::~radixSort( void ) { - - delete [] m_indices2; - delete [] m_indices1; - } - - bool radixSort::resize( sal_uInt32 nNumElements ) { - - if(nNumElements==m_previous_size) - return true; - - if(nNumElements > m_current_size) { - - // release index lists - if(m_indices2) - delete [] m_indices2; - if(m_indices1) - delete [] m_indices1; - - // allocate new index lists - m_indices1 = new sal_uInt32[nNumElements]; - m_indices2 = new sal_uInt32[nNumElements]; - - // check for out of memory situation - if(!m_indices1 || !m_indices2) { - delete [] m_indices1; - delete [] m_indices2; - m_indices1 = NULL; - m_indices2 = NULL; - m_current_size = 0; - return false; - } - - m_current_size = nNumElements; - } - - m_previous_size = nNumElements; - - // initialize indices - reset_indices(); - - return true; - } - - inline void radixSort::reset_indices( void ) { - - for(sal_uInt32 i=0;i>24; - if(Radix<128) m_indices2[m_offset[Radix]++] = m_indices1[i]; - else m_indices2[--m_offset[Radix]] = m_indices1[i]; - } - sal_uInt32 *Tmp = m_indices1; - m_indices1 = m_indices2; - m_indices2 = Tmp; - } - else { - if(unique_value>=128) { - for(i=0;i=0) - { - // go one step in Y - mfXPos += mfXDelta; - --mnYCounter; - return mfXDelta; - } - - return 0.0f; - } - - bool isEnded() const - { - return mnYCounter<=0; - } - - bool isDownwards() const - { - return mbDownwards; - } - }; - } - - typedef ::std::vector VectorOfLineNodes; - - - //************************************************************ - // Base2D PolyPolygon Raster Converter (Rasterizer) - //************************************************************ - - namespace - { - struct VertexComparator - { - bool operator()( const B2DPolyPolygonRasterConverter::Vertex& rLHS, - const B2DPolyPolygonRasterConverter::Vertex& rRHS ) - { - return rLHS.aP1.getX() < rRHS.aP1.getX(); - } - }; - } - - void B2DPolyPolygonRasterConverter::init() - { - if(!maPolyPolyRectangle.isEmpty()) - { - const sal_Int32 nMinY( fround(maPolyPolyRectangle.getMinY()) ); - const sal_Int32 nScanlines(fround(maPolyPolyRectangle.getMaxY()) - nMinY); - - maScanlines.resize( nScanlines+1 ); - - // add all polygons - for( sal_uInt32 i(0), nCount(maPolyPolygon.count()); - i < nCount; - ++i ) - { - // add all vertices - const B2DPolygon& rPoly( maPolyPolygon.getB2DPolygon(i) ); - for( sal_uInt32 k(0), nVertices(rPoly.count()); - kbegin(), - aIter->end(), - VertexComparator() ); - ++aIter; - } - } - } - - B2DPolyPolygonRasterConverter::B2DPolyPolygonRasterConverter( const B2DPolyPolygon& rPolyPoly ) : - maPolyPolygon( rPolyPoly ), - maPolyPolyRectangle( tools::getRange( rPolyPoly ) ), - maScanlines() - { - init(); - } - - namespace - { - B2DRectangle getCombinedBounds( const B2DPolyPolygon& rPolyPolyRaster, - const B2DRectangle& rRasterArea ) - { - B2DRectangle aRect( tools::getRange( rPolyPolyRaster ) ); - aRect.expand( rRasterArea ); - - return aRect; - } - } - - B2DPolyPolygonRasterConverter::B2DPolyPolygonRasterConverter( const B2DPolyPolygon& rPolyPolyRaster, - const B2DRectangle& rRasterArea ) : - maPolyPolygon( rPolyPolyRaster ), - maPolyPolyRectangle( - getCombinedBounds( rPolyPolyRaster, - rRasterArea ) ), - maScanlines() - { - init(); - } - - B2DPolyPolygonRasterConverter::~B2DPolyPolygonRasterConverter() - { - } - - namespace - { - class LineNodeGenerator - { - public: - LineNodeGenerator( VectorOfLineNodes& rActiveVertices ) : - mrActiveVertices( rActiveVertices ) - { - } - - void operator()( const B2DPolyPolygonRasterConverter::Vertex& rVertex ) - { - mrActiveVertices.push_back( ImplLineNode(rVertex.aP1, - rVertex.aP2, - rVertex.bDownwards) ); - } - - private: - VectorOfLineNodes& mrActiveVertices; - }; - - struct LineNodeComparator - { - bool operator()( const ImplLineNode& rLHS, const ImplLineNode& rRHS ) - { - return rLHS.getXPos() < rRHS.getXPos(); - } - }; - } - - void B2DPolyPolygonRasterConverter::rasterConvert( FillRule eFillRule ) - { - if( maScanlines.empty() ) - return; // no scanlines at all -> bail out - - const sal_Int32 nMinY( fround(maPolyPolyRectangle.getMinY()) ); - const sal_Int32 nScanlines(fround(maPolyPolyRectangle.getMaxY()) - nMinY); - - // Vector of currently active vertices. A vertex is active, if - // it crosses or touches the current scanline. - VectorOfLineNodes aActiveVertices; - - // mickey's optimized version... - radixSort rs; - std::size_t nb(0); - std::size_t nb_previous(0); - bool bSort(false); - - // process each scanline - for( sal_Int32 y(0); y <= nScanlines; ++y ) - { - // add vertices which start at current scanline into - // active vertex vector - ::std::for_each( maScanlines[y].begin(), - maScanlines[y].end(), - LineNodeGenerator( aActiveVertices ) ); - nb = aActiveVertices.size(); - if(nb != nb_previous) - { - nb_previous = nb; - bSort = true; - } - - // sort with increasing X - if(bSort) - { - bSort = false; - - if( nb ) - { - rs.sort(&aActiveVertices[0].mfXPos, - nb, - sizeof(ImplLineNode)); - } - } - - const std::size_t nLen( nb ); - if( !nLen ) - { - // empty scanline - call derived with an 'off' span - // for the full width - span( maPolyPolyRectangle.getMinX(), - maPolyPolyRectangle.getMaxX(), - nMinY + y, - false ); - } - else - { - const sal_Int32 nCurrY( nMinY + y ); - - // scanline not empty - forward all scans to derived, - // according to selected fill rule - - // TODO(P1): Maybe allow these 'off' span calls to be - // switched off (or all 'on' span calls, depending on - // use case scenario) - - // sorting didn't change the order of the elements - // in memory but prepared a list of indices in sorted order. - // thus we now process the nodes with an additional indirection. - sal_uInt32 *sorted = rs.indices(); - - // call derived with 'off' span for everything left of first active span - if( aActiveVertices[sorted[0]].getXPos() > maPolyPolyRectangle.getMinX() ) - { - span( maPolyPolyRectangle.getMinX(), - aActiveVertices[sorted[0]].getXPos(), - nCurrY, - false ); - } - - switch( eFillRule ) - { - default: - OSL_FAIL("B2DPolyPolygonRasterConverter::rasterConvert(): Unexpected fill rule"); - return; - - case FillRule_EVEN_ODD: - // process each span in current scanline, with - // even-odd fill rule - for( ::std::size_t i(0), nLength(aActiveVertices.size()); - i+1 < nLength; - ++i ) - { - sal_uInt32 nIndex = sorted[i]; - sal_uInt32 nNextIndex = sorted[i+1]; - span( aActiveVertices[nIndex].getXPos(), - aActiveVertices[nNextIndex].getXPos(), - nCurrY, - i % 2 == 0 ); - - float delta = aActiveVertices[nIndex].nextLine(); - if(delta > 0.0f) - { - if(aActiveVertices[nIndex].getXPos() > aActiveVertices[nNextIndex].getXPos()) - bSort = true; - } - else if(delta < 0.0f) - { - if(i) - { - sal_uInt32 nPrevIndex = sorted[i-1]; - if(aActiveVertices[nIndex].getXPos() < aActiveVertices[nPrevIndex].getXPos()) - bSort = true; - } - } - } - break; - - case FillRule_NONZERO_WINDING_NUMBER: - // process each span in current scanline, with - // non-zero winding numbe fill rule - sal_Int32 nWindingNumber(0); - for( ::std::size_t i(0), nLength(aActiveVertices.size()); - i+1 < nLength; - ++i ) - { - sal_uInt32 nIndex = sorted[i]; - sal_uInt32 nNextIndex = sorted[i+1]; - nWindingNumber += -1 + 2*aActiveVertices[nIndex].isDownwards(); - - span( aActiveVertices[nIndex].getXPos(), - aActiveVertices[nNextIndex].getXPos(), - nCurrY, - nWindingNumber != 0 ); - - float delta = aActiveVertices[nIndex].nextLine(); - if(delta > 0.0f) - { - if(aActiveVertices[nIndex].getXPos() > aActiveVertices[nNextIndex].getXPos()) - bSort = true; - } - else if(delta < 0.0f) - { - if(i) - { - sal_uInt32 nPrevIndex = sorted[i-1]; - if(aActiveVertices[nIndex].getXPos() < aActiveVertices[nPrevIndex].getXPos()) - bSort = true; - } - } - } - break; - } - - // call derived with 'off' span for everything right of last active span - if( aActiveVertices[sorted[nb-1]].getXPos()+1.0 < maPolyPolyRectangle.getMaxX() ) - { - span( aActiveVertices[sorted[nb-1]].getXPos()+1.0, - maPolyPolyRectangle.getMaxX(), - nCurrY, - false ); - } - - // also call nextLine on very last line node - sal_uInt32 nIndex = sorted[nb-1]; - float delta = aActiveVertices[nIndex].nextLine(); - if(delta < 0.0f) - { - if(nb) - { - sal_uInt32 nPrevIndex = sorted[nb-2]; - if(aActiveVertices[nIndex].getXPos() < aActiveVertices[nPrevIndex].getXPos()) - bSort = true; - } - } - } - - // remove line nodes which have ended on the current scanline - aActiveVertices.erase( ::std::remove_if( aActiveVertices.begin(), - aActiveVertices.end(), - ::boost::mem_fn( &ImplLineNode::isEnded ) ), - aActiveVertices.end() ); - nb = aActiveVertices.size(); - if(nb != nb_previous) - { - nb_previous = nb; - bSort = true; - } - } - } -} -// eof - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basegfx/source/range/b2drangeclipper.cxx b/basegfx/source/range/b2drangeclipper.cxx index 660f4396434a..1deede8fc967 100644 --- a/basegfx/source/range/b2drangeclipper.cxx +++ b/basegfx/source/range/b2drangeclipper.cxx @@ -620,9 +620,6 @@ namespace basegfx // right event come last. This is advantageous for the // clip algorithm below, see handleRightEdgeCrossing(). - // TODO(P3): Use radix sort (from - // b2dpolypolygonrasterconverter, or have your own - // templatized version). std::stable_sort( o_rEventVector.begin(), o_rEventVector.end() ); } diff --git a/canvas/source/cairo/cairo_spritehelper.cxx b/canvas/source/cairo/cairo_spritehelper.cxx index 8be1eebcb742..fa09c8772dbb 100644 --- a/canvas/source/cairo/cairo_spritehelper.cxx +++ b/canvas/source/cairo/cairo_spritehelper.cxx @@ -42,7 +42,6 @@ #include #include #include -#include #include #include diff --git a/canvas/source/directx/dx_spritehelper.cxx b/canvas/source/directx/dx_spritehelper.cxx index b773cb217802..972fb685d48c 100644 --- a/canvas/source/directx/dx_spritehelper.cxx +++ b/canvas/source/directx/dx_spritehelper.cxx @@ -43,7 +43,6 @@ #include #include #include -#include #include #include diff --git a/canvas/source/null/null_spritehelper.cxx b/canvas/source/null/null_spritehelper.cxx index e2eb5fd1427d..be097ace13c3 100644 --- a/canvas/source/null/null_spritehelper.cxx +++ b/canvas/source/null/null_spritehelper.cxx @@ -42,7 +42,6 @@ #include #include #include -#include #include #include diff --git a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx index d2fa7c775982..23f98ac513b5 100644 --- a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx +++ b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx @@ -100,26 +100,6 @@ private: namespace { - /** Rectangular button bar that covers the whole width of the preview. - */ - class RectangleBackgroundTheme : public ButtonBar::BackgroundTheme - { - public: - RectangleBackgroundTheme( - const ::boost::shared_ptr& rpTheme, - const ::std::vector& rButtons); - virtual ~RectangleBackgroundTheme() { } - virtual BitmapEx CreateBackground ( - const OutputDevice& rTemplateDevice, - const bool bIsButtonDown) const; - virtual Point GetBackgroundLocation (void); - virtual Rectangle GetButtonArea (void); - protected: - virtual void Layout (void); - private: - sal_Int32 mnBarHeight; - }; - /** Button bar is composed of three images, the left and right end of the bar and the center image. Buttons are only placed over the center image. The center image is painted as is, it is not scaled. @@ -826,123 +806,6 @@ Button::IconSize ButtonBar::BackgroundTheme::GetIconSize (void) const - -//===== RectangleBackgroundTheme ============================================ - -RectangleBackgroundTheme::RectangleBackgroundTheme ( - const ::boost::shared_ptr& rpTheme, - const ::std::vector& rButtons) - : BackgroundTheme(rpTheme, rButtons), - mnBarHeight(0) -{ -} - - - - -BitmapEx RectangleBackgroundTheme::CreateBackground ( - const OutputDevice& rTemplateDevice, - const bool bIsButtonDown) const -{ - OSL_ASSERT(mpTheme); - - // Setup background color. - Color aTopFillColor (mpTheme->GetGradientColor( - Theme::Gradient_ButtonBackground, - Theme::Fill1)); - Color aTopBorderColor (mpTheme->GetGradientColor( - Theme::Gradient_ButtonBackground, - Theme::Border1)); - Color aBottomFillColor (mpTheme->GetGradientColor( - Theme::Gradient_ButtonBackground, - Theme::Fill2)); - Color aBottomBorderColor (mpTheme->GetGradientColor( - Theme::Gradient_ButtonBackground, - Theme::Border2)); - if (bIsButtonDown) - { - aTopFillColor.DecreaseLuminance(50); - aTopBorderColor.DecreaseLuminance(50); - aBottomFillColor.DecreaseLuminance(50); - aBottomBorderColor.DecreaseLuminance(50); - } - - const int nWidth (maPreviewBoundingBox.GetWidth()+2); - const int nHeight (mnBarHeight); - const int nCenter (nHeight / 2); - - VirtualDevice aDevice (rTemplateDevice, 0, 8); - aDevice.SetOutputSizePixel(Size(nWidth,nHeight)); - - // Fill upper and lower half. - aDevice.SetLineColor(); - aDevice.SetFillColor(aTopFillColor); - aDevice.DrawRect(Rectangle(0,0,nWidth-1,nCenter)); - aDevice.SetFillColor(aBottomFillColor); - aDevice.DrawRect(Rectangle(0,nCenter,nWidth-1,nHeight-1)); - - // Draw border. - aDevice.SetFillColor(); - aDevice.SetLineColor(aTopBorderColor); - aDevice.DrawLine(Point(0,nCenter),Point(0,0)); - aDevice.DrawLine(Point(0,0), Point(nWidth-1,0)); - aDevice.DrawLine(Point(nWidth-1,0),Point(nWidth-1,nCenter)); - aDevice.SetLineColor(aBottomBorderColor); - aDevice.DrawLine(Point(0,nCenter),Point(0,nHeight-1)); - aDevice.DrawLine(Point(0,nHeight-1), Point(nWidth-1,nHeight-1)); - aDevice.DrawLine(Point(nWidth-1,nHeight-1),Point(nWidth-1,nCenter)); - - return aDevice.GetBitmapEx(Point(0,0), Size(nWidth,nHeight)); -} - - - - -Point RectangleBackgroundTheme::GetBackgroundLocation (void) -{ - return Point( - maPreviewBoundingBox.Left()-1, - maPreviewBoundingBox.Bottom() - mnBarHeight + 2); -} - - - - -Rectangle RectangleBackgroundTheme::GetButtonArea (void) -{ - return Rectangle( - maPreviewBoundingBox.Left(), - maPreviewBoundingBox.Bottom() - mnBarHeight + 2, - maPreviewBoundingBox.Right(), - maPreviewBoundingBox.Bottom()); -} - - - - -void RectangleBackgroundTheme::Layout (void) -{ - if (maPreviewBoundingBox.GetWidth() < maMinimumLargeButtonAreaSize.Width()) - if (maPreviewBoundingBox.GetWidth() < maMinimumMediumButtonAreaSize.Width()) - { - meIconSize = Button::IconSize_Small; - mnBarHeight = maMinimumSmallButtonAreaSize.Height(); - } - else - { - meIconSize = Button::IconSize_Medium; - mnBarHeight = maMinimumMediumButtonAreaSize.Height(); - } - else - { - meIconSize = Button::IconSize_Large; - mnBarHeight = maMinimumLargeButtonAreaSize.Height(); - } -} - - - - //===== BitmapBackgroundTheme ================================================= BitmapBackgroundTheme::BitmapBackgroundTheme ( diff --git a/sdext/source/presenter/PresenterController.cxx b/sdext/source/presenter/PresenterController.cxx index d6a50f596f89..3a4b5f6b3b77 100644 --- a/sdext/source/presenter/PresenterController.cxx +++ b/sdext/source/presenter/PresenterController.cxx @@ -38,7 +38,6 @@ #include "PresenterScreen.hxx" #include "PresenterNotesView.hxx" #include "PresenterPaintManager.hxx" -#include "PresenterPaneAnimator.hxx" #include "PresenterPaneBase.hxx" #include "PresenterPaneContainer.hxx" #include "PresenterPaneBorderPainter.hxx" @@ -121,7 +120,6 @@ PresenterController::PresenterController ( mxCurrentSlide(), mxNextSlide(), mpWindowManager(new PresenterWindowManager(rxContext,mpPaneContainer,this)), - mpCurrentPaneAnimation(), mnWindowBackgroundColor(0x00ffffff), mpTheme(), mxMainWindow(), @@ -260,7 +258,6 @@ void PresenterController::disposing (void) mnCurrentSlideIndex = -1; mxCurrentSlide = NULL; mxNextSlide = NULL; - mpCurrentPaneAnimation.reset(); mpTheme.reset(); { Reference xComponent ( @@ -576,19 +573,6 @@ Reference PresenterController::GetPresenterHelper (vo - -void PresenterController::HideSlideSorter (void) -{ - if (mpCurrentPaneAnimation.get() != NULL) - { - mpCurrentPaneAnimation->HidePane(); - mpCurrentPaneAnimation.reset(); - } -} - - - - void PresenterController::ShowView (const OUString& rsViewURL) { PresenterPaneContainer::SharedPaneDescriptor pDescriptor ( diff --git a/sdext/source/presenter/PresenterPaneAnimator.cxx b/sdext/source/presenter/PresenterPaneAnimator.cxx deleted file mode 100644 index e42923cd3473..000000000000 --- a/sdext/source/presenter/PresenterPaneAnimator.cxx +++ /dev/null @@ -1,1376 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - - -#include "PresenterPaneAnimator.hxx" - -#include "PresenterAnimation.hxx" -#include "PresenterAnimator.hxx" -#include "PresenterCanvasHelper.hxx" -#include "PresenterController.hxx" -#include "PresenterGeometryHelper.hxx" -#include "PresenterPaintManager.hxx" -#include "PresenterPaneContainer.hxx" -#include "PresenterPaneFactory.hxx" -#include "PresenterSprite.hxx" -#include "PresenterSpritePane.hxx" -#include "PresenterWindowManager.hxx" - -#include -#include -#include -#include -#include -#include - -using namespace ::com::sun::star; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::drawing::framework; -using ::rtl::OUString; -using ::std::vector; - -namespace sdext { namespace presenter { - -namespace { - - class PaneGroup; - - class PresenterPaneAnimatorBase - : public ::boost::enable_shared_from_this, - public PresenterPaneAnimator - { - public: - PresenterPaneAnimatorBase ( - const css::uno::Reference& rxPaneId, - const ::rtl::Reference& rpPresenterController, - const bool bAnimate, - const EndActions& rShowEndActions, - const EndActions& rEndEndActions); - virtual ~PresenterPaneAnimatorBase (void); - - typedef ::std::vector< ::boost::function > EndOperators; - - void ActivatePanes (void); - void ActivatePane ( - const css::uno::Reference& rxPaneId); - void RestoreFrozenWindows (void); - void FreezePanes (const Reference& rxCanvas); - - protected: - ::rtl::Reference mpPresenterController; - ::rtl::Reference mpPaneContainer; - ::rtl::Reference mpWindowManager; - ::std::vector< ::boost::shared_ptr > maPaneGroups; - css::uno::Reference mxCenterPaneId; - bool mbDoAnimation; - EndActions maShowEndActions; - EndActions maHideEndActions; - - void DeactivatePanes (void); - void ResizePane ( - const css::uno::Reference& rxPaneId, - const geometry::RealRectangle2D& rBox); - void DeactivatePane ( - const css::uno::Reference& rxPaneId); - }; - - - class UnfoldInCenterAnimator : public PresenterPaneAnimatorBase - { - public: - UnfoldInCenterAnimator ( - const css::uno::Reference& rxPaneId, - const ::rtl::Reference& rpPresenterController, - const bool bAnimate, - const EndActions& rShowEndActions, - const EndActions& rEndEndActions); - - virtual ~UnfoldInCenterAnimator (void); - - virtual void ShowPane (void); - - virtual void HidePane (void); - - private: - geometry::RealRectangle2D maCenterPaneBox; - - void SetupPaneGroups (void); - geometry::RealRectangle2D MovePanesAway ( - const css::geometry::RealRectangle2D& rFreeCenterArea); - }; - - - class MoveInFromBottomAnimator : public PresenterPaneAnimatorBase - { - public: - MoveInFromBottomAnimator( - const css::uno::Reference& rxPaneId, - const ::rtl::Reference& rpPresenterController, - const bool bAnimate, - const EndActions& rShowEndActions, - const EndActions& rEndEndActions); - virtual ~MoveInFromBottomAnimator (void); - - virtual void ShowPane (void); - virtual void HidePane (void); - - private: - ::boost::shared_ptr maNewPaneSprite; - geometry::RealRectangle2D maCenterPaneBox; - - void CreateShowAnimation ( - const css::uno::Reference& rxPaneId, - const EndOperators& rpEndOperators, - const css::uno::Reference& rxSpriteCanvas, - const bool bAnimate, - const css::geometry::RealPoint2D& rStartLocation, - const css::geometry::RealPoint2D& rEndLocation); - }; - - - class TransparentOverlayAnimator : public PresenterPaneAnimatorBase - { - public: - TransparentOverlayAnimator( - const css::uno::Reference& rxPaneId, - const ::rtl::Reference& rpPresenterController, - const bool bAnimate, - const EndActions& rShowEndActions, - const EndActions& rEndEndActions); - virtual ~TransparentOverlayAnimator (void); - - virtual void ShowPane (void); - virtual void HidePane (void); - - private: - PresenterSprite maBackgroundSprite; - void CreateBackgroundSprite (void); - }; - - - class PaneDescriptor - { - public: - PresenterPaneContainer::SharedPaneDescriptor mpPaneDescriptor; - - PaneDescriptor (const PresenterPaneContainer::SharedPaneDescriptor& rpDescriptor); - void Restore (void) const; - private: - double mnLeft; - double mnTop; - double mnRight; - double mnBottom; - }; - - class MultiAnimation : public PresenterAnimation - { - public: - typedef ::boost::function Animation; - MultiAnimation (const sal_uInt32 nDuration); - void AddAnimation (const Animation& rAnimation); - virtual void Run (const double nProgress, const sal_uInt64 nCurrentTime); - private: - vector maAnimations; - }; - - - class PaneGroup - { - public: - PaneGroup (void); - ~PaneGroup (void); - void AddPane (const PresenterPaneContainer::SharedPaneDescriptor& rpPane); - void CreateSubstitution (const Reference& rxCanvas); - void ThawPanes (void); - void Restore (void); - ::boost::shared_ptr GetSubstitution (void) const; - css::geometry::RealRectangle2D GetOriginalBoundingBox (void) const; - css::geometry::RealRectangle2D GetCurrentBoundingBox (void) const; - void MovePanes ( - const double nXOffset, - const double nYOffset, - const ::rtl::Reference& rpWindowManager); - void ActivatePanes (void); - void DeactivatePanes (void); - void HidePanes (void); - void ShowPanes (void); - - private: - vector maPanes; - awt::Rectangle maOriginalBoundingBox; - css::geometry::RealRectangle2D maCurrentBoundingBox; - ::boost::shared_ptr mpSubstitution; - - }; - typedef ::boost::shared_ptr SharedPaneGroup; - - void InterpolatePosition ( - const ::boost::function& rSetter, - double nP, - const geometry::RealPoint2D rInitialBox, - const geometry::RealPoint2D rFinalBox); - - template - void InterpolateValue ( - const ::boost::function& rSetter, - double nP, - const T aInitialValue, - const T aFinalValue); - - void SpriteTransform( - const rtl::Reference& rpPaneContainer, - const Reference& rxPaneId, - const Reference& rxSpriteOwnerWindow, - const ::boost::shared_ptr& rpPaintManager, - const bool bAppear, - const double nX, - const double nInitialTop, - const double nFinalTop, - const double nP); - - void SpritePaneMove ( - const rtl::Reference& rpPaneContainer, - const Reference& rxPaneId, - const geometry::RealPoint2D& rLocation); - - geometry::RealPoint2D GetLocation (const geometry::RealRectangle2D& rBox); - geometry::RealSize2D GetSize (const geometry::RealRectangle2D& rBox); - - -} // end of anonymous namespace - - - - -//===== PresenterPaneAnimator ================================================= - -namespace { - -PresenterPaneAnimatorBase::PresenterPaneAnimatorBase ( - const css::uno::Reference& rxPaneId, - const ::rtl::Reference& rpPresenterController, - const bool bAnimate, - const EndActions& rShowEndActions, - const EndActions& rHideEndActions) - : mpPresenterController(rpPresenterController), - mpPaneContainer(rpPresenterController->GetPaneContainer()), - mpWindowManager(rpPresenterController->GetWindowManager()), - maPaneGroups(), - mxCenterPaneId(rxPaneId), - mbDoAnimation(bAnimate), - maShowEndActions(rShowEndActions), - maHideEndActions(rHideEndActions) -{ -} - - - - -PresenterPaneAnimatorBase::~PresenterPaneAnimatorBase (void) -{ -} - - - - -void PresenterPaneAnimatorBase::FreezePanes (const Reference& rxCanvas) -{ - ::std::vector::const_iterator iGroup; - for (iGroup=maPaneGroups.begin(); iGroup!=maPaneGroups.end(); ++iGroup) - { - (*iGroup)->CreateSubstitution(rxCanvas); - (*iGroup)->GetSubstitution()->MoveTo(GetLocation((*iGroup)->GetOriginalBoundingBox())); - } -} - - - - -void PresenterPaneAnimatorBase::ActivatePanes (void) -{ - ActivatePane(mxCenterPaneId); - - ::std::vector::const_iterator iGroup; - for (iGroup=maPaneGroups.begin(); iGroup!=maPaneGroups.end(); ++iGroup) - { - (*iGroup)->ShowPanes(); - (*iGroup)->ActivatePanes(); - (*iGroup)->GetSubstitution()->Hide(); - } - - mpWindowManager->Update(); -} - - - - -void PresenterPaneAnimatorBase::DeactivatePanes (void) -{ - ::std::vector::const_iterator iGroup; - for (iGroup=maPaneGroups.begin(); iGroup!=maPaneGroups.end(); ++iGroup) - { - (*iGroup)->GetSubstitution()->Show(); - (*iGroup)->DeactivatePanes(); - (*iGroup)->HidePanes(); - } - - mpWindowManager->Update(); -} - - - - -void PresenterPaneAnimatorBase::ResizePane ( - const Reference& rxPaneId, - const geometry::RealRectangle2D& rBox) -{ - PresenterPaneContainer::SharedPaneDescriptor pDescriptor ( - mpPaneContainer->FindPaneId(rxPaneId)); - if (pDescriptor.get() != NULL) - { - mpWindowManager->SetPanePosSizeAbsolute ( - rxPaneId->getResourceURL(), - rBox.X1, - rBox.Y1, - rBox.X2-rBox.X1, - rBox.Y2-rBox.Y1); - mpWindowManager->Layout(); - if ( ! pDescriptor->maSpriteProvider.empty()) - { - pDescriptor->maSpriteProvider()->Resize(GetSize(rBox)); - } - } -} - - - - -void PresenterPaneAnimatorBase::RestoreFrozenWindows (void) -{ - ::std::vector::const_iterator iGroup; - for (iGroup=maPaneGroups.begin(); iGroup!=maPaneGroups.end(); ++iGroup) - { - (*iGroup)->Restore(); - (*iGroup)->ShowPanes(); - (*iGroup)->ActivatePanes(); - (*iGroup)->GetSubstitution()->Hide(); - } - maPaneGroups.clear(); - - ActivatePane(mxCenterPaneId); - - mpWindowManager->Update(); -} - - - - -void PresenterPaneAnimatorBase::ActivatePane ( - const Reference& rxPaneId) -{ - PresenterPaneContainer::SharedPaneDescriptor pDescriptor ( - mpPaneContainer->FindPaneId(rxPaneId)); - if (pDescriptor.get() != NULL) - pDescriptor->SetActivationState(true); -} - - - - -void PresenterPaneAnimatorBase::DeactivatePane ( - const Reference& rxPaneId) -{ - PresenterPaneContainer::SharedPaneDescriptor pDescriptor ( - mpPaneContainer->FindPaneId(rxPaneId)); - if (pDescriptor.get() != NULL) - pDescriptor->SetActivationState(false); -} - - - - -//===== UnfoldInCenterAnimator ================================================ - -UnfoldInCenterAnimator::UnfoldInCenterAnimator ( - const css::uno::Reference& rxPaneId, - const ::rtl::Reference& rpPresenterController, - const bool bAnimate, - const EndActions& rShowEndActions, - const EndActions& rEndEndActions) - : PresenterPaneAnimatorBase(rxPaneId, rpPresenterController, bAnimate, - rShowEndActions, rEndEndActions) -{ -} - - - - -UnfoldInCenterAnimator::~UnfoldInCenterAnimator (void) -{ -} - - - - -void UnfoldInCenterAnimator::ShowPane (void) -{ - OSL_ASSERT(mpWindowManager.get()!=NULL); - - Reference xParentWindow (mpWindowManager->GetParentWindow(), UNO_QUERY); - if ( ! xParentWindow.is()) - return; - - Reference xCanvas (mpWindowManager->GetParentCanvas(), UNO_QUERY); - if ( ! xCanvas.is()) - return; - - Reference xParentBitmap (xCanvas, UNO_QUERY); - if ( ! xParentBitmap.is()) - return; - - Reference xDevice(xCanvas->getDevice()); - if ( ! xDevice.is()) - return; - - awt::Rectangle aWindowBox (xParentWindow->getPosSize()); - - // Create two pane groups that will be moved together. One contains the - // notes view, the other group contains all other panes. - SetupPaneGroups(); - - // Setup the places where the two pane groups are moved to. - maCenterPaneBox - = MovePanesAway(geometry::RealRectangle2D(0,200,aWindowBox.Width, aWindowBox.Height-200)); - - // Setup the final size of the new pane so that it fits into the space - // between the two pane groups. - ResizePane(mxCenterPaneId, maCenterPaneBox); - - // Avoid that the center pane updates its previews while being animated. - DeactivatePane(mxCenterPaneId); - - // Replace the pane groups with sprites that look like the panes but can - // be moved around much faster. - FreezePanes(xCanvas); - - // The vertical center of the new pane. - const double nY0 ((maPaneGroups[0]->GetOriginalBoundingBox().Y2 - + maPaneGroups[1]->GetOriginalBoundingBox().Y1) / 2); - - // Make sure that the new pane is painted once before the animation starts. - SpriteTransform( - mpPaneContainer, - mxCenterPaneId, - xParentWindow, - mpPresenterController->GetPaintManager(), - true, - maCenterPaneBox.X1, - nY0, - maCenterPaneBox.Y1, - 0); - PresenterPaneContainer::SharedPaneDescriptor pDescriptor ( - mpPaneContainer->FindPaneId(mxCenterPaneId)); - if (pDescriptor.get() != NULL) - { - mpPresenterController->GetPaintManager()->Invalidate( - pDescriptor->mxBorderWindow, - true); - } - - // Animate the upper and lower window bitmaps. - ::boost::shared_ptr pMultiAnimation ( - new MultiAnimation(mbDoAnimation ? 500 : 0)); - - // Animate the pane group sprites to be moved up or down. - vector::const_iterator iGroup; - for (iGroup=maPaneGroups.begin(); iGroup!=maPaneGroups.end(); ++iGroup) - { - pMultiAnimation->AddAnimation( - ::boost::bind( - InterpolatePosition, - ::boost::protect(::boost::bind( - &PresenterSprite::MoveTo, (*iGroup)->GetSubstitution(), _1)), - _1, - GetLocation((*iGroup)->GetOriginalBoundingBox()), - GetLocation((*iGroup)->GetCurrentBoundingBox()))); - } - - // Animate the new center pane to expand. - pMultiAnimation->AddAnimation( - ::boost::bind( - SpriteTransform, - mpPaneContainer, - mxCenterPaneId, - xParentWindow, - mpPresenterController->GetPaintManager(), - true, - maCenterPaneBox.X1, - nY0, - maCenterPaneBox.Y1, - _1)); - - // Call updateScreen after each animation step. - if (xCanvas.is()) - pMultiAnimation->AddAnimation( - ::boost::bind(&rendering::XSpriteCanvas::updateScreen, xCanvas, sal_False)); - - // Activate the panes when the animation is over. - pMultiAnimation->AddEndCallback( - ::boost::bind(&PresenterPaneAnimatorBase::ActivatePanes, shared_from_this())); - EndActions::const_iterator iAction; - for (iAction=maShowEndActions.begin(); iAction!=maShowEndActions.end(); ++iAction) - pMultiAnimation->AddEndCallback(*iAction); - - // Start the animation. - ::boost::shared_ptr pAnimator (mpPresenterController->GetAnimator()); - OSL_ASSERT(pAnimator.get()!=NULL); - pAnimator->AddAnimation(SharedPresenterAnimation(pMultiAnimation)); - - mpWindowManager->Update(); -} - - - - -void UnfoldInCenterAnimator::HidePane (void) -{ - OSL_ASSERT(mpWindowManager.get()!=NULL); - - Reference xParentWindow (mpWindowManager->GetParentWindow(), UNO_QUERY); - if ( ! xParentWindow.is()) - return; - - DeactivatePanes(); - DeactivatePane(mxCenterPaneId); - - ::boost::shared_ptr pAnimator (mpPresenterController->GetAnimator()); - const awt::Rectangle aWindowBox (xParentWindow->getPosSize()); - const rendering::ViewState aViewState ( - geometry::AffineMatrix2D(1,0,0, 0,1,0), - NULL); - const rendering::RenderState aRenderState ( - geometry::AffineMatrix2D(1,0,0, 0,1,0), - NULL, - Sequence(4), - rendering::CompositeOperation::SOURCE); - - // Animate the uppder and lower window bitmaps. - Reference xSpriteCanvas (mpWindowManager->GetParentCanvas(), UNO_QUERY); - ::boost::shared_ptr pMultiAnimation (new MultiAnimation(mbDoAnimation ? 500 : 1)); - - vector::const_iterator iGroup; - for (iGroup=maPaneGroups.begin(); iGroup!=maPaneGroups.end(); ++iGroup) - { - pMultiAnimation->AddAnimation( - ::boost::bind( - InterpolatePosition, - ::boost::protect(::boost::bind( - &PresenterSprite::MoveTo, (*iGroup)->GetSubstitution(), _1)), - _1, - GetLocation((*iGroup)->GetCurrentBoundingBox()), - GetLocation((*iGroup)->GetOriginalBoundingBox()))); - } - - // Animate the new center pane to collapse. - const double nY0 ((maPaneGroups[0]->GetOriginalBoundingBox().Y2 - + maPaneGroups[1]->GetOriginalBoundingBox().Y1) / 2); - pMultiAnimation->AddAnimation( - ::boost::bind( - SpriteTransform, - mpPaneContainer, - mxCenterPaneId, - xParentWindow, - mpPresenterController->GetPaintManager(), - false, - maCenterPaneBox.X1, - nY0, - maCenterPaneBox.Y1, - _1)); - - if (mbDoAnimation) - { - pMultiAnimation->AddAnimation( - ::boost::bind(&rendering::XSpriteCanvas::updateScreen, xSpriteCanvas, sal_False)); - } - pMultiAnimation->AddEndCallback( - ::boost::bind(&PresenterPaneAnimatorBase::RestoreFrozenWindows, shared_from_this())); - EndActions::const_iterator iAction; - for (iAction=maHideEndActions.begin(); iAction!=maHideEndActions.end(); ++iAction) - pMultiAnimation->AddEndCallback(*iAction); - - pAnimator->AddAnimation(SharedPresenterAnimation(pMultiAnimation)); -} - - - - -void UnfoldInCenterAnimator::SetupPaneGroups (void) -{ - maPaneGroups.clear(); - - // Setup the upper pane group. - SharedPaneGroup pUpperPanes (new PaneGroup()); - pUpperPanes->AddPane(mpPaneContainer->FindPaneURL( - PresenterPaneFactory::msCurrentSlidePreviewPaneURL)); - pUpperPanes->AddPane(mpPaneContainer->FindPaneURL( - PresenterPaneFactory::msNextSlidePreviewPaneURL)); - pUpperPanes->AddPane(mpPaneContainer->FindPaneURL( - PresenterPaneFactory::msToolBarPaneURL)); - pUpperPanes->AddPane(mpPaneContainer->FindPaneURL( - PresenterPaneFactory::msHelpPaneURL)); - maPaneGroups.push_back(pUpperPanes); - - // Setup the lower pane group. - SharedPaneGroup pLowerPanes (new PaneGroup()); - pLowerPanes->AddPane(mpPaneContainer->FindPaneURL( - PresenterPaneFactory::msNotesPaneURL)); - maPaneGroups.push_back(pLowerPanes); -} - - - - -geometry::RealRectangle2D UnfoldInCenterAnimator::MovePanesAway ( - const geometry::RealRectangle2D& rFreeCenterArea) -{ - SharedPaneGroup aUpperPanes = maPaneGroups[0]; - SharedPaneGroup aLowerPanes = maPaneGroups[1]; - - // Move upper pane group out of the way. - const double nTop (rFreeCenterArea.Y1); - const double nUpperVerticalOffset (nTop - aUpperPanes->GetOriginalBoundingBox().Y2); - aUpperPanes->MovePanes(0, nUpperVerticalOffset, mpWindowManager); - - // Move lower pane group out of the way. - const double nBottom (rFreeCenterArea.Y2); - const double nLowerVerticalOffset (nBottom - aLowerPanes->GetOriginalBoundingBox().Y1); - aLowerPanes->MovePanes(0, nLowerVerticalOffset, mpWindowManager); - - return geometry::RealRectangle2D( - ::std::min( - aUpperPanes->GetOriginalBoundingBox().X1, - aLowerPanes->GetOriginalBoundingBox().X1), - nTop+20, - ::std::max( - aUpperPanes->GetOriginalBoundingBox().X2, - aLowerPanes->GetOriginalBoundingBox().X2), - nBottom-20); -} - - - - -//===== MoveInFromBottomAnimator ============================================== - -MoveInFromBottomAnimator::MoveInFromBottomAnimator ( - const css::uno::Reference& rxPaneId, - const ::rtl::Reference& rpPresenterController, - const bool bAnimate, - const EndActions& rShowEndActions, - const EndActions& rEndEndActions) - : PresenterPaneAnimatorBase(rxPaneId, rpPresenterController, bAnimate, - rShowEndActions, rEndEndActions), - maNewPaneSprite() -{ -} - - - - -MoveInFromBottomAnimator::~MoveInFromBottomAnimator (void) -{ -} - - - - -void MoveInFromBottomAnimator::ShowPane (void) -{ - OSL_ASSERT(mpWindowManager.get()!=NULL); - - Reference xParentWindow (mpWindowManager->GetParentWindow(), UNO_QUERY); - if ( ! xParentWindow.is()) - return; - - Reference xCanvas (mpWindowManager->GetParentCanvas(), UNO_QUERY); - if ( ! xCanvas.is()) - return; - - Reference xParentBitmap (xCanvas, UNO_QUERY); - if ( ! xParentBitmap.is()) - return; - - Reference xDevice(xCanvas->getDevice()); - if ( ! xDevice.is()) - return; - - awt::Rectangle aWindowBox (xParentWindow->getPosSize()); - - // Create a pane group that just contains the notes view. - SharedPaneGroup pLowerPanes (new PaneGroup()); - pLowerPanes->AddPane(mpPaneContainer->FindPaneURL( - PresenterPaneFactory::msNotesPaneURL)); - maPaneGroups.push_back(pLowerPanes); - - // Deactivate the panes that will take place in the animation. - pLowerPanes->DeactivatePanes(); - DeactivatePane(mxCenterPaneId); - - // Set the size of the new pane. - maCenterPaneBox = pLowerPanes->GetOriginalBoundingBox(); - ResizePane(mxCenterPaneId, maCenterPaneBox); - - geometry::RealPoint2D aStartLocation (maCenterPaneBox.X1, aWindowBox.Height); - geometry::RealPoint2D aEndLocation (maCenterPaneBox.X1, maCenterPaneBox.Y1); - - // Get the sprite of the new pane, make it visible and move it to the - // start location. - PresenterPaneContainer::SharedPaneDescriptor pDescriptor ( - mpPaneContainer->FindPaneId(mxCenterPaneId)); - if (pDescriptor.get() != NULL) - { - if (pDescriptor->mxBorderWindow.is()) - pDescriptor->mxBorderWindow->setVisible(sal_True); - - maNewPaneSprite = pDescriptor->maSpriteProvider(); - if (maNewPaneSprite.get() != NULL) - { - maNewPaneSprite->MoveTo(aStartLocation); - maNewPaneSprite->Show(); - } - xCanvas->updateScreen(sal_False); - } - - CreateShowAnimation( - mxCenterPaneId, - maShowEndActions, - xCanvas, - mbDoAnimation, - aStartLocation, - aEndLocation); - - mpWindowManager->Update(); -} - - - - -void MoveInFromBottomAnimator::HidePane (void) -{ - OSL_ASSERT(mpWindowManager.get()!=NULL); - - Reference xParentWindow (mpWindowManager->GetParentWindow(), UNO_QUERY); - if ( ! xParentWindow.is()) - return; - - Reference xCanvas (mpWindowManager->GetParentCanvas(), UNO_QUERY); - if ( ! xCanvas.is()) - return; - - DeactivatePanes(); - DeactivatePane(mxCenterPaneId); - - SharedPaneGroup aPanes (maPaneGroups[0]); - - aPanes->ShowPanes(); - - ::boost::shared_ptr pMultiAnimation ( - new MultiAnimation(mbDoAnimation ? 500 : 0)); - awt::Rectangle aWindowBox (xParentWindow->getPosSize()); - - // Animate the new center pane to collapse. - pMultiAnimation->AddAnimation( - ::boost::bind( - InterpolatePosition, - ::boost::protect(::boost::bind(&SpritePaneMove, mpPaneContainer, mxCenterPaneId, _1)), - _1, - geometry::RealPoint2D(maCenterPaneBox.X1, maCenterPaneBox.Y1), - geometry::RealPoint2D(maCenterPaneBox.X1, aWindowBox.Height))); - - if (mbDoAnimation) - { - pMultiAnimation->AddAnimation( - ::boost::bind(&rendering::XSpriteCanvas::updateScreen, xCanvas, sal_False)); - } - pMultiAnimation->AddEndCallback( - ::boost::bind(&PresenterPaneAnimatorBase::RestoreFrozenWindows, shared_from_this())); - EndActions::const_iterator iAction; - for (iAction=maHideEndActions.begin(); iAction!=maHideEndActions.end(); ++iAction) - pMultiAnimation->AddEndCallback(*iAction); - - ::boost::shared_ptr pAnimator (mpPresenterController->GetAnimator()); - pAnimator->AddAnimation(SharedPresenterAnimation(pMultiAnimation)); -} - - - - -void MoveInFromBottomAnimator::CreateShowAnimation ( - const Reference& rxPaneId, - const EndOperators& rEndOperators, - const Reference& rxSpriteCanvas, - const bool bAnimate, - const geometry::RealPoint2D& rStartLocation, - const geometry::RealPoint2D& rEndLocation) -{ - // Animate the uppder and lower window bitmaps. - ::boost::shared_ptr pMultiAnimation (new MultiAnimation(bAnimate ? 500 : 0)); - - // Animate new pane to move in from the buttom. - pMultiAnimation->AddAnimation( - ::boost::bind( - InterpolatePosition, - ::boost::protect(::boost::bind(&SpritePaneMove, mpPaneContainer, rxPaneId, _1)), - _1, - rStartLocation, - rEndLocation)); - - // Call updateScreen after each animation step. - if (rxSpriteCanvas.is()) - pMultiAnimation->AddAnimation( - ::boost::bind(&rendering::XSpriteCanvas::updateScreen, rxSpriteCanvas, sal_False)); - - // Activate the panes when the animation is over. - pMultiAnimation->AddEndCallback( - ::boost::bind(&PaneGroup::HidePanes, maPaneGroups[0])); - pMultiAnimation->AddEndCallback( - ::boost::bind(&PresenterPaneAnimatorBase::ActivatePane, shared_from_this(), mxCenterPaneId)); - EndActions::const_iterator iAction; - for (iAction=rEndOperators.begin(); iAction!=rEndOperators.end(); ++iAction) - pMultiAnimation->AddEndCallback(*iAction); - - // Start the animation. - ::boost::shared_ptr pAnimator (mpPresenterController->GetAnimator()); - OSL_ASSERT(pAnimator.get()!=NULL); - pAnimator->AddAnimation(SharedPresenterAnimation(pMultiAnimation)); -} - - - - - -//===== TransparentOverlayAnimator ============================================ - -TransparentOverlayAnimator::TransparentOverlayAnimator ( - const css::uno::Reference& rxPaneId, - const ::rtl::Reference& rpPresenterController, - const bool bAnimate, - const EndActions& rShowEndActions, - const EndActions& rEndEndActions) - : PresenterPaneAnimatorBase( - rxPaneId, - rpPresenterController, - bAnimate, - rShowEndActions, - rEndEndActions), - maBackgroundSprite() -{ -} - - - - -TransparentOverlayAnimator::~TransparentOverlayAnimator (void) -{ -} - - - - -void TransparentOverlayAnimator::ShowPane (void) -{ - EndActions::const_iterator iAction; - for (iAction=maShowEndActions.begin(); iAction!=maShowEndActions.end(); ++iAction) - (*iAction)(); - - CreateBackgroundSprite(); - - Reference xParentWindow (mpWindowManager->GetParentWindow(), UNO_QUERY); - if (xParentWindow.is()) - { - const awt::Rectangle aWindowBox (xParentWindow->getPosSize()); - SharedPaneGroup pAllPanes (new PaneGroup()); - pAllPanes->AddPane(mpPaneContainer->FindPaneURL( - PresenterPaneFactory::msCurrentSlidePreviewPaneURL)); - pAllPanes->AddPane(mpPaneContainer->FindPaneURL( - PresenterPaneFactory::msNextSlidePreviewPaneURL)); - pAllPanes->AddPane(mpPaneContainer->FindPaneURL( - PresenterPaneFactory::msToolBarPaneURL)); - pAllPanes->AddPane(mpPaneContainer->FindPaneURL( - PresenterPaneFactory::msHelpPaneURL)); - pAllPanes->AddPane(mpPaneContainer->FindPaneURL( - PresenterPaneFactory::msNotesPaneURL)); - maPaneGroups.push_back(pAllPanes); - pAllPanes->DeactivatePanes(); - mpWindowManager->Update(); - } - - PresenterPaneContainer::SharedPaneDescriptor pDescriptor ( - mpPaneContainer->FindPaneId(mxCenterPaneId)); - if (pDescriptor.get() != NULL) - { - PresenterSpritePane* pPane = dynamic_cast( - pDescriptor->mxPane.get()); - if (pPane != NULL) - pPane->ShowTransparentBorder(); - - pDescriptor->SetActivationState(true); - if (pDescriptor->mxBorderWindow.is()) - pDescriptor->mxBorderWindow->setVisible(sal_True); - } -} - - - - -void TransparentOverlayAnimator::HidePane (void) -{ - maPaneGroups[0]->ActivatePanes(); - EndActions::const_iterator iAction; - for (iAction=maHideEndActions.begin(); iAction!=maHideEndActions.end(); ++iAction) - (*iAction)(); - mpWindowManager->Update(); -} - - - - -void TransparentOverlayAnimator::CreateBackgroundSprite (void) -{ - Reference xParentWindow (mpWindowManager->GetParentWindow(), UNO_QUERY); - Reference xParentCanvas (mpWindowManager->GetParentCanvas(), UNO_QUERY); - if (xParentWindow.is() && xParentCanvas.is()) - { - const awt::Rectangle aWindowBox (xParentWindow->getPosSize()); - maBackgroundSprite.SetFactory(xParentCanvas); - maBackgroundSprite.Resize( - geometry::RealSize2D(aWindowBox.Width, aWindowBox.Height)); - maBackgroundSprite.MoveTo( - geometry::RealPoint2D(aWindowBox.X, aWindowBox.Y)); - maBackgroundSprite.SetAlpha(0.5); - maBackgroundSprite.Show(); - - Reference xCanvas (maBackgroundSprite.GetCanvas()); - - if (xCanvas.is()) - { - rendering::ViewState aViewState( - geometry::AffineMatrix2D(1,0,0, 0,1,0), - NULL); - - rendering::RenderState aRenderState( - geometry::AffineMatrix2D(1,0,0, 0,1,0), - NULL, - Sequence(4), - rendering::CompositeOperation::SOURCE); - PresenterCanvasHelper::SetDeviceColor(aRenderState, util::Color(0x80808080)); - - Reference xPolygon ( - PresenterGeometryHelper::CreatePolygon(aWindowBox, xCanvas->getDevice())); - if (xPolygon.is()) - xCanvas->fillPolyPolygon( - xPolygon, - aViewState, - aRenderState); - } - } -} - - - - -//===== PaneGroup ============================================================= - -PaneGroup::PaneGroup (void) - : maPanes(), - maOriginalBoundingBox(), - maCurrentBoundingBox(), - mpSubstitution(new PresenterSprite()) -{ -} - - - - -PaneGroup::~PaneGroup (void) -{ - mpSubstitution.reset(); -} - - - - -void PaneGroup::AddPane (const PresenterPaneContainer::SharedPaneDescriptor& rpPane) -{ - OSL_ASSERT(rpPane.get() != NULL); - - if (rpPane->mxBorderWindow.is()) - { - PaneDescriptor aDescriptor (rpPane); - maPanes.push_back(aDescriptor); - maOriginalBoundingBox = PresenterGeometryHelper::Union( - maOriginalBoundingBox, - rpPane->mxBorderWindow->getPosSize()); - } -} - - - - -void PaneGroup::CreateSubstitution (const Reference& rxCanvas) -{ - // Get the bitmap of the background. - Reference xBackgroundBitmap (rxCanvas, UNO_QUERY); - if ( ! xBackgroundBitmap.is()) - return; - - // Create the sprite. - mpSubstitution->SetFactory(rxCanvas); - mpSubstitution->Resize( - geometry::RealSize2D(maOriginalBoundingBox.Width, maOriginalBoundingBox.Height)); - - // Fill it with the background inside the bounding box. - const rendering::ViewState aViewState ( - geometry::AffineMatrix2D(1,0,0, 0,1,0), - NULL); - const rendering::RenderState aRenderState ( - geometry::AffineMatrix2D(1,0,-maOriginalBoundingBox.X, 0,1,-maOriginalBoundingBox.Y), - NULL, - Sequence(4), - rendering::CompositeOperation::SOURCE); - - Reference xSpriteCanvas (mpSubstitution->GetCanvas()); - if (xSpriteCanvas.is()) - xSpriteCanvas->drawBitmap(xBackgroundBitmap, aViewState, aRenderState); -} - - - - -void PaneGroup::Restore (void) -{ - vector::iterator iPane; - for (iPane=maPanes.begin(); iPane!=maPanes.end(); ++iPane) - { - iPane->Restore(); - } -} - - - -::boost::shared_ptr PaneGroup::GetSubstitution (void) const -{ - return mpSubstitution; -} - - - - -geometry::RealRectangle2D PaneGroup::GetOriginalBoundingBox (void) const -{ - return geometry::RealRectangle2D( - maOriginalBoundingBox.X, - maOriginalBoundingBox.Y, - maOriginalBoundingBox.X + maOriginalBoundingBox.Width, - maOriginalBoundingBox.Y + maOriginalBoundingBox.Height); -} - - - - -geometry::RealRectangle2D PaneGroup::GetCurrentBoundingBox (void) const -{ - return maCurrentBoundingBox; -} - - - - -void PaneGroup::MovePanes ( - const double nXOffset, - const double nYOffset, - const ::rtl::Reference& rpWindowManager - ) -{ - awt::Rectangle aBBox; - vector::iterator iPane; - for (iPane=maPanes.begin(); iPane!=maPanes.end(); ++iPane) - { - awt::Rectangle aBox (iPane->mpPaneDescriptor->mxBorderWindow->getPosSize()); - aBox.X += sal_Int32(nXOffset); - aBox.Y += sal_Int32(nYOffset); - rpWindowManager->SetPanePosSizeAbsolute( - iPane->mpPaneDescriptor->mxPaneId->getResourceURL(), - aBox.X, - aBox.Y, - aBox.Width, - aBox.Height); - aBBox = PresenterGeometryHelper::Union(aBBox, aBox); - } - maCurrentBoundingBox = geometry::RealRectangle2D( - aBBox.X, aBBox.Y, aBBox.X+aBBox.Width, aBBox.Y+aBBox.Height); -} - - - - -void PaneGroup::ActivatePanes (void) -{ - vector::iterator iPane; - for (iPane=maPanes.begin(); iPane!=maPanes.end(); ++iPane) - { - iPane->mpPaneDescriptor->SetActivationState(true); - } -} - - - - -void PaneGroup::DeactivatePanes (void) -{ - vector::iterator iPane; - for (iPane=maPanes.begin(); iPane!=maPanes.end(); ++iPane) - { - iPane->mpPaneDescriptor->SetActivationState(false); - } -} - - - - -void PaneGroup::ShowPanes (void) -{ - vector::iterator iPane; - for (iPane=maPanes.begin(); iPane!=maPanes.end(); ++iPane) - { - iPane->mpPaneDescriptor->mxBorderWindow->setVisible(sal_True); - iPane->mpPaneDescriptor->mxContentWindow->setVisible(sal_True); - } -} - - - - -void PaneGroup::HidePanes (void) -{ - vector::iterator iPane; - for (iPane=maPanes.begin(); iPane!=maPanes.end(); ++iPane) - { - iPane->mpPaneDescriptor->mxBorderWindow->setVisible(sal_False); - iPane->mpPaneDescriptor->mxContentWindow->setVisible(sal_False); - } -} - - - - -//===== PaneDescriptor ======================================================== - -PaneDescriptor::PaneDescriptor (const PresenterPaneContainer::SharedPaneDescriptor& rpDescriptor) - : mpPaneDescriptor(rpDescriptor), - mnLeft(rpDescriptor->mnLeft), - mnTop(rpDescriptor->mnTop), - mnRight(rpDescriptor->mnRight), - mnBottom(rpDescriptor->mnBottom) -{ -} - - - - -void PaneDescriptor::Restore (void) const -{ - mpPaneDescriptor->mnLeft = mnLeft; - mpPaneDescriptor->mnTop = mnTop; - mpPaneDescriptor->mnRight = mnRight; - mpPaneDescriptor->mnBottom = mnBottom; -} - - - - -//===== MultiAnimation ======================================================== - -MultiAnimation::MultiAnimation (const sal_uInt32 nDuration) - : PresenterAnimation(0, nDuration, 1000/50), - maAnimations() -{ -} - - - - -void MultiAnimation::AddAnimation (const Animation& rAnimation) -{ - maAnimations.push_back(rAnimation); -} - - - - -void MultiAnimation::Run (const double nProgress, const sal_uInt64 nCurrentTime) -{ - (void)nCurrentTime; - vector::const_iterator iAnimation (maAnimations.begin()); - vector::const_iterator iEnd (maAnimations.end()); - for ( ; iAnimation!=iEnd; ++iAnimation) - (*iAnimation)(nProgress); -} - - - - -//===== functors ============================================================== - -void InterpolatePosition ( - const ::boost::function& rSetter, - double nP, - const geometry::RealPoint2D rInitialBox, - const geometry::RealPoint2D rFinalBox) -{ - const double nQ (1 - nP); - - OSL_TRACE("InterpolatePosition %f", nP); - rSetter( - geometry::RealPoint2D( - nQ * rInitialBox.X + nP * rFinalBox.X, - nQ * rInitialBox.Y + nP * rFinalBox.Y)); -} - - - - -template - void InterpolateValue ( - const ::boost::function& rSetter, - double nP, - const T aInitialValue, - const T aFinalValue) -{ - const double nQ (1 - nP); - - rSetter(T(nQ * aInitialValue + nP * aFinalValue)); -} - - - - -void SpriteTransform( - const rtl::Reference& rpPaneContainer, - const Reference& rxPaneId, - const Reference& rxSpriteOwnerWindow, - const ::boost::shared_ptr& rpPaintManager, - const bool bAppear, - const double nX, - const double nInitialTop, - const double nFinalTop, - const double nP) -{ - OSL_ASSERT(rpPaintManager.get()!=NULL); - - PresenterPaneContainer::SharedPaneDescriptor pDescriptor ( - rpPaneContainer->FindPaneId(rxPaneId)); - if (pDescriptor.get() != NULL - && ! pDescriptor->maSpriteProvider.empty() - && pDescriptor->mxBorderWindow.is()) - { - ::boost::shared_ptr pSprite (pDescriptor->maSpriteProvider()); - if (pSprite.get()) - { - // There seems to be a problem with sprites not correctly - // invalidating the background when being transformed. As a - // workaround invalidate the background in the bounding box of - // the sprite before the transformation. - rpPaintManager->Invalidate( - rxSpriteOwnerWindow, - awt::Rectangle( - sal::static_int_cast(pSprite->GetLocation().X), - sal::static_int_cast(pSprite->GetLocation().Y), - sal::static_int_cast(pSprite->GetSize().Width), - sal::static_int_cast(pSprite->GetSize().Height))); - - const double nYScale (bAppear ? nP : 1-nP); - pSprite->Transform(geometry::AffineMatrix2D( - 1, 0, 0, - 0, nYScale, 0)); - pSprite->MoveTo( - geometry::RealPoint2D(nX, nYScale*nFinalTop + (1-nYScale)*nInitialTop)); - pSprite->Show(); - - pDescriptor->mxBorderWindow->setVisible(sal_True); - } - } -} - - - - -void SpritePaneMove ( - const rtl::Reference& rpPaneContainer, - const Reference& rxPaneId, - const geometry::RealPoint2D& rLocation) -{ - PresenterPaneContainer::SharedPaneDescriptor pDescriptor ( - rpPaneContainer->FindPaneId(rxPaneId)); - if (pDescriptor.get() != NULL - && ! pDescriptor->maSpriteProvider.empty() - && pDescriptor->mxBorderWindow.is()) - { - ::boost::shared_ptr pSprite (pDescriptor->maSpriteProvider()); - if (pSprite.get() != NULL) - { - pDescriptor->mxBorderWindow->setVisible(sal_True); - pSprite->MoveTo(rLocation); - } - } -} - - - - -geometry::RealPoint2D GetLocation (const geometry::RealRectangle2D& rBox) -{ - return geometry::RealPoint2D(rBox.X1, rBox.Y1); -} - - - - -geometry::RealSize2D GetSize (const geometry::RealRectangle2D& rBox) -{ - return geometry::RealSize2D(rBox.X2-rBox.X1, rBox.Y2-rBox.Y1); -} - -} // end of anonymous namespace - - - - -} } // end of namespace ::sdext::presenter - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterPaneAnimator.hxx b/sdext/source/presenter/PresenterPaneAnimator.hxx deleted file mode 100644 index 6d3ab9ea44ee..000000000000 --- a/sdext/source/presenter/PresenterPaneAnimator.hxx +++ /dev/null @@ -1,76 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef SDEXT_PRESENTER_PRESENTER_PANE_ANIMATOR_HXXs -#define SDEXT_PRESENTER_PRESENTER_PANE_ANIMATOR_HXX - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -namespace css = ::com::sun::star; - -namespace sdext { namespace presenter { - -class PresenterController; -class PresenterPaneContainer; -class PresenterWindowManager; - -/** Base class for different types of pane animations. Each of these - animations either shows or hides a single pane. -*/ -class PresenterPaneAnimator - : private ::boost::noncopyable -{ -public: - virtual void ShowPane (void) = 0; - virtual void HidePane (void) = 0; - -protected: - virtual ~PresenterPaneAnimator (void) {}; -}; - - -typedef ::std::vector< ::boost::function > EndActions; - -} } - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx index 05f84d24f738..038b3830d1f4 100644 --- a/sdext/source/presenter/PresenterSlideSorter.cxx +++ b/sdext/source/presenter/PresenterSlideSorter.cxx @@ -1201,7 +1201,6 @@ void PresenterSlideSorter::SetVerticalOffset (const double nYOffset) void PresenterSlideSorter::GotoSlide (const sal_Int32 nSlideIndex) { mxSlideShowController->gotoSlideIndex(nSlideIndex); - mpPresenterController->HideSlideSorter(); } diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk index 7d74d96420a8..39ef9063bc22 100644 --- a/sdext/source/presenter/makefile.mk +++ b/sdext/source/presenter/makefile.mk @@ -72,7 +72,6 @@ SLOFILES= \ $(SLO)$/PresenterNotesView.obj \ $(SLO)$/PresenterPaintManager.obj \ $(SLO)$/PresenterPane.obj \ - $(SLO)$/PresenterPaneAnimator.obj \ $(SLO)$/PresenterPaneBase.obj \ $(SLO)$/PresenterPaneBorderManager.obj \ $(SLO)$/PresenterPaneBorderPainter.obj \ diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index 9165c9ef0dcf..2057d953b688 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -186,7 +186,6 @@ $(eval $(call gb_Library_add_exception_objects,svx,\ svx/source/smarttags/SmartTagMgr \ svx/source/table/accessiblecell \ svx/source/table/accessibletableshape \ - svx/source/table/celleditsource \ svx/source/table/tabledesign \ svx/source/table/tablertfexporter \ svx/source/table/tablertfimporter \ diff --git a/svx/source/table/celleditsource.cxx b/svx/source/table/celleditsource.cxx deleted file mode 100644 index d2601b51975e..000000000000 --- a/svx/source/table/celleditsource.cxx +++ /dev/null @@ -1,1056 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - - -#include - -#include -#include -#include -#include -#include -#include -#include -#include - -#include "celleditsource.hxx" -#include "cell.hxx" -#include "svx/svdmodel.hxx" -#include "svx/svdoutl.hxx" -#include "svx/svdobj.hxx" -#include "editeng/unoedhlp.hxx" -#include "svx/svdview.hxx" -#include "svx/svdetc.hxx" -#include "editeng/outliner.hxx" -#include "editeng/unoforou.hxx" -#include "editeng/unoviwou.hxx" -#include "editeng/outlobj.hxx" -#include "svx/svdotext.hxx" -#include "svx/svdpage.hxx" -#include "editeng/editeng.hxx" -#include "editeng/unotext.hxx" -#include "svx/sdrpaintwindow.hxx" - -//------------------------------------------------------------------------ - -using ::rtl::OUString; -using namespace ::osl; - -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::linguistic2; -using namespace ::com::sun::star::lang; - -//------------------------------------------------------------------------ - -namespace sdr { namespace table { - -//------------------------------------------------------------------------ -// CellEditSourceImpl -//------------------------------------------------------------------------ - -/** @descr -

This class essentially provides the text and view forwarders. If - no SdrView is given, this class handles the UNO objects, which are - currently not concerned with view issues. In this case, - GetViewForwarder() always returns NULL and the underlying - EditEngine of the SvxTextForwarder is a background one (i.e. not - the official DrawOutliner, but one created exclusively for this - object, with no relation to a view). -

- -

If a SdrView is given at construction time, the caller is - responsible for destroying this object when the view becomes - invalid (the views cannot notify). If GetViewForwarder(sal_True) - is called, the underlying shape is put into edit mode, the view - forwarder returned encapsulates the OutlinerView and the next call - to GetTextForwarder() yields a forwarder encapsulating the actual - DrawOutliner. Thus, changes on that Outliner are immediately - reflected on the screen. If the object leaves edit mode, the old - behaviour is restored.

- */ -class CellEditSourceImpl : public SfxListener, public SfxBroadcaster -{ -private: - oslInterlockedCount maRefCount; - - SdrView* mpView; - const Window* mpWindow; - SdrModel* mpModel; - SdrOutliner* mpOutliner; - SvxOutlinerForwarder* mpTextForwarder; - SvxDrawOutlinerViewForwarder* mpViewForwarder; - Reference< ::com::sun::star::linguistic2::XLinguServiceManager > mxLinguServiceManager; - Point maTextOffset; - bool mbDataValid; - bool mbDisposed; - bool mbIsLocked; - bool mbNeedsUpdate; - bool mbOldUndoMode; - bool mbForwarderIsEditMode; // have to reflect that, since ENDEDIT can happen more often - bool mbShapeIsEditMode; // #104157# only true, if HINT_BEGEDIT was received - bool mbNotificationsDisabled; // prevent EditEngine/Outliner notifications (e.g. when setting up forwarder) - - CellRef mxCell; - SvxUnoTextRangeBaseList maTextRanges; - - SvxTextForwarder* GetBackgroundTextForwarder(); - SvxTextForwarder* GetEditModeTextForwarder(); - SvxDrawOutlinerViewForwarder* CreateViewForwarder(); - - void SetupOutliner(); - void UpdateOutliner(); - - bool HasView() const { return mpView != 0; } - bool IsEditMode() const { return mxCell->IsTextEditActive(); }; - void dispose(); - -public: - CellEditSourceImpl( const CellRef& xCell ); - CellEditSourceImpl( const CellRef& xCell, SdrView& rView, const Window& rWindow ); - ~CellEditSourceImpl(); - - void SAL_CALL acquire(); - void SAL_CALL release(); - - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); - - SvxEditSource* Clone() const; - SvxTextForwarder* GetTextForwarder(); - SvxEditViewForwarder* GetEditViewForwarder( sal_Bool ); - void UpdateData(); - - void addRange( SvxUnoTextRangeBase* pNewRange ); - void removeRange( SvxUnoTextRangeBase* pOldRange ); - const SvxUnoTextRangeBaseList& getRanges() const; - - void lock(); - void unlock(); - - sal_Bool IsValid() const; - - Rectangle GetVisArea(); - Point LogicToPixel( const Point&, const MapMode& rMapMode ); - Point PixelToLogic( const Point&, const MapMode& rMapMode ); - - DECL_LINK( NotifyHdl, EENotify* ); - - void ChangeModel( SdrModel* pNewModel ); -}; - -//------------------------------------------------------------------------ - -CellEditSourceImpl::CellEditSourceImpl( const CellRef& xCell ) - : maRefCount ( 0 ), - mpView ( NULL ), - mpWindow ( NULL ), - mpModel ( NULL ), - mpOutliner ( NULL ), - mpTextForwarder ( NULL ), - mpViewForwarder ( NULL ), - mbDataValid ( false ), - mbDisposed ( false ), - mbIsLocked ( false ), - mbNeedsUpdate ( false ), - mbOldUndoMode ( false ), - mbForwarderIsEditMode ( false ), - mbShapeIsEditMode ( false ), - mbNotificationsDisabled ( false ), - mxCell( xCell ) -{ -} - -//------------------------------------------------------------------------ - -CellEditSourceImpl::CellEditSourceImpl( const CellRef& xCell, SdrView& rView, const Window& rWindow ) - : maRefCount ( 0 ), - mpView ( &rView ), - mpWindow ( &rWindow ), - mpModel ( NULL ), - mpOutliner ( NULL ), - mpTextForwarder ( NULL ), - mpViewForwarder ( NULL ), - mbDataValid ( false ), - mbDisposed ( false ), - mbIsLocked ( false ), - mbNeedsUpdate ( false ), - mbOldUndoMode ( false ), - mbForwarderIsEditMode ( false ), - mbShapeIsEditMode ( true ), - mbNotificationsDisabled ( false ), - mxCell( xCell ) -{ - if( mpView ) - StartListening( *mpView ); - - // #104157# Init edit mode state from shape info (IsTextEditActive()) - mbShapeIsEditMode = IsEditMode(); -} - -//------------------------------------------------------------------------ - -CellEditSourceImpl::~CellEditSourceImpl() -{ - DBG_ASSERT( mbIsLocked == sal_False, "CellEditSourceImpl::~CellEditSourceImpl(), was not unlocked before dispose!" ); - dispose(); -} - -//------------------------------------------------------------------------ - -void CellEditSourceImpl::addRange( SvxUnoTextRangeBase* pNewRange ) -{ - if( pNewRange ) - if( std::find( maTextRanges.begin(), maTextRanges.end(), pNewRange ) == maTextRanges.end() ) - maTextRanges.push_back( pNewRange ); -} - -//------------------------------------------------------------------------ - -void CellEditSourceImpl::removeRange( SvxUnoTextRangeBase* pOldRange ) -{ - if( pOldRange ) - maTextRanges.remove( pOldRange ); -} - -//------------------------------------------------------------------------ - -const SvxUnoTextRangeBaseList& CellEditSourceImpl::getRanges() const -{ - return maTextRanges; -} - -//------------------------------------------------------------------------ - -void SAL_CALL CellEditSourceImpl::acquire() -{ - osl_incrementInterlockedCount( &maRefCount ); -} - -//------------------------------------------------------------------------ - -void SAL_CALL CellEditSourceImpl::release() -{ - if( ! osl_decrementInterlockedCount( &maRefCount ) ) - delete this; -} - -void CellEditSourceImpl::ChangeModel( SdrModel* pNewModel ) -{ - if( mpModel != pNewModel ) - { - if( mpOutliner ) - { - if( mpModel ) - mpModel->disposeOutliner( mpOutliner ); - else - delete mpOutliner; - mpOutliner = 0; - } - - if( mpView ) - { - EndListening( *mpView ); - mpView = 0; - } - - mpWindow = 0; - mxLinguServiceManager.clear(); - - mpModel = pNewModel; - - if( mpTextForwarder ) - { - delete mpTextForwarder; - mpTextForwarder = 0; - } - - if( mpViewForwarder ) - { - delete mpViewForwarder; - mpViewForwarder = 0; - } - } -} - -//------------------------------------------------------------------------ - -void CellEditSourceImpl::Notify( SfxBroadcaster&, const SfxHint& rHint ) -{ - const SdrHint* pSdrHint = PTR_CAST( SdrHint, &rHint ); - const SvxViewHint* pViewHint = PTR_CAST( SvxViewHint, &rHint ); - - if( pViewHint ) - { - switch( pViewHint->GetHintType() ) - { - case SvxViewHint::SVX_HINT_VIEWCHANGED: - Broadcast( *pViewHint ); - break; - } - } - else if( pSdrHint ) - { - switch( pSdrHint->GetKind() ) - { - case HINT_OBJCHG: - { - mbDataValid = sal_False; // Text muss neu geholt werden - - if( HasView() ) - { - // #104157# Update maTextOffset, object has changed - // #105196#, #105203#: Cannot call that // here, - // since TakeTextRect() (called from there) // - // changes outliner content. - // UpdateOutliner(); - - // #101029# Broadcast object changes, as they might change visible attributes - SvxViewHint aHint(SvxViewHint::SVX_HINT_VIEWCHANGED); - Broadcast( aHint ); - } - break; - } - - case HINT_BEGEDIT: -/* todo - if( mpObject == pSdrHint->GetObject() ) - { - // invalidate old forwarder - if( !mbForwarderIsEditMode ) - { - delete mpTextForwarder; - mpTextForwarder = NULL; - } - - // register as listener - need to broadcast state change messages - if( mpView && mpView->GetTextEditOutliner() ) - mpView->GetTextEditOutliner()->SetNotifyHdl( LINK(this, CellEditSourceImpl, NotifyHdl) ); - - // #104157# Only now we're really in edit mode - mbShapeIsEditMode = sal_True; - - Broadcast( *pSdrHint ); - } -*/ - break; - - case HINT_ENDEDIT: -/* todo - if( mpObject == pSdrHint->GetObject() ) - { - Broadcast( *pSdrHint ); - - // #104157# We're no longer in edit mode - mbShapeIsEditMode = sal_False; - - // remove as listener - outliner might outlive ourselves - if( mpView && mpView->GetTextEditOutliner() ) - mpView->GetTextEditOutliner()->SetNotifyHdl( Link() ); - - // destroy view forwarder, OutlinerView no longer - // valid (no need for UpdateData(), it's been - // synched on SdrEndTextEdit) - delete mpViewForwarder; - mpViewForwarder = NULL; - - // #100424# Invalidate text forwarder, we might - // not be called again before entering edit mode a - // second time! Then, the old outliner might be - // invalid. - if( mbForwarderIsEditMode ) - { - mbForwarderIsEditMode = sal_False; - delete mpTextForwarder; - mpTextForwarder = NULL; - } - } -*/ - break; - - case HINT_MODELCLEARED: - dispose(); - break; - default: - break; - } - } -} - -/* unregister at all objects and set all references to 0 */ -void CellEditSourceImpl::dispose() -{ - if( mpTextForwarder ) - { - delete mpTextForwarder; - mpTextForwarder = 0; - } - - if( mpViewForwarder ) - { - delete mpViewForwarder; - mpViewForwarder = 0; - } - - if( mpOutliner ) - { - if( mpModel ) - { - mpModel->disposeOutliner( mpOutliner ); - } - else - { - delete mpOutliner; - } - mpOutliner = 0; - } - - if( mpView ) - { - EndListening( *mpView ); - mpView = 0; - } - - mpModel = 0; - mpWindow = 0; -} - -//------------------------------------------------------------------------ - -void CellEditSourceImpl::SetupOutliner() -{ - // #101029# - // only for UAA edit source: setup outliner equivalently as in - // SdrTextObj::Paint(), such that formatting equals screen - // layout -/* todo - if( mpObject && mpOutliner ) - { - SdrTextObj* pTextObj = PTR_CAST( SdrTextObj, mpObject ); - Rectangle aPaintRect; - if( pTextObj ) - { - Rectangle aBoundRect( pTextObj->GetCurrentBoundRect() ); - pTextObj->SetupOutlinerFormatting( *mpOutliner, aPaintRect ); - - // #101029# calc text offset from shape anchor - maTextOffset = aPaintRect.TopLeft() - aBoundRect.TopLeft(); - } - } -*/ -} - -//------------------------------------------------------------------------ - -void CellEditSourceImpl::UpdateOutliner() -{ - // #104157# - // only for UAA edit source: update outliner equivalently as in - // SdrTextObj::Paint(), such that formatting equals screen - // layout -/* todo - if( mpObject && mpOutliner ) - { - SdrTextObj* pTextObj = PTR_CAST( SdrTextObj, mpObject ); - Rectangle aPaintRect; - if( pTextObj ) - { - Rectangle aBoundRect( pTextObj->GetCurrentBoundRect() ); - pTextObj->UpdateOutlinerFormatting( *mpOutliner, aPaintRect ); - - // #101029# calc text offset from shape anchor - maTextOffset = aPaintRect.TopLeft() - aBoundRect.TopLeft(); - } - } -*/ -} - -//------------------------------------------------------------------------ - - -SvxTextForwarder* CellEditSourceImpl::GetBackgroundTextForwarder() -{ - sal_Bool bCreated = sal_False; - - // #99840#: prevent EE/Outliner notifications during setup - mbNotificationsDisabled = true; - - if (!mpTextForwarder) - { - if( mpOutliner == NULL ) - { - mpOutliner = mpModel->createOutliner( OUTLINERMODE_TEXTOBJECT ); - - // #109151# Do the setup after outliner creation, would be useless otherwise - if( HasView() ) - { - // #101029#, #104157# Setup outliner _before_ filling it - SetupOutliner(); - } - -// todo? mpOutliner->SetTextObjNoInit( pTextObj ); - - if( mbIsLocked ) - { - ((EditEngine*)&(mpOutliner->GetEditEngine()))->SetUpdateMode( sal_False ); - mbOldUndoMode = ((EditEngine*)&(mpOutliner->GetEditEngine()))->IsUndoEnabled(); - ((EditEngine*)&(mpOutliner->GetEditEngine()))->EnableUndo( sal_False ); - } - - if ( !mxLinguServiceManager.is() ) - { - Reference< XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() ); - mxLinguServiceManager = Reference< XLinguServiceManager >( - xMgr->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.linguistic2.LinguServiceManager" ))), UNO_QUERY ); - } - - if ( mxLinguServiceManager.is() ) - { - Reference< XHyphenator > xHyphenator( mxLinguServiceManager->getHyphenator(), UNO_QUERY ); - if( xHyphenator.is() ) - mpOutliner->SetHyphenator( xHyphenator ); - } - } - - mpTextForwarder = new SvxOutlinerForwarder( *mpOutliner ); - - // delay listener subscription and UAA initialization until Outliner is fully setup - bCreated = true; - mbForwarderIsEditMode = false; - } - - if( !mbDataValid ) - { - mpTextForwarder->flushCache(); - - OutlinerParaObject* pOutlinerParaObject = NULL; - bool bTextEditActive = false; - - pOutlinerParaObject = mxCell->GetEditOutlinerParaObject(); // Get the OutlinerParaObject if text edit is active - - if( pOutlinerParaObject ) - bTextEditActive = true; // text edit active - else - pOutlinerParaObject = mxCell->GetOutlinerParaObject(); - - if( pOutlinerParaObject ) - { - mpOutliner->SetText( *pOutlinerParaObject ); - } - else - { - bool bVertical = false; // todo? - - // set objects style sheet on empty outliner - SfxStyleSheetPool* pPool = mxCell->GetStyleSheetPool(); - if( pPool ) - mpOutliner->SetStyleSheetPool( pPool ); - - SfxStyleSheet* pStyleSheet = mxCell->GetStyleSheet(); - if( pStyleSheet ) - mpOutliner->SetStyleSheet( 0, pStyleSheet ); - - if( bVertical ) - mpOutliner->SetVertical( sal_True ); - } - - // evtually we have to set the border attributes - if (mpOutliner->GetParagraphCount()==1) - { - // if we only have one paragraph we check if it is empty - XubString aStr( mpOutliner->GetText( mpOutliner->GetParagraph( 0 ) ) ); - - if(!aStr.Len()) - { - // its empty, so we have to force the outliner to initialise itself - mpOutliner->SetText( String(), mpOutliner->GetParagraph( 0 ) ); - - if(mxCell->GetStyleSheet()) - mpOutliner->SetStyleSheet( 0, mxCell->GetStyleSheet()); - } - } - - if( bTextEditActive ) - delete pOutlinerParaObject; - - mbDataValid = true; - } - - if( bCreated && mpOutliner && HasView() ) - { - // register as listener - need to broadcast state change messages - // registration delayed until outliner is completely set up - mpOutliner->SetNotifyHdl( LINK(this, CellEditSourceImpl, NotifyHdl) ); - } - - // #99840#: prevent EE/Outliner notifications during setup - mbNotificationsDisabled = false; - - return mpTextForwarder; -} - -//------------------------------------------------------------------------ - -SvxTextForwarder* CellEditSourceImpl::GetEditModeTextForwarder() -{ - if( !mpTextForwarder && HasView() ) - { - SdrOutliner* pEditOutliner = mpView->GetTextEditOutliner(); - - if( pEditOutliner ) - { - mpTextForwarder = new SvxOutlinerForwarder( *pEditOutliner ); - mbForwarderIsEditMode = true; - } - } - - return mpTextForwarder; -} - -//------------------------------------------------------------------------ - -SvxTextForwarder* CellEditSourceImpl::GetTextForwarder() -{ - if( mbDisposed ) - return NULL; - - if( mpModel == NULL ) - return NULL; - - // distinguish the cases - // a) connected to view, maybe edit mode is active, can work directly on the EditOutliner - // b) background Outliner, reflect changes into ParaOutlinerObject (this is exactly the old UNO code) - if( HasView() ) - { - if( IsEditMode() != mbForwarderIsEditMode ) - { - // forwarder mismatch - create new - delete mpTextForwarder; - mpTextForwarder = NULL; - } - - if( IsEditMode() ) - return GetEditModeTextForwarder(); - else - return GetBackgroundTextForwarder(); - } - else - return GetBackgroundTextForwarder(); -} - -//------------------------------------------------------------------------ - -SvxDrawOutlinerViewForwarder* CellEditSourceImpl::CreateViewForwarder() -{ - if( mpView->GetTextEditOutlinerView() ) - { - // register as listener - need to broadcast state change messages - mpView->GetTextEditOutliner()->SetNotifyHdl( LINK(this, CellEditSourceImpl, NotifyHdl) ); - - Rectangle aBoundRect( mxCell->GetCurrentBoundRect() ); - OutlinerView& rOutlView = *mpView->GetTextEditOutlinerView(); - - return new SvxDrawOutlinerViewForwarder( rOutlView, aBoundRect.TopLeft() ); - } - - return NULL; -} - -SvxEditViewForwarder* CellEditSourceImpl::GetEditViewForwarder( sal_Bool bCreate ) -{ - if( mbDisposed ) - return NULL; - - if( mpModel == NULL ) - return NULL; - - // shall we delete? - if( mpViewForwarder ) - { - if( !IsEditMode() ) - { - // destroy all forwarders (no need for UpdateData(), - // it's been synched on SdrEndTextEdit) - delete mpViewForwarder; - mpViewForwarder = NULL; - } - } - // which to create? Directly in edit mode, create new, or none? - else if( mpView ) - { - if( IsEditMode() ) - { - // create new view forwarder - mpViewForwarder = CreateViewForwarder(); - } - else if( bCreate ) - { - // dispose old text forwarder - UpdateData(); - - delete mpTextForwarder; - mpTextForwarder = NULL; - - // enter edit mode - mpView->SdrEndTextEdit(); - -/* todo - if(mpView->SdrBeginTextEdit(mpObject, 0L, 0L, sal_False, (SdrOutliner*)0L, 0L, sal_False, sal_False)) - { - if( mxCell->IsTextEditActive() ) - { - // create new view forwarder - mpViewForwarder = CreateViewForwarder(); - } - else - { - // failure. Somehow, SdrBeginTextEdit did not set - // our SdrTextObj into edit mode - mpView->SdrEndTextEdit(); - } - } -*/ - } - } - - return mpViewForwarder; -} - -//------------------------------------------------------------------------ - -void CellEditSourceImpl::UpdateData() -{ - // if we have a view and in edit mode, we're working with the - // DrawOutliner. Thus, all changes made on the text forwarder are - // reflected on the view and committed to the model on - // SdrEndTextEdit(). Thus, no need for explicit updates here. - if( !HasView() || !IsEditMode() ) - { - if( mbIsLocked ) - { - mbNeedsUpdate = true; - } - else - { - if( mpOutliner && !mbDisposed ) - { - if( mpOutliner->GetParagraphCount() != 1 || mpOutliner->GetEditEngine().GetTextLen( 0 ) ) - { - mxCell->SetOutlinerParaObject( mpOutliner->CreateParaObject() ); - } - else - { - mxCell->SetOutlinerParaObject( NULL ); - } - } - } - } -} - -void CellEditSourceImpl::lock() -{ - mbIsLocked = true; - if( mpOutliner ) - { - ((EditEngine*)&(mpOutliner->GetEditEngine()))->SetUpdateMode( sal_False ); - mbOldUndoMode = ((EditEngine*)&(mpOutliner->GetEditEngine()))->IsUndoEnabled(); - ((EditEngine*)&(mpOutliner->GetEditEngine()))->EnableUndo( sal_False ); - } -} - -void CellEditSourceImpl::unlock() -{ - mbIsLocked = false; - - if( mbNeedsUpdate ) - { - UpdateData(); - mbNeedsUpdate = false; - } - - if( mpOutliner ) - { - ((EditEngine*)&(mpOutliner->GetEditEngine()))->SetUpdateMode( sal_True ); - ((EditEngine*)&(mpOutliner->GetEditEngine()))->EnableUndo( mbOldUndoMode ); - } -} - -sal_Bool CellEditSourceImpl::IsValid() const -{ - return mpView && mpWindow ? sal_True : sal_False; -} - -Rectangle CellEditSourceImpl::GetVisArea() -{ - if( IsValid() ) - { - SdrPaintWindow* pPaintWindow = mpView->FindPaintWindow(*mpWindow); - Rectangle aVisArea; - - if(pPaintWindow) - { - aVisArea = pPaintWindow->GetVisibleArea(); - } - - // offset vis area by edit engine left-top position - Rectangle aAnchorRect; - mxCell->TakeTextAnchorRect( aAnchorRect ); - aVisArea.Move( -aAnchorRect.Left(), -aAnchorRect.Top() ); - - MapMode aMapMode(mpWindow->GetMapMode()); - aMapMode.SetOrigin(Point()); - return mpWindow->LogicToPixel( aVisArea, aMapMode ); - } - - return Rectangle(); -} - -Point CellEditSourceImpl::LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) -{ - // #101029#: The responsibilities of ViewForwarder happen to be - // somewhat mixed in this case. On the one hand, we need the - // different interface queries on the SvxEditSource interface, - // since we need both VisAreas. On the other hand, if an - // EditViewForwarder exists, maTextOffset does not remain static, - // but may change with every key press. - if( IsEditMode() ) - { - SvxEditViewForwarder* pForwarder = GetEditViewForwarder(sal_False); - - if( pForwarder ) - return pForwarder->LogicToPixel( rPoint, rMapMode ); - } - else if( IsValid() && mpModel ) - { - // #101029# - Point aPoint1( rPoint ); - aPoint1.X() += maTextOffset.X(); - aPoint1.Y() += maTextOffset.Y(); - - Point aPoint2( OutputDevice::LogicToLogic( aPoint1, rMapMode, - MapMode(mpModel->GetScaleUnit()) ) ); - MapMode aMapMode(mpWindow->GetMapMode()); - aMapMode.SetOrigin(Point()); - return mpWindow->LogicToPixel( aPoint2, aMapMode ); - } - - return Point(); -} - -Point CellEditSourceImpl::PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) -{ - // #101029#: The responsibilities of ViewForwarder happen to be - // somewhat mixed in this case. On the one hand, we need the - // different interface queries on the SvxEditSource interface, - // since we need both VisAreas. On the other hand, if an - // EditViewForwarder exists, maTextOffset does not remain static, - // but may change with every key press. - if( IsEditMode() ) - { - SvxEditViewForwarder* pForwarder = GetEditViewForwarder(sal_False); - - if( pForwarder ) - return pForwarder->PixelToLogic( rPoint, rMapMode ); - } - else if( IsValid() && mpModel ) - { - MapMode aMapMode(mpWindow->GetMapMode()); - aMapMode.SetOrigin(Point()); - Point aPoint1( mpWindow->PixelToLogic( rPoint, aMapMode ) ); - Point aPoint2( OutputDevice::LogicToLogic( aPoint1, - MapMode(mpModel->GetScaleUnit()), - rMapMode ) ); - // #101029# - aPoint2.X() -= maTextOffset.X(); - aPoint2.Y() -= maTextOffset.Y(); - - return aPoint2; - } - - return Point(); -} - -IMPL_LINK(CellEditSourceImpl, NotifyHdl, EENotify*, aNotify) -{ - if( aNotify && !mbNotificationsDisabled ) - { - ::std::auto_ptr< SfxHint > aHint( SvxEditSourceHelper::EENotification2Hint( aNotify) ); - - if( aHint.get() ) - Broadcast( *aHint.get() ); - } - - return 0; -} - -//------------------------------------------------------------------------ - -// -------------------------------------------------------------------- -// CellEditSource -// -------------------------------------------------------------------- - -CellEditSource::CellEditSource( const CellRef& xCell ) -{ - mpImpl = new CellEditSourceImpl( xCell ); - mpImpl->acquire(); -} - -// -------------------------------------------------------------------- -CellEditSource::CellEditSource( const CellRef& xCell, SdrView& rView, const Window& rWindow ) -{ - mpImpl = new CellEditSourceImpl( xCell, rView, rWindow ); - mpImpl->acquire(); -} - -// -------------------------------------------------------------------- - -CellEditSource::CellEditSource( CellEditSourceImpl* pImpl ) -{ - mpImpl = pImpl; - mpImpl->acquire(); -} - -//------------------------------------------------------------------------ -CellEditSource::~CellEditSource() -{ - ::SolarMutexGuard aGuard; - mpImpl->release(); -} - -//------------------------------------------------------------------------ -SvxEditSource* CellEditSource::Clone() const -{ - return new CellEditSource( mpImpl ); -} - -//------------------------------------------------------------------------ -SvxTextForwarder* CellEditSource::GetTextForwarder() -{ - return mpImpl->GetTextForwarder(); -} - -//------------------------------------------------------------------------ -SvxEditViewForwarder* CellEditSource::GetEditViewForwarder( sal_Bool bCreate ) -{ - return mpImpl->GetEditViewForwarder( bCreate ); -} - -//------------------------------------------------------------------------ - -SvxViewForwarder* CellEditSource::GetViewForwarder() -{ - return this; -} - -//------------------------------------------------------------------------ - -void CellEditSource::UpdateData() -{ - mpImpl->UpdateData(); -} - -//------------------------------------------------------------------------ - -SfxBroadcaster& CellEditSource::GetBroadcaster() const -{ - return *mpImpl; -} - -//------------------------------------------------------------------------ - -void CellEditSource::lock() -{ - mpImpl->lock(); -} - -//------------------------------------------------------------------------ - -void CellEditSource::unlock() -{ - mpImpl->unlock(); -} - -//------------------------------------------------------------------------ - -sal_Bool CellEditSource::IsValid() const -{ - return mpImpl->IsValid(); -} - -//------------------------------------------------------------------------ - -Rectangle CellEditSource::GetVisArea() const -{ - return mpImpl->GetVisArea(); -} - -//------------------------------------------------------------------------ - -Point CellEditSource::LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const -{ - return mpImpl->LogicToPixel( rPoint, rMapMode ); -} - -//------------------------------------------------------------------------ - -Point CellEditSource::PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const -{ - return mpImpl->PixelToLogic( rPoint, rMapMode ); -} - -//------------------------------------------------------------------------ - -void CellEditSource::addRange( SvxUnoTextRangeBase* pNewRange ) -{ - mpImpl->addRange( pNewRange ); -} - -//------------------------------------------------------------------------ - -void CellEditSource::removeRange( SvxUnoTextRangeBase* pOldRange ) -{ - mpImpl->removeRange( pOldRange ); -} - -//------------------------------------------------------------------------ - -const SvxUnoTextRangeBaseList& CellEditSource::getRanges() const -{ - return mpImpl->getRanges(); -} - -//------------------------------------------------------------------------ - -void CellEditSource::ChangeModel( SdrModel* pNewModel ) -{ - mpImpl->ChangeModel( pNewModel ); -} - -//------------------------------------------------------------------------ - -} } - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/celleditsource.hxx b/svx/source/table/celleditsource.hxx deleted file mode 100644 index 014180a3e4c0..000000000000 --- a/svx/source/table/celleditsource.hxx +++ /dev/null @@ -1,92 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef SVX_TABLE_CELLEDITSOURCE_HXX -#define SVX_TABLE_CELLEDITSOURCE_HXX - -#include "cell.hxx" -#include "celltypes.hxx" -#include "editeng/unoedsrc.hxx" - -class SvxTextForwarder; -class SdrObject; -class SdrModel; -class SdrView; -class Window; - -namespace sdr { namespace table { - -class CellEditSourceImpl; - -class CellEditSource : public SvxEditSource, public SvxViewForwarder -{ -public: - CellEditSource( const CellRef& xCell ); - - /** Since the views don't broadcast their dying, make sure that - this object gets destroyed if the view becomes invalid - - The window is necessary, since our views can display on multiple windows - */ - CellEditSource( const CellRef& xCell, SdrView& rView, const Window& rViewWindow ); - virtual ~CellEditSource(); - - virtual SvxEditSource* Clone() const; - virtual SvxTextForwarder* GetTextForwarder(); - virtual SvxViewForwarder* GetViewForwarder(); - virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool bCreate = sal_False ); - virtual void UpdateData(); - - virtual void addRange( SvxUnoTextRangeBase* pNewRange ); - virtual void removeRange( SvxUnoTextRangeBase* pOldRange ); - virtual const SvxUnoTextRangeBaseList& getRanges() const; - - virtual SfxBroadcaster& GetBroadcaster() const; - - void lock(); - void unlock(); - - // the SvxViewForwarder interface - virtual sal_Bool IsValid() const; - virtual Rectangle GetVisArea() const; - virtual Point LogicToPixel( const Point&, const MapMode& ) const; - virtual Point PixelToLogic( const Point&, const MapMode& ) const; - - void ChangeModel( SdrModel* pNewModel ); - -private: - CellEditSource( CellEditSourceImpl* pImpl ); - - CellEditSourceImpl* mpImpl; -}; - -} } - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unusedcode.easy b/unusedcode.easy index 4ee171013f38..40865c72104e 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -1101,9 +1101,6 @@ basegfx::B2DHomMatrix::transpose() basegfx::B2DHomPoint::getB2DPoint() const basegfx::B2DHomPoint::setX(double) basegfx::B2DHomPoint::setY(double) -basegfx::B2DPolyPolygonRasterConverter::B2DPolyPolygonRasterConverter(basegfx::B2DPolyPolygon const&) -basegfx::B2DPolyPolygonRasterConverter::B2DPolyPolygonRasterConverter(basegfx::B2DPolyPolygon const&, basegfx::B2DRange const&) -basegfx::B2DPolyPolygonRasterConverter::rasterConvert(basegfx::FillRule) basegfx::B2DPolyRange::B2DPolyRange(basegfx::B2DRange const&, basegfx::B2VectorOrientation) basegfx::B2DPolyRange::B2DPolyRange(boost::tuples::tuple const&) basegfx::B2DPolyRange::appendElement(boost::tuples::tuple const&, unsigned int) @@ -1125,11 +1122,6 @@ basegfx::B2DPolyRange::setElement(unsigned int, boost::tuples::tuple const&, std::__debug::vector, std::allocator > > const&) sd::slidesorter::view::FontProvider::GetFont(OutputDevice const&) -sdext::presenter::(anonymous namespace)::MoveInFromBottomAnimator::MoveInFromBottomAnimator(com::sun::star::uno::Reference const&, rtl::Reference const&, bool, std::__debug::vector, std::allocator > > const&, std::__debug::vector, std::allocator > > const&) -sdext::presenter::(anonymous namespace)::TransparentOverlayAnimator::TransparentOverlayAnimator(com::sun::star::uno::Reference const&, rtl::Reference const&, bool, std::__debug::vector, std::allocator > > const&, std::__debug::vector, std::allocator > > const&) -sdext::presenter::(anonymous namespace)::UnfoldInCenterAnimator::UnfoldInCenterAnimator(com::sun::star::uno::Reference const&, rtl::Reference const&, bool, std::__debug::vector, std::allocator > > const&, std::__debug::vector, std::allocator > > const&) sdext::presenter::PresenterHorizontalScrollBar::PresenterHorizontalScrollBar(com::sun::star::uno::Reference const&, com::sun::star::uno::Reference const&, boost::shared_ptr const&, boost::function const&) sdr::animation::Scheduler::Reset(unsigned int) sdr::contact::ViewContactOfPageObj::GetReferencedPage() const @@ -1999,12 +1987,6 @@ sdr::overlay::OverlayRollingRectangleStriped::setExtendedLines(bool) sdr::overlay::OverlayRollingRectangleStriped::setShowBounds(bool) sdr::overlay::OverlayTriangle::setSecondPosition(basegfx::B2DPoint const&) sdr::overlay::OverlayTriangle::setThirdPosition(basegfx::B2DPoint const&) -sdr::table::CellEditSource::CellEditSource(rtl::Reference const&) -sdr::table::CellEditSource::CellEditSource(rtl::Reference const&, SdrView&, Window const&) -sdr::table::CellEditSource::ChangeModel(SdrModel*) -sdr::table::CellEditSource::lock() -sdr::table::CellEditSource::unlock() -sdr::table::CellEditSourceImpl::UpdateOutliner() sdr::table::SdrTableObj::DeleteColumns(int, int) sdr::table::SdrTableObj::DeleteRows(int, int) sdr::table::SdrTableObj::FitFrameToTextSize() -- cgit v1.2.3 From 643de3b64ed4b71ab48a7f100c90c1c4d5f918cc Mon Sep 17 00:00:00 2001 From: Luboš Luňák Date: Thu, 22 Dec 2011 19:27:00 +0100 Subject: "*.*" is not "all files" (bnc#738021) Not on any Unix, at least. I have no idea how deep entrenched is this mistake all over the code, so I'll play safe and just fix the KDE4 fpicker (GNOME/KDE3 seem to handle it fine), but at least in the UI show just "All files" instead of "All files (*.*)"). --- avmedia/source/viewer/mediawindow.src | 2 +- cui/source/options/optinet2.src | 2 +- fpicker/source/office/iodlg.src | 2 +- fpicker/source/unx/kde4/KDE4FilePicker.cxx | 3 +++ .../BasicAndDialogs/ToolkitControls/ToolkitControls/FileDialog.xba | 4 ++-- sd/source/ui/app/strings.src | 2 +- sfx2/source/appl/app.src | 2 +- starmath/source/smres.src | 2 +- sw/source/ui/dbui/dbui.src | 2 +- 9 files changed, 12 insertions(+), 9 deletions(-) (limited to 'sd') diff --git a/avmedia/source/viewer/mediawindow.src b/avmedia/source/viewer/mediawindow.src index 1c92b4d913af..5a6535fb1bce 100644 --- a/avmedia/source/viewer/mediawindow.src +++ b/avmedia/source/viewer/mediawindow.src @@ -50,7 +50,7 @@ String AVMEDIA_STR_ALL_MEDIAFILES String AVMEDIA_STR_ALL_FILES { - Text[en-US] = "All files (*.*)"; + Text[en-US] = "All files"; }; // ------------------------------------------------------------------------------ diff --git a/cui/source/options/optinet2.src b/cui/source/options/optinet2.src index 34789e70aa2a..9ac8dc15a9af 100644 --- a/cui/source/options/optinet2.src +++ b/cui/source/options/optinet2.src @@ -473,7 +473,7 @@ TabPage RID_SVXPAGE_INET_MAIL String STR_DEFAULT_FILENAME { - Text [ en-US ] = "All files (*.*)" ; + Text [ en-US ] = "All files" ; }; }; diff --git a/fpicker/source/office/iodlg.src b/fpicker/source/office/iodlg.src index 4a3c2f6736fb..da11eb5e8bd7 100644 --- a/fpicker/source/office/iodlg.src +++ b/fpicker/source/office/iodlg.src @@ -294,7 +294,7 @@ String RID_FILEOPEN_NOTEXISTENTFILE String STR_FILTERNAME_ALL { - Text [ en-US ] = "All files (*.*)" ; + Text [ en-US ] = "All files" ; }; String STR_SVT_ALREADYEXISTOVERWRITE diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.cxx b/fpicker/source/unx/kde4/KDE4FilePicker.cxx index 4027e3c96066..f282645e2dbb 100644 --- a/fpicker/source/unx/kde4/KDE4FilePicker.cxx +++ b/fpicker/source/unx/kde4/KDE4FilePicker.cxx @@ -306,6 +306,9 @@ void SAL_CALL KDE4FilePicker::appendFilter( const ::rtl::OUString &title, const // openoffice gives us filters separated by ';' qt dialogs just want space separated f.replace(";", " "); + // make sure "*.*" is not used as "all files" + f.replace("*.*", "*"); + _filter.append(QString("%1|%2").arg(f).arg(t)); } diff --git a/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/FileDialog.xba b/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/FileDialog.xba index 4a36d76217e2..67cd8252d1c7 100644 --- a/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/FileDialog.xba +++ b/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/FileDialog.xba @@ -38,10 +38,10 @@ Sub OpenFileDialog() oFilePicker = CreateUnoService( "com.sun.star.ui.dialogs.FilePicker" ) REM set filter - oFilePicker.AppendFilter( "All files (*.*)", "*.*" ) + oFilePicker.AppendFilter( "All files", "*.*" ) oFilePicker.AppendFilter( "StarOffice 6.0 Text Text Document", "*.sxw" ) oFilePicker.AppendFilter( "StarOffice 6.0 Spreadsheet", "*.sxc" ) - oFilePicker.SetCurrentFilter( "All files (*.*)" ) + oFilePicker.SetCurrentFilter( "All files" ) REM if no file URL is set, get path settings from configuration oTextFieldModel = oDialog.Model.TextField1 diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src index 3b6b2e4d5670..1bc40bfc72a3 100644 --- a/sd/source/ui/app/strings.src +++ b/sd/source/ui/app/strings.src @@ -397,7 +397,7 @@ String STR_SD_PAGE }; String STR_ALL_FILES { - Text [ en-US ] = "All files (*.*)" ; + Text [ en-US ] = "All files" ; }; String STR_UNDO_INSERT_TEXTFRAME { diff --git a/sfx2/source/appl/app.src b/sfx2/source/appl/app.src index f11578805e4d..f52b6daa565e 100644 --- a/sfx2/source/appl/app.src +++ b/sfx2/source/appl/app.src @@ -466,7 +466,7 @@ String RID_SVXSTR_GRAFIKLINK }; String STR_SFX_FILTERNAME_ALL { - Text [ en-US ] = "All files (*.*)" ; + Text [ en-US ] = "All files" ; }; String RID_SVXSTR_EDITGRFLINK { diff --git a/starmath/source/smres.src b/starmath/source/smres.src index dd616848f277..e565bfae42c5 100644 --- a/starmath/source/smres.src +++ b/starmath/source/smres.src @@ -1554,7 +1554,7 @@ String RID_SYMBOLFILESSTR String RID_ALLFILESSTR { - Text [ en-US ] = "All Files (*.*)" ; + Text [ en-US ] = "All files" ; }; String RID_ERR_IDENT diff --git a/sw/source/ui/dbui/dbui.src b/sw/source/ui/dbui/dbui.src index 3286d212b97e..db41b95c8c85 100644 --- a/sw/source/ui/dbui/dbui.src +++ b/sw/source/ui/dbui/dbui.src @@ -159,7 +159,7 @@ String STR_NOTASSIGNED }; String STR_FILTER_ALL { - Text [ en-US ] = "All files (*.*)" ; + Text [ en-US ] = "All files" ; }; String STR_FILTER_ALL_DATA { -- cgit v1.2.3