connectivity/source/drivers/dbase/DTable.cxx | 4 - editeng/source/editeng/editobj.cxx | 14 +++--- extensions/util/makefile.pmk | 1 hyphen/hyphen-2.7.1.patch | 20 --------- hyphen/hyphen-android.patch | 20 +++++++++ hyphen/makefile.mk | 3 - idl/inc/bastype.hxx | 20 ++++++--- idl/inc/types.hxx | 2 idl/source/objects/bastype.cxx | 12 ++--- idl/source/objects/object.cxx | 10 ++-- idl/source/objects/slot.cxx | 54 ++++++++++++------------ idl/source/objects/types.cxx | 59 +++++++++++++-------------- idl/source/prj/database.cxx | 6 +- linguistic/source/dicimp.cxx | 13 ++--- sc/source/core/tool/interpr2.cxx | 2 sfx2/source/appl/app.cxx | 2 sfx2/source/appl/childwin.cxx | 2 sfx2/source/appl/imagemgr.cxx | 4 - sfx2/source/appl/sfxhelp.cxx | 12 ++--- sfx2/source/appl/xpackcreator.cxx | 6 +- sfx2/source/control/dispatch.cxx | 2 sfx2/source/control/unoctitm.cxx | 2 sfx2/source/doc/iframe.cxx | 5 +- sfx2/source/doc/objcont.cxx | 4 - sfx2/source/doc/objxtor.cxx | 11 ++--- sfx2/source/doc/printhelper.cxx | 20 +++++++-- sfx2/source/view/sfxbasecontroller.cxx | 6 +- svl/inc/svl/ownlist.hxx | 1 svl/source/misc/ownlist.cxx | 30 ------------- unusedcode.easy | 9 +--- vcl/inc/vcl/svapp.hxx | 1 vcl/source/app/svapp.cxx | 11 ----- 32 files changed, 176 insertions(+), 192 deletions(-)
New commits: commit de2491a4c38a65cdc3c9d27629c1c9988bce096b Author: Caolán McNamara <caol...@redhat.com> Date: Thu Dec 22 09:05:53 2011 +0000 new route left to set pHandler diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index b4345c7..16381ea 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -1801,12 +1801,8 @@ TYPEINIT0(ApplicationProperty) // ------------------------------------------------------------------------ -static PropertyHandler* pHandler=NULL; - -void Application::Property( ApplicationProperty& rProp ) +void Application::Property( ApplicationProperty& /*rProp*/ ) { - if ( pHandler ) - pHandler->Property( rProp ); } void Application::AppEvent( const ApplicationEvent& /*rAppEvent*/ ) commit 9d97f5e8ab1670e5d496cf4bb3fe5494341c581e Author: Caolán McNamara <caol...@redhat.com> Date: Thu Dec 22 09:05:10 2011 +0000 callcatcher: newly unused code diff --git a/svl/inc/svl/ownlist.hxx b/svl/inc/svl/ownlist.hxx index ea1fc38..f0fd246 100644 --- a/svl/inc/svl/ownlist.hxx +++ b/svl/inc/svl/ownlist.hxx @@ -80,7 +80,6 @@ private: public: SvCommand& Append( const String & rCommand, const String & rArg ); sal_Bool AppendCommands( const String & rCmd, sal_uInt16 * pEaten ); - String GetCommands() const; sal_Bool FillFromSequence( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& ); void FillSequence( com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& ); diff --git a/svl/source/misc/ownlist.cxx b/svl/source/misc/ownlist.cxx index 48e3750..51f0707 100644 --- a/svl/source/misc/ownlist.cxx +++ b/svl/source/misc/ownlist.cxx @@ -115,36 +115,6 @@ sal_Bool SvCommandList::AppendCommands } //========================================================================= -String SvCommandList::GetCommands() const -/* [Beschreibung] - - Die Kommandos in der Liste werden als Text hintereinander, durch ein - Leerzeichen getrennt geschrieben. Der Text muss nicht genauso - aussehen wie der in <SvCommandList::AppendCommands()> "ubergebene. - - [R"uckgabewert] - - String Die Kommandos werden zur"uckgegeben. -*/ -{ - String aRet; - for( sal_uLong i = 0; i < aCommandList.size(); i++ ) - { - if( i != 0 ) - aRet += ' '; - SvCommand aCmd = aCommandList[ i ]; - aRet += aCmd.GetCommand(); - if( aCmd.GetArgument().Len() ) - { - aRet.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "=\"" ) ); - aRet += aCmd.GetArgument(); - aRet.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "\"" ) ); - } - } - return aRet; -} - -//========================================================================= SvCommand & SvCommandList::Append ( const String & rCommand, /* das Kommando */ diff --git a/unusedcode.easy b/unusedcode.easy index b0a14b2..eadbb2f 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -1,6 +1,6 @@ -(anonymous namespace)::Test::testCopyPaste() (anonymous namespace)::getState(std::__debug::vector<cppcanvas::internal::OutDevState, std::allocator<cppcanvas::internal::OutDevState> > const&) Animation::IsEmpty() const +Application::SetPropertyHandler(PropertyHandler*) AtomDocument::AtomDocument(AtomPubSession*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >) AtomFolder::AtomFolder(AtomPubSession*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >) AtomPubSession::getCollectionUrl(Collection::Type) @@ -9,6 +9,7 @@ BitmapWriteAccess::DrawPolygon(Polygon const&) BufferNode::childAt(int) const ByteString::Assign(char const*, unsigned short) ByteString::Assign(char) +ByteString::ByteString(char const*, unsigned short) CIccCLUT::Interp3dTetra(float*, float const*) CIccCLUT::Iterate(IIccCLUTExec*) CIccFormulaCurveSegment::SetFunction(unsigned short, unsigned char, float*) @@ -136,7 +137,6 @@ ImageList::RemoveImage(rtl::OUString const&) ImageList::ReplaceImage(rtl::OUString const&, rtl::OUString const&) ImageList::ReplaceImage(unsigned short, Image const&) ImageMap::GetBoundRect() const -ImpBitmap::ImplDestroy() ImpSvMEdit::SetInsertMode(unsigned char) ImpSvtData::~ImpSvtData() ImplBorderWindow::ImplBorderWindow(Window*, long, unsigned short, com::sun::star::uno::Any const&) @@ -401,7 +401,6 @@ SchXMLExport::SetProgress(int) SchXMLExportHelper_Impl::getCellAddress(int, int) SchXMLPositonAttributesHelper::getPosition() const SchXMLPositonAttributesHelper::getSize() const -SchXMLSeriesHelper::getFirstCandleStickSeries(com::sun::star::uno::Reference<com::sun::star::chart2::XDiagram> const&) ScrollBarBox::ScrollBarBox(Window*, ResId const&) ScrollableWindow::MakeVisible(Rectangle const&, unsigned char) ScrollableWindow::ScrollLines(long, long) @@ -465,7 +464,6 @@ SfxPopupWindow::RemoveStatusListener(rtl::OUString const&) SfxProgress::Lock() SfxRangeItem::SfxRangeItem(unsigned short, SvStream&) SfxRecordingFloatWrapper_Impl::GetChildWindowId() -SfxRequest::IsRecording() const SfxRequest::SetTarget(String const&) SfxShell::GetBroadcaster() SfxShell::RemoveItem(unsigned short) @@ -1772,6 +1770,8 @@ 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<com::sun::star::uno::XComponentContext> const&, void*, rtl::OUString const&, rtl::OUString const&) libcdr::CDRDocument::generateSVG(WPXInputStream*, WPXString&) libcdr::CDRInternalStream::CDRInternalStream(unsigned char const*, unsigned long) @@ -2075,7 +2075,6 @@ unicode::getCharType(unsigned short) unicode::isBase(unsigned short) unicode::isPunctuation(unsigned short) unicode::isTitle(unsigned short) -unicode::isUnicodeScriptType(unsigned short, short) unographic::GraphicDescriptor::isValid() const unotools::detail::ConfigurationWrapper::getLocalizedPropertyValue(rtl::OUString const&) const unotools::detail::ConfigurationWrapper::setLocalizedPropertyValue(boost::shared_ptr<unotools::ConfigurationChanges> const&, rtl::OUString const&, com::sun::star::uno::Any const&) const diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx index a994ff9..6daf5c6 100644 --- a/vcl/inc/vcl/svapp.hxx +++ b/vcl/inc/vcl/svapp.hxx @@ -255,7 +255,6 @@ public: virtual void AppEvent( const ApplicationEvent& rAppEvent ); virtual void Property( ApplicationProperty& ); - void SetPropertyHandler( PropertyHandler* pHandler ); #ifndef NO_GETAPPWINDOW static WorkWindow* GetAppWindow(); diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index bc1e7cc..b4345c7 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -1809,11 +1809,6 @@ void Application::Property( ApplicationProperty& rProp ) pHandler->Property( rProp ); } -void Application::SetPropertyHandler( PropertyHandler* p ) -{ - pHandler = p; -} - void Application::AppEvent( const ApplicationEvent& /*rAppEvent*/ ) { } commit a5c153bf83eb0e8878ffa2f5905e75b1216b8954 Author: Caolán McNamara <caol...@redhat.com> Date: Thu Dec 22 09:01:48 2011 +0000 fix msvc build error diff --git a/extensions/util/makefile.pmk b/extensions/util/makefile.pmk index b80a9c7..fde08af 100644 --- a/extensions/util/makefile.pmk +++ b/extensions/util/makefile.pmk @@ -27,3 +27,4 @@ .INCLUDE : settings.mk +CDEFS += -DNOMINMAX commit be4db0569c947179b0facf367862213748982361 Author: Caolán McNamara <caol...@redhat.com> Date: Wed Dec 21 23:27:48 2011 +0000 catch by const ref diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index 81bf1f6..8795e80 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -542,7 +542,7 @@ sal_Bool SfxApplication::IsXScriptURL( const String& rScriptURL ) result = sal_True; } } - catch ( ::com::sun::star::uno::RuntimeException& ) + catch (const ::com::sun::star::uno::RuntimeException&) { // ignore, will just return FALSE } diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx index 4fdf426..99c5e3a 100644 --- a/sfx2/source/appl/childwin.cxx +++ b/sfx2/source/appl/childwin.cxx @@ -184,7 +184,7 @@ void SfxChildWindow::Destroy() else GetFrame()->dispose(); } - catch ( com::sun::star::uno::Exception& ) + catch (const com::sun::star::uno::Exception&) { } } diff --git a/sfx2/source/appl/imagemgr.cxx b/sfx2/source/appl/imagemgr.cxx index f6faced..2b91099 100644 --- a/sfx2/source/appl/imagemgr.cxx +++ b/sfx2/source/appl/imagemgr.cxx @@ -146,7 +146,7 @@ Image SAL_CALL GetImage( if ( !!aImage ) return aImage; } - catch ( Exception& ) + catch (const Exception&) { } } @@ -214,7 +214,7 @@ Image SAL_CALL GetImage( return SvFileInformationManager::GetImageNoDefault( aObj, bBig ); } } - catch ( Exception& ) + catch (const Exception&) { } diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index 47f470e..6093d80 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -208,7 +208,7 @@ sal_Bool GetHelpAnchor_Impl( const String& _rURL, String& _rAnchor ) DBG_ERRORFILE( "Property 'AnchorName' is missing" ); } } - catch( ::com::sun::star::uno::Exception& ) + catch (const ::com::sun::star::uno::Exception&) { } @@ -445,11 +445,11 @@ SfxHelp::~SfxHelp() { sIdentifier = xModuleManager->identify( xCurrentFrame ); } - catch ( ::com::sun::star::frame::UnknownModuleException& ) + catch (const ::com::sun::star::frame::UnknownModuleException&) { DBG_WARNING( "SfxHelp::getCurrentModuleIdentifier_Impl(): unknown module (help in help?)" ); } - catch ( Exception& ) + catch (const Exception&) { DBG_ERRORFILE( "SfxHelp::getCurrentModuleIdentifier_Impl(): exception of XModuleManager::identify()" ); } @@ -484,7 +484,7 @@ String SfxHelp::GetHelpModuleName_Impl() } } } - catch ( Exception& ) + catch (const Exception&) { DBG_ERRORFILE( "SfxHelp::GetHelpModuleName_Impl(): exception of XNameAccess::getByName()" ); } @@ -697,7 +697,7 @@ static bool impl_showOnlineHelp( const String& rURL ) return true; } } - catch( const Exception& ) + catch (const Exception&) { } return false; @@ -866,7 +866,7 @@ void SfxHelp::OpenHelpAgent( const rtl::OString& sHelpId ) if ( xHelpDispatch.is() ) xHelpDispatch->dispatch( aURL, Sequence< PropertyValue >() ); } - catch( const Exception& ) + catch (const Exception&) { DBG_ERRORFILE( "OpenHelpAgent: caught an exception while executing the dispatch!" ); } diff --git a/sfx2/source/appl/xpackcreator.cxx b/sfx2/source/appl/xpackcreator.cxx index b82226f..3f404fd 100644 --- a/sfx2/source/appl/xpackcreator.cxx +++ b/sfx2/source/appl/xpackcreator.cxx @@ -137,7 +137,7 @@ void SAL_CALL OPackageStructureCreator::convertToPackage( const ::rtl::OUString& } } } - catch ( uno::RuntimeException& ) + catch (const uno::RuntimeException&) { if ( pTempStream ) delete pTempStream; @@ -147,7 +147,7 @@ void SAL_CALL OPackageStructureCreator::convertToPackage( const ::rtl::OUString& throw; } - catch ( io::IOException& ) + catch (const io::IOException&) { if ( pTempStream ) delete pTempStream; @@ -157,7 +157,7 @@ void SAL_CALL OPackageStructureCreator::convertToPackage( const ::rtl::OUString& throw; } - catch ( uno::Exception& ) + catch (const uno::Exception&) { } diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index a720354..4f2331e 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -1368,7 +1368,7 @@ void SfxDispatcher::Update_Impl( sal_Bool bForce ) com::sun::star::uno::Any aValue = xPropSet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" )) ); aValue >>= xLayoutManager; } - catch ( com::sun::star::uno::Exception& ) + catch (const com::sun::star::uno::Exception&) { } } diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index b6c745b..014fd38 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -939,7 +939,7 @@ void SfxDispatchController_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eSt { ((::com::sun::star::frame::XStatusListener *)aIt.next())->statusChanged( aEvent ); } - catch( ::com::sun::star::uno::RuntimeException& ) + catch (const ::com::sun::star::uno::RuntimeException&) { aIt.remove(); } diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx index f981747..d9c169e 100644 --- a/sfx2/source/doc/iframe.cxx +++ b/sfx2/source/doc/iframe.cxx @@ -182,8 +182,9 @@ void SAL_CALL IFrameObject::cancel() throw( com::sun::star::uno::RuntimeExceptio xClose->close( sal_True ); mxFrame = 0; } - catch ( uno::Exception& ) - {} + catch (const uno::Exception&) + { + } } void SAL_CALL IFrameObject::close( sal_Bool /*bDeliverOwnership*/ ) throw( com::sun::star::util::CloseVetoException, com::sun::star::uno::RuntimeException ) diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index 570a13a..d1b9677 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -285,7 +285,7 @@ void SfxObjectShell::UpdateTime_Impl( i_xDocProps->setEditingDuration(newSecs); i_xDocProps->setEditingCycles(i_xDocProps->getEditingCycles() + 1); } - catch (lang::IllegalArgumentException &) + catch (const lang::IllegalArgumentException &) { // ignore overflow } @@ -920,7 +920,7 @@ void SfxObjectShell::UpdateFromTemplate_Impl( ) bOK = sal_True; } } - catch ( Exception& ) + catch (const Exception&) { } diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index d4e8b56..d666204 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -146,7 +146,7 @@ static VBAConstantNameMap s_aRegisteredVBAConstants; xProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "VBAGlobalConstantName" ) ) ) >>= aConstName; return ::rtl::OUStringToOString( aConstName, RTL_TEXTENCODING_ASCII_US ); } - catch( uno::Exception& ) // not supported + catch (const uno::Exception&) // not supported { } return ::rtl::OString(); @@ -466,7 +466,7 @@ sal_Bool SfxObjectShell::Close() { xCloseable->close( sal_True ); } - catch( Exception& ) + catch (const Exception&) { pImp->bClosing = sal_False; } @@ -762,7 +762,7 @@ namespace xContext, xStorageDoc ) , UNO_QUERY_THROW ); } - catch( const Exception& ) + catch (const Exception&) { DBG_UNHANDLED_EXCEPTION(); } @@ -1092,8 +1092,9 @@ Reference<lang::XComponent> SfxObjectShell::CreateAndLoadComponent( const SfxIte { xComp = xLoader->loadComponentFromURL(aURL, aTarget, 0, aProps); } - catch( uno::Exception& ) - {} + catch (const uno::Exception&) + { + } return xComp; } diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx index 24dcd66..9206d3a 100644 --- a/sfx2/source/doc/printhelper.cxx +++ b/sfx2/source/doc/printhelper.cxx @@ -556,10 +556,22 @@ class ImplUCBPrintWatcher : public ::osl::Thread ::com::sun::star::ucb::NameClash::OVERWRITE); } } - catch( ::com::sun::star::ucb::ContentCreationException& ) { OSL_FAIL("content create exception"); } - catch( ::com::sun::star::ucb::CommandAbortedException& ) { OSL_FAIL("command abort exception"); } - catch( ::com::sun::star::uno::RuntimeException& ) { OSL_FAIL("runtime exception"); } - catch( ::com::sun::star::uno::Exception& ) { OSL_FAIL("unknown exception"); } + catch (const ::com::sun::star::ucb::ContentCreationException&) + { + OSL_FAIL("content create exception"); + } + catch (const ::com::sun::star::ucb::CommandAbortedException&) + { + OSL_FAIL("command abort exception"); + } + catch (const ::com::sun::star::uno::RuntimeException&) + { + OSL_FAIL("runtime exception"); + } + catch (const ::com::sun::star::uno::Exception&) + { + OSL_FAIL("unknown exception"); + } // kill the temp file! delete *ppTempFile; diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index e90f7ef..7dcaeec 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -998,7 +998,7 @@ void SfxBaseController::BorderWidthsChanged_Impl() { ((frame::XBorderResizeListener*)pIterator.next())->borderWidthsChanged( xThis, aBWidths ); } - catch( uno::RuntimeException& ) + catch (const uno::RuntimeException&) { pIterator.remove(); } @@ -1302,7 +1302,7 @@ void SfxBaseController::ConnectSfxFrame_Impl( const ConnectSfxFrame i_eConnect ) xFrameProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" ) ) ), uno::UNO_QUERY_THROW ); xLayouterProps->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PreserveContentSize" ) ), uno::makeAny( sal_True ) ); } - catch( const uno::Exception& ) + catch (const uno::Exception&) { DBG_UNHANDLED_EXCEPTION(); } @@ -1446,7 +1446,7 @@ void SfxBaseController::ConnectSfxFrame_Impl( const ConnectSfxFrame i_eConnect ) m_pData->m_pViewShell->ReadUserDataSequence( aViewData, sal_True ); } } - catch( const Exception& ) + catch (const Exception&) { DBG_UNHANDLED_EXCEPTION(); } commit 7a6efedd9eb4dea9abc9d1fd1f6362092ce01f78 Author: Caolán McNamara <caol...@redhat.com> Date: Wed Dec 21 23:11:38 2011 +0000 split hyphen patch to isolate android support diff --git a/hyphen/hyphen-2.7.1.patch b/hyphen/hyphen-2.7.1.patch index 50b7d5a..0e8eafa 100644 --- a/hyphen/hyphen-2.7.1.patch +++ b/hyphen/hyphen-2.7.1.patch @@ -1,23 +1,3 @@ ---- misc/hyphen-2.7.1/config.sub -+++ misc/build/hyphen-2.7.1/config.sub -@@ -120,7 +120,7 @@ - # Here we must recognize all the valid KERNEL-OS combinations. - maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` - case $maybe_os in -- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ -+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ - storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os -@@ -1215,7 +1215,7 @@ - | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ -+ | -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ --- misc/hyphen-2.7.1/Makefile.am 2010-07-19 11:23:17.000000000 +0200 +++ misc/build/hyphen-2.7.1/Makefile.am 2010-12-02 10:15:44.390625000 +0100 @@ -25,14 +25,13 @@ diff --git a/hyphen/hyphen-android.patch b/hyphen/hyphen-android.patch new file mode 100644 index 0000000..b49c4a0 --- /dev/null +++ b/hyphen/hyphen-android.patch @@ -0,0 +1,20 @@ +--- misc/hyphen-2.7.1/config.sub ++++ misc/build/hyphen-2.7.1/config.sub +@@ -120,7 +120,7 @@ + # Here we must recognize all the valid KERNEL-OS combinations. + maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` + case $maybe_os in +- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ ++ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ + uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os +@@ -1215,7 +1215,7 @@ + | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* \ + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ +- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ ++ | -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk index 1cb1a10..d82c4b1 100644 --- a/hyphen/makefile.mk +++ b/hyphen/makefile.mk @@ -44,7 +44,8 @@ ADDITIONAL_FILES += makefile.mk PATCH_FILES= \ hyphen-2.7.1.patch \ hyphen-2.7.1-read-charset.patch \ - hyphen-2.7.1-2.8.3.patch + hyphen-2.7.1-2.8.3.patch \ + hyphen-android.patch .IF "$(GUI)"=="UNX" CONFIGURE_DIR=$(BUILD_DIR) commit 80a11f0d43309f336d9ca4723f06b8e49ac1d7d7 Author: Caolán McNamara <caol...@redhat.com> Date: Wed Dec 21 22:55:35 2011 +0000 ByteString->rtl::OString diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index cfabfbf..40f1469 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -691,7 +691,7 @@ void ODbaseTable::refreshIndexes() Config aInfFile(aURL.getFSysPath(INetURLObject::FSYS_DETECT)); aInfFile.SetGroup(dBASE_III_GROUP); sal_uInt16 nKeyCnt = aInfFile.GetKeyCount(); - ByteString aKeyName; + rtl::OString aKeyName; ByteString aIndexName; for (sal_uInt16 nKey = 0; nKey < nKeyCnt; nKey++) @@ -699,7 +699,7 @@ void ODbaseTable::refreshIndexes() // Refences the key an index-file? aKeyName = aInfFile.GetKeyName( nKey ); //...if yes, add the index list of the table - if (aKeyName.Copy(0,3) == ByteString("NDX") ) + if (aKeyName.copy(0,3).equalsL(RTL_CONSTASCII_STRINGPARAM("NDX"))) { aIndexName = aInfFile.ReadKey(aKeyName); aURL.setName(String(aIndexName,m_eEncoding)); diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx index e6ca9a5..51fb1d6 100644 --- a/editeng/source/editeng/editobj.cxx +++ b/editeng/source/editeng/editobj.cxx @@ -1226,7 +1226,7 @@ void BinTextObject::CreateData( SvStream& rIStream ) ContentInfo* pC = CreateAndInsertContent(); // The Text... - ByteString aByteString = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rIStream); + rtl::OString aByteString = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rIStream); pC->GetText() = rtl::OStringToOUString(aByteString, eSrcEncoding); // StyleName and Family... @@ -1260,7 +1260,7 @@ void BinTextObject::CreateData( SvStream& rIStream ) { if ( pItem->Which() == EE_FEATURE_NOTCONV ) { - sal_Char cEncodedChar = aByteString.GetChar(nStart); + sal_Char cEncodedChar = aByteString[nStart]; sal_Unicode cChar = rtl::OUString(&cEncodedChar, 1, ((SvxCharSetColorItem*)pItem)->GetCharSet()).toChar(); pC->GetText().SetChar(nStart, cChar); @@ -1273,8 +1273,8 @@ void BinTextObject::CreateData( SvStream& rIStream ) if ( ( _nWhich >= EE_FEATURE_START ) && ( _nWhich <= EE_FEATURE_END ) ) { // Convert CH_FEATURE to CH_FEATURE_OLD - DBG_ASSERT( (sal_uInt8) aByteString.GetChar( nStart ) == CH_FEATURE_OLD, "CreateData: CH_FEATURE expected!" ); - if ( (sal_uInt8) aByteString.GetChar( nStart ) == CH_FEATURE_OLD ) + DBG_ASSERT( (sal_uInt8) aByteString[nStart] == CH_FEATURE_OLD, "CreateData: CH_FEATURE expected!" ); + if ( (sal_uInt8) aByteString[nStart] == CH_FEATURE_OLD ) pC->GetText().SetChar( nStart, CH_FEATURE ); } } @@ -1290,7 +1290,7 @@ void BinTextObject::CreateData( SvStream& rIStream ) const SvxFontItem& rFontItem = (const SvxFontItem&)pC->GetParaAttribs().Get( EE_CHAR_FONTINFO ); if ( rFontItem.GetCharSet() == RTL_TEXTENCODING_SYMBOL ) { - pC->GetText() = String( aByteString, RTL_TEXTENCODING_SYMBOL ); + pC->GetText() = rtl::OStringToOUString(aByteString, RTL_TEXTENCODING_SYMBOL); bSymbolPara = sal_True; } } @@ -1305,8 +1305,8 @@ void BinTextObject::CreateData( SvStream& rIStream ) || ( bSymbolPara && ( rFontItem.GetCharSet() != RTL_TEXTENCODING_SYMBOL ) ) ) { // Not correctly converted - ByteString aPart( aByteString, pAttr->GetStart(), pAttr->GetEnd()-pAttr->GetStart() ); - String aNew( aPart, rFontItem.GetCharSet() ); + rtl::OString aPart(aByteString.copy(pAttr->GetStart(), pAttr->GetEnd()-pAttr->GetStart())); + rtl::OUString aNew(rtl::OStringToOUString(aPart, rFontItem.GetCharSet())); pC->GetText().Erase( pAttr->GetStart(), pAttr->GetEnd()-pAttr->GetStart() ); pC->GetText().Insert( aNew, pAttr->GetStart() ); } diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx index 3f6257c..1af7d36 100644 --- a/linguistic/source/dicimp.cxx +++ b/linguistic/source/dicimp.cxx @@ -339,8 +339,7 @@ sal_uLong DictionaryNeo::loadEntries(const OUString &rMainURL) // Paste in dictionary without converting if(*aWordBuf) { - ByteString aDummy( aWordBuf ); - String aText( aDummy, eEnc ); + rtl::OUString aText(aWordBuf, rtl_str_getLength(aWordBuf), eEnc); uno::Reference< XDictionaryEntry > xEntry = new DicEntry( aText, bNegativ ); addEntry_Impl( xEntry , sal_True ); //! don't launch events here @@ -440,11 +439,11 @@ sal_uLong DictionaryNeo::saveEntries(const OUString &rURL) // Always write as the latest version, i.e. DIC_VERSION_7 // rtl_TextEncoding eEnc = RTL_TEXTENCODING_UTF8; - pStream->WriteLine(ByteString (pVerOOo7)); + pStream->WriteLine(rtl::OString(pVerOOo7)); if (0 != (nErr = pStream->GetError())) return nErr; if (nLanguage == LANGUAGE_NONE) - pStream->WriteLine(ByteString("lang: <none>")); + pStream->WriteLine(rtl::OString(RTL_CONSTASCII_STRINGPARAM("lang: <none>"))); else { rtl::OStringBuffer aLine(RTL_CONSTASCII_STRINGPARAM("lang: ")); @@ -454,12 +453,12 @@ sal_uLong DictionaryNeo::saveEntries(const OUString &rURL) if (0 != (nErr = pStream->GetError())) return nErr; if (eDicType == DictionaryType_POSITIVE) - pStream->WriteLine(ByteString("type: positive")); + pStream->WriteLine(rtl::OString(RTL_CONSTASCII_STRINGPARAM("type: positive"))); else - pStream->WriteLine(ByteString("type: negative")); + pStream->WriteLine(rtl::OString(RTL_CONSTASCII_STRINGPARAM("type: negative"))); if (0 != (nErr = pStream->GetError())) return nErr; - pStream->WriteLine(ByteString("---")); + pStream->WriteLine(rtl::OString(RTL_CONSTASCII_STRINGPARAM("---"))); if (0 != (nErr = pStream->GetError())) return nErr; const uno::Reference< XDictionaryEntry > *pEntry = aEntries.getConstArray(); diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx index 388c318..2349886 100644 --- a/sc/source/core/tool/interpr2.cxx +++ b/sc/source/core/tool/interpr2.cxx @@ -2772,7 +2772,7 @@ void ScInterpreter::ScEuroConvert() #define UTF8_TH_MINUS "\340\270\245\340\270\232" #define UTF8_STRINGPARAM( ascii ) ascii, static_cast< xub_StrLen >( sizeof( ascii ) - 1 ) -#define UTF8_CREATE( ascii ) ByteString( UTF8_STRINGPARAM( ascii ) ) +#define UTF8_CREATE( ascii ) rtl::OString( RTL_CONSTASCII_STRINGPARAM( ascii ) ) #define UTF8_APPEND( ascii ) Append( UTF8_STRINGPARAM( ascii ) ) #define UTF8_PREPEND( ascii ) Insert( UTF8_CREATE( ascii ), 0 ) commit 1c1961786a519101bbf34c62542542c8a56e0328 Author: Caolán McNamara <caol...@redhat.com> Date: Wed Dec 21 22:54:20 2011 +0000 inheriting from ByteString is kind of weird diff --git a/idl/inc/bastype.hxx b/idl/inc/bastype.hxx index 7fdeafd..d52a38b 100644 --- a/idl/inc/bastype.hxx +++ b/idl/inc/bastype.hxx @@ -156,16 +156,26 @@ public: }; -class SvIdentifier : public ByteString +class SvIdentifier { +private: + ByteString m_aStr; public: - SvIdentifier(){}; - SvIdentifier & operator = ( const ByteString & rStr ) - { ByteString::operator =( rStr ); return *this; } + SvIdentifier() + { + } + void setIdentifier(const ByteString & rStr) + { + m_aStr = rStr; + } + const ByteString& getIdentifier() const + { + return m_aStr; + } friend SvStream& operator << (SvStream &, const SvIdentifier &); friend SvStream& operator >> (SvStream &, SvIdentifier &); - sal_Bool IsSet() const { return Len() != 0; } + sal_Bool IsSet() const { return m_aStr.Len() != 0; } sal_Bool ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm ); sal_Bool WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm, sal_uInt16 nTab ); diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx index 6e8841f..0b7c4ba 100644 --- a/idl/inc/types.hxx +++ b/idl/inc/types.hxx @@ -209,7 +209,7 @@ public: int GetCall1() const; void SetBasicName(const ByteString& rName) - { aBasicName = rName; } + { aBasicName.setIdentifier(rName); } const ByteString & GetBasicName() const; ByteString GetBasicPostfix() const; diff --git a/idl/source/objects/bastype.cxx b/idl/source/objects/bastype.cxx index 365d5f3..7cefabc 100644 --- a/idl/source/objects/bastype.cxx +++ b/idl/source/objects/bastype.cxx @@ -222,19 +222,19 @@ sal_Bool SvIdentifier::WriteSvIdl( SvStringHashEntry * pName, sal_uInt16 /*nTab */ ) { rOutStm << pName->GetName().GetBuffer() << '('; - rOutStm << GetBuffer() << ')'; + rOutStm << getIdentifier().GetBuffer() << ')'; return sal_True; } SvStream& operator << (SvStream & rStm, const SvIdentifier & r ) { - write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rStm, r); + write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rStm, r.getIdentifier()); return rStm; } SvStream& operator >> (SvStream & rStm, SvIdentifier & r ) { - r = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rStm); + r.setIdentifier(read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rStm)); return rStm; } @@ -246,7 +246,7 @@ sal_Bool SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase, if( SvIdentifier::ReadSvIdl( pName, rInStm ) ) { sal_uLong n; - if( rBase.FindId( *this, &n ) ) + if( rBase.FindId( getIdentifier(), &n ) ) { nValue = n; return sal_True; @@ -254,7 +254,7 @@ sal_Bool SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase, else { ByteString aStr ("no value for identifier <"); - aStr += *this; + aStr += getIdentifier(); aStr += "> "; rBase.SetError( aStr, rInStm.GetToken() ); rBase.WriteError( rInStm ); @@ -281,7 +281,7 @@ sal_Bool SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase, else { ByteString aStr ("no value for identifier <"); - aStr += *this; + aStr += getIdentifier(); aStr += "> "; rBase.SetError( aStr, rInStm.GetToken() ); rBase.WriteError( rInStm ); diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx index 9388843..24ed04a 100644 --- a/idl/source/objects/object.cxx +++ b/idl/source/objects/object.cxx @@ -324,7 +324,7 @@ sal_Bool SvMetaClass::TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInS if ( !rAttr.GetRef() && rAttr.IsA( TYPE( SvMetaSlot ) ) ) { OSL_FAIL( "Neuer Slot : " ); - OSL_FAIL( rAttr.GetSlotId().GetBuffer() ); + OSL_FAIL( rAttr.GetSlotId().getIdentifier().GetBuffer() ); } for( sal_uLong n = 0; n < aAttrList.Count(); n++ ) @@ -337,8 +337,8 @@ sal_Bool SvMetaClass::TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInS { OSL_FAIL( "Gleicher Name in MetaClass : " ); OSL_FAIL( pS->GetName().GetBuffer() ); - OSL_FAIL( pS->GetSlotId().GetBuffer() ); - OSL_FAIL( rAttr.GetSlotId().GetBuffer() ); + OSL_FAIL( pS->GetSlotId().getIdentifier().GetBuffer() ); + OSL_FAIL( rAttr.GetSlotId().getIdentifier().GetBuffer() ); rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("Attribute's ")); aStr.append(pS->GetName()); @@ -357,8 +357,8 @@ sal_Bool SvMetaClass::TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInS OSL_FAIL( "Gleiche Id in MetaClass : " ); OSL_FAIL(rtl::OString::valueOf(static_cast<sal_Int32>( pS->GetSlotId().GetValue())).getStr()); - OSL_FAIL( pS->GetSlotId().GetBuffer() ); - OSL_FAIL( rAttr.GetSlotId().GetBuffer() ); + OSL_FAIL( pS->GetSlotId().getIdentifier().GetBuffer() ); + OSL_FAIL( rAttr.GetSlotId().getIdentifier().GetBuffer() ); rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("Attribute ")); aStr.append(pS->GetName()); diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx index 831afa8..0502c71 100644 --- a/idl/source/objects/slot.cxx +++ b/idl/source/objects/slot.cxx @@ -172,12 +172,12 @@ void SvMetaSlot::Save( SvPersistStream & rStm ) // create mask sal_uInt16 nMask = 0; if( aMethod.Is() ) nMask |= 0x0001; - if( aGroupId.Len() ) nMask |= 0x0002; + if( aGroupId.getIdentifier().Len() ) nMask |= 0x0002; if( aHasCoreId.IsSet() ) nMask |= 0x0004; - if( aConfigId.Len() ) nMask |= 0x0008; - if( aExecMethod.Len() ) nMask |= 0x0010; - if( aStateMethod.Len() ) nMask |= 0x0020; - if( aDefault.Len() ) nMask |= 0x0040; + if( aConfigId.getIdentifier().Len() ) nMask |= 0x0008; + if( aExecMethod.getIdentifier().Len() ) nMask |= 0x0010; + if( aStateMethod.getIdentifier().Len() ) nMask |= 0x0020; + if( aDefault.getIdentifier().Len() ) nMask |= 0x0040; if( aPseudoSlots.IsSet() ) nMask |= 0x0080; if( aGet.IsSet() ) nMask |= 0x0100; if( aSet.IsSet() ) nMask |= 0x0200; @@ -231,7 +231,7 @@ void SvMetaSlot::Save( SvPersistStream & rStm ) if( aNoRecord.IsSet() ) nMask |= 0x0004; if( aHasDialog.IsSet() ) nMask |= 0x0008; if ( aDisableFlags.IsSet() ) nMask |= 0x0010; - if( aPseudoPrefix.Len() ) nMask |= 0x0020; + if( aPseudoPrefix.getIdentifier().Len() ) nMask |= 0x0020; if( aRecordPerSet.IsSet() ) nMask |= 0x0040; if( aMenuConfig.IsSet() ) nMask |= 0x0080; if( aToolBoxConfig.IsSet() ) nMask |= 0x0100; @@ -335,7 +335,7 @@ sal_Bool SvMetaSlot::GetHasCoreId() const } const ByteString & SvMetaSlot::GetGroupId() const { - if( aGroupId.Len() || !GetRef() ) return aGroupId; + if( aGroupId.getIdentifier().Len() || !GetRef() ) return aGroupId.getIdentifier(); return ((SvMetaSlot *)GetRef())->GetGroupId(); } const ByteString & SvMetaSlot::GetDisableFlags() const @@ -345,22 +345,22 @@ const ByteString & SvMetaSlot::GetDisableFlags() const } const ByteString & SvMetaSlot::GetConfigId() const { - if( aConfigId.Len() || !GetRef() ) return aConfigId; + if( aConfigId.getIdentifier().Len() || !GetRef() ) return aConfigId.getIdentifier(); return ((SvMetaSlot *)GetRef())->GetConfigId(); } const ByteString & SvMetaSlot::GetExecMethod() const { - if( aExecMethod.Len() || !GetRef() ) return aExecMethod; + if( aExecMethod.getIdentifier().Len() || !GetRef() ) return aExecMethod.getIdentifier(); return ((SvMetaSlot *)GetRef())->GetExecMethod(); } const ByteString & SvMetaSlot::GetStateMethod() const { - if( aStateMethod.Len() || !GetRef() ) return aStateMethod; + if( aStateMethod.getIdentifier().Len() || !GetRef() ) return aStateMethod.getIdentifier(); return ((SvMetaSlot *)GetRef())->GetStateMethod(); } const ByteString & SvMetaSlot::GetDefault() const { - if( aDefault.Len() || !GetRef() ) return aDefault; + if( aDefault.getIdentifier().Len() || !GetRef() ) return aDefault.getIdentifier(); return ((SvMetaSlot *)GetRef())->GetDefault(); } sal_Bool SvMetaSlot::GetPseudoSlots() const @@ -451,7 +451,7 @@ sal_Bool SvMetaSlot::GetHasDialog() const } const ByteString & SvMetaSlot::GetPseudoPrefix() const { - if( aPseudoPrefix.Len() || !GetRef() ) return aPseudoPrefix; + if( aPseudoPrefix.getIdentifier().Len() || !GetRef() ) return aPseudoPrefix.getIdentifier(); return ((SvMetaSlot *)GetRef())->GetPseudoPrefix(); } sal_Bool SvMetaSlot::GetMenuConfig() const @@ -653,19 +653,19 @@ void SvMetaSlot::WriteAttributesSvIdl( SvIdlDataBase & rBase, aHasCoreId.WriteSvIdl( SvHash_HasCoreId(), rOutStm ); rOutStm << ';' << endl; } - if( aGroupId.Len() ) + if( aGroupId.getIdentifier().Len() ) { WriteTab( rOutStm, nTab ); aGroupId.WriteSvIdl( SvHash_GroupId(), rOutStm, nTab +1); rOutStm << ';' << endl; } - if( aExecMethod.Len() ) + if( aExecMethod.getIdentifier().Len() ) { WriteTab( rOutStm, nTab ); aExecMethod.WriteSvIdl( SvHash_ExecMethod(), rOutStm, nTab +1); rOutStm << ';' << endl; } - if( aStateMethod.Len() ) + if( aStateMethod.getIdentifier().Len() ) { WriteTab( rOutStm, nTab ); aStateMethod.WriteSvIdl( SvHash_StateMethod(), rOutStm, nTab +1); @@ -1013,7 +1013,7 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const ByteString & rPrefix, if( GetPseudoPrefix().Len() ) aBuf.append(GetPseudoPrefix()); else - aBuf.append(GetSlotId()); + aBuf.append(GetSlotId().getIdentifier()); aBuf.append('_'); aBuf.append(aValName.Copy(pEnum->GetPrefix().Len())); @@ -1023,7 +1023,7 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const ByteString & rPrefix, for( m=0; m<rBase.GetAttrList().Count(); m++ ) { SvMetaAttribute * pAttr = rBase.GetAttrList().GetObject( m ); - if (aSId.equals(pAttr->GetSlotId())) + if (aSId.equals(pAttr->GetSlotId().getIdentifier())) { SvMetaSlot* pSlot = PTR_CAST( SvMetaSlot, pAttr ); xEnumSlot = pSlot->Clone(); @@ -1039,7 +1039,7 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const ByteString & rPrefix, if ( rBase.FindId(aSId , &nValue) ) { SvNumberIdentifier aId; - *((SvIdentifier*)&aId) = aSId; + aId.setIdentifier(aSId); aId.SetValue(nValue); xEnumSlot->SetSlotId(aId); } @@ -1171,7 +1171,7 @@ void SvMetaSlot::WriteSlot( const ByteString & rShellName, sal_uInt16 nCount, rOutStm << rSlotId.GetBuffer() << ','; const SvHelpContext& rHlpCtx = GetHelpContext(); if( rHlpCtx.IsSet() ) - rOutStm << rHlpCtx.GetBuffer() << ','; + rOutStm << rHlpCtx.getIdentifier().GetBuffer() << ','; else rOutStm << rSlotId.GetBuffer() << ','; @@ -1196,8 +1196,8 @@ void SvMetaSlot::WriteSlot( const ByteString & rShellName, sal_uInt16 nCount, WriteTab( rOutStm, 4 ); // SlotId - if( GetSlotId().Len() ) - rOutStm << pLinkedSlot->GetSlotId().GetBuffer(); + if( GetSlotId().getIdentifier().Len() ) + rOutStm << pLinkedSlot->GetSlotId().getIdentifier().GetBuffer(); else rOutStm << '0'; rOutStm << ','; @@ -1445,7 +1445,7 @@ sal_uInt16 SvMetaSlot::WriteSlotParamArray( SvIdlDataBase & rBase, SvStream & rO SvMetaType * pPType = pPar->GetType(); WriteTab( rOutStm, 1 ); rOutStm << "SFX_ARGUMENT(" - << pPar->GetSlotId().GetBuffer() << ',' // SlodId + << pPar->GetSlotId().getIdentifier().GetBuffer() << ',' // SlodId // parameter name << "\"" << pPar->GetName().GetBuffer() << "\"," // item name @@ -1466,7 +1466,7 @@ sal_uInt16 SvMetaSlot::WriteSlotMap( const ByteString & rShellName, sal_uInt16 n SvStream & rOutStm ) { // SlotId, if not specified generate from name - ByteString slotId = GetSlotId(); + ByteString slotId = GetSlotId().getIdentifier(); sal_uInt16 nSCount = 0; if( IsMethod() ) @@ -1526,7 +1526,7 @@ void SvMetaSlot::WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm, if( GetPseudoPrefix().Len() ) aBuf.append(GetPseudoPrefix()); else - aBuf.append(GetSlotId()); + aBuf.append(GetSlotId().getIdentifier()); aBuf.append('_'); aBuf.append(aValName.Copy(pEnum->GetPrefix().Len())); @@ -1569,7 +1569,7 @@ void SvMetaSlot::WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm, if( !pTable->IsKeyValid( nSId ) ) { pTable->Insert( nSId, this ); - rOutStm << "#define " << GetSlotId().GetBuffer() << '\t' + rOutStm << "#define " << GetSlotId().getIdentifier().GetBuffer() << '\t' << rtl::OString::valueOf(static_cast<sal_Int32>(nSId)).getStr() << endl; } @@ -1585,7 +1585,7 @@ void SvMetaSlot::WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm, if( GetPseudoPrefix().Len() ) aBuf.append(GetPseudoPrefix()); else - aBuf.append( GetSlotId() ); + aBuf.append(GetSlotId().getIdentifier()); aBuf.append('_'); aBuf.append(aValName.Copy(pEnum->GetPrefix().Len())); @@ -1624,7 +1624,7 @@ void WriteBool( sal_Bool bSet, SvStream& rStream ) void SvMetaSlot::WriteCSV( SvIdlDataBase& rBase, SvStream& rStrm ) { rStrm << "PROJECT,"; - rStrm << GetSlotId().GetBuffer() << ','; + rStrm << GetSlotId().getIdentifier().GetBuffer() << ','; rStrm << rtl::OString::valueOf( static_cast<sal_Int32>(GetSlotId().GetValue())).getStr() diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx index 1063baa..4c64b21 100644 --- a/idl/source/objects/types.cxx +++ b/idl/source/objects/types.cxx @@ -245,7 +245,7 @@ void SvMetaAttribute::WriteSvIdl pType->WriteTypePrefix( rBase, rOutStm, nTab, WRITE_IDL ); rOutStm << ' ' << GetName().GetBuffer(); if( aSlotId.IsSet() ) - rOutStm << ' ' << aSlotId.GetBuffer(); + rOutStm << ' ' << aSlotId.getIdentifier().GetBuffer(); if( pType->GetType() == TYPE_METHOD ) pType->WriteMethodArgs( rBase, rOutStm, nTab, WRITE_IDL ); sal_uLong nPos = rOutStm.Tell(); @@ -386,7 +386,7 @@ sal_uLong SvMetaAttribute::MakeSlotValue( SvIdlDataBase & rBase, sal_Bool bVar ) { const SvNumberIdentifier & rId = GetSlotId(); sal_uLong n = rId.GetValue(); - if( rBase.aStructSlotId.Len() ) + if( rBase.aStructSlotId.getIdentifier().Len() ) { n = n << 20; n += rBase.aStructSlotId.GetValue(); @@ -517,7 +517,7 @@ void SvMetaAttribute::WriteRecursiv_Impl( SvIdlDataBase & rBase, sal_uLong nCount = rList.Count(); SvNumberIdentifier slotId = rBase.aStructSlotId; - if ( GetSlotId().Len() ) + if ( GetSlotId().getIdentifier().Len() ) rBase.aStructSlotId = GetSlotId(); // offial hack interface by MM: special controls get passed with the WriteAttribute @@ -653,7 +653,7 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm, if( !bVariable && IsMethod() ) { rOutStm << "<METHOD>" << endl - << GetSlotId().GetBuffer() << endl + << GetSlotId().getIdentifier().GetBuffer() << endl << GetName().GetBuffer() << endl << endl; // readonly @@ -691,7 +691,7 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm, else { rOutStm << "<PROPERTY>" << endl - << GetSlotId().GetBuffer() << endl + << GetSlotId().getIdentifier().GetBuffer() << endl << GetName().GetBuffer() << endl; if ( GetReadonly() ) rOutStm << "(nur lesen)" << endl; @@ -730,7 +730,7 @@ sal_uLong SvMetaAttribute::MakeSfx( rtl::OStringBuffer& rAttrArray ) else { rAttrArray.append('{'); - rAttrArray.append(GetSlotId()); + rAttrArray.append(GetSlotId().getIdentifier()); rAttrArray.append(",\""); rAttrArray.append(GetName()); rAttrArray.append("\"}"); @@ -772,7 +772,7 @@ SvMetaType::SvMetaType( const rtl::OString& rName, char cPC, { SetName( rName ); cParserChar = cPC; - aCName = rCName; + aCName.setIdentifier(rCName); } SvMetaType::SvMetaType( const rtl::OString& rName, @@ -785,12 +785,12 @@ SvMetaType::SvMetaType( const rtl::OString& rName, CTOR { SetName( rName ); - aSbxName = rSbxName; - aOdlName = rOdlName; + aSbxName.setIdentifier(rSbxName); + aOdlName.setIdentifier(rOdlName); cParserChar = cPc; - aCName = rCName; - aBasicName = rBasicName; - aBasicPostfix = rBasicPostfix; + aCName.setIdentifier(rCName); + aBasicName.setIdentifier(rBasicName); + aBasicPostfix.setIdentifier(rBasicPostfix); } void SvMetaType::Load( SvPersistStream & rStm ) @@ -875,12 +875,13 @@ void SvMetaType::SetType( int nT ) nType = nT; if( nType == TYPE_ENUM ) { - aOdlName = "short"; + aOdlName.setIdentifier("short"); } else if( nType == TYPE_CLASS ) { - aCName = C_PREF; - aCName += "Object *"; + ByteString aTmp(C_PREF); + aTmp += "Object *"; + aCName.setIdentifier(aTmp); } } @@ -901,7 +902,7 @@ SvMetaType * SvMetaType::GetReturnType() const const ByteString& SvMetaType::GetBasicName() const { if( aBasicName.IsSet() || !GetRef() ) - return aBasicName; + return aBasicName.getIdentifier(); else return ((SvMetaType*)GetRef())->GetBasicName(); } @@ -988,7 +989,7 @@ int SvMetaType::GetCall1() const const ByteString & SvMetaType::GetSvName() const { if( aSvName.IsSet() || !GetRef() ) - return aSvName; + return aSvName.getIdentifier(); else return ((SvMetaType *)GetRef())->GetSvName(); } @@ -996,7 +997,7 @@ const ByteString & SvMetaType::GetSvName() const const ByteString & SvMetaType::GetSbxName() const { if( aSbxName.IsSet() || !GetRef() ) - return aSbxName; + return aSbxName.getIdentifier(); else return ((SvMetaType *)GetRef())->GetSbxName(); } @@ -1004,7 +1005,7 @@ const ByteString & SvMetaType::GetSbxName() const const ByteString & SvMetaType::GetOdlName() const { if( aOdlName.IsSet() || !GetRef() ) - return aOdlName; + return aOdlName.getIdentifier(); else return ((SvMetaType *)GetRef())->GetOdlName(); } @@ -1012,18 +1013,18 @@ const ByteString & SvMetaType::GetOdlName() const const ByteString & SvMetaType::GetCName() const { if( aCName.IsSet() || !GetRef() ) - return aCName; + return aCName.getIdentifier(); else return ((SvMetaType *)GetRef())->GetCName(); } sal_Bool SvMetaType::SetName( const ByteString & rName, SvIdlDataBase * pBase ) { - aSvName = rName; - aSbxName = rName; - aCName = rName; + aSvName.setIdentifier(rName); + aSbxName.setIdentifier(rName); + aCName.setIdentifier(rName); if( GetType() != TYPE_ENUM ) - aOdlName = rName; + aOdlName.setIdentifier(rName); return SvMetaReference::SetName( rName, pBase ); } @@ -1327,23 +1328,23 @@ void SvMetaType::WriteAttributesSvIdl( SvIdlDataBase & rBase, { SvMetaExtern::WriteAttributesSvIdl( rBase, rOutStm, nTab ); ByteString name = GetName(); - if( aSvName != name || aSbxName != name || aOdlName != name ) + if( aSvName.getIdentifier() != name || aSbxName.getIdentifier() != name || aOdlName.getIdentifier() != name ) { WriteTab( rOutStm, nTab ); rOutStm << "class SvMetaType" << endl; - if( aSvName != name ) + if( aSvName.getIdentifier() != name ) { WriteTab( rOutStm, nTab ); aSvName.WriteSvIdl( SvHash_SvName(), rOutStm, nTab ); rOutStm << endl; } - if( aSbxName != name ) + if( aSbxName.getIdentifier() != name ) { WriteTab( rOutStm, nTab ); aSbxName.WriteSvIdl( SvHash_SbxName(), rOutStm, nTab ); rOutStm << endl; } - if( aOdlName != name ) + if( aOdlName.getIdentifier() != name ) { WriteTab( rOutStm, nTab ); aOdlName.WriteSvIdl( SvHash_OdlName(), rOutStm, nTab ); @@ -2030,7 +2031,7 @@ void SvMetaAttribute::WriteCSV( SvIdlDataBase&, SvStream& rStrm ) { rStrm << GetType()->GetSvName().GetBuffer() << ' '; rStrm << GetName().GetBuffer() << ' '; - rStrm << GetSlotId().GetBuffer(); + rStrm << GetSlotId().getIdentifier().GetBuffer(); } diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx index a7df034..d3882cf 100644 --- a/idl/source/prj/database.cxx +++ b/idl/source/prj/database.cxx @@ -485,7 +485,7 @@ SvMetaAttribute * SvIdlDataBase::ReadKnownAttr for( sal_uLong i = 0; i < aAttrList.Count(); i++ ) { SvMetaAttribute * pAttr = aAttrList.GetObject( i ); - if( pAttr->GetSlotId() == pTok->GetString() ) + if( pAttr->GetSlotId().getIdentifier() == pTok->GetString() ) return pAttr; } } @@ -506,12 +506,12 @@ SvMetaAttribute* SvIdlDataBase::SearchKnownAttr ) { sal_uLong n; - if( FindId( rId, &n ) ) + if( FindId( rId.getIdentifier(), &n ) ) { for( sal_uLong i = 0; i < aAttrList.Count(); i++ ) { SvMetaAttribute * pAttr = aAttrList.GetObject( i ); - if( pAttr->GetSlotId() == rId ) + if( pAttr->GetSlotId().getIdentifier() == rId.getIdentifier() ) return pAttr; } }
_______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits