LibreOffice Gerrit News 2013-09-01
Moin! * Open changes on master for project core changed in the last 25 hours: + Performance improvements on Expert Config in https://gerrit.libreoffice.org/5714 from Efe Gürkan Yalaman + Parsing 'presobj' properties from 'objectlist.xml': gsoc-impresslayout in https://gerrit.libreoffice.org/5652 from Vishv Brahmbhatt + Normalize DISABLE_OPENSSL to USE TRUE/nothing in https://gerrit.libreoffice.org/5724 from Norbert Thiebaud + fdo#43090: Last fix for autoclose brackets in Math in https://gerrit.libreoffice.org/5722 from Marcos Souza + Remove some unused code from unusedcode.easy in https://gerrit.libreoffice.org/5721 from Marcos Souza + calc export test on cell values, strings formulas in https://gerrit.libreoffice.org/5698 from Laurent Godard + Upgrade the bundled OpenSSL to 1.0.1e in https://gerrit.libreoffice.org/5718 from Tor Lillqvist * Merged changes on master for project core changed in the last 25 hours: + fdo#62475 removed pointless comments in https://gerrit.libreoffice.org/5720 from Jelle van der Waa + Upd vlc library directory for Mac OS in https://gerrit.libreoffice.org/5719 from Minh Ngo + Cross-platform libvlc loading. in https://gerrit.libreoffice.org/5627 from Minh Ngo * Abandoned changes on master for project core changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: + Don't use osl_createSuspendedThread anymore in https://gerrit.libreoffice.org/5565 from Arnaud Versini + Positional Tab additions in https://gerrit.libreoffice.org/5387 from Adam CloudOn + Change oslThreadIdentifier to uintptr_t and use THREAD_VALUE on Unix. in https://gerrit.libreoffice.org/5553 from Arnaud Versini + fdo#64817 : fix for rectangle with image fill in https://gerrit.libreoffice.org/4718 from Adam CloudOn + fdo#66577: non-fractional widths with Core Text in https://gerrit.libreoffice.org/5023 from Khaled Hosny Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: About writeDBLoaderInfo function in dbloader.cxx (dbaccess module)
Lionel Elie Mamane wrote ... On the gripping hand, I can't find where the //Loader key is used afterwards either, so maybe my search-fu simply failed me. Or maybe the whole function is pointless. As an added bonus remark, it seems weird (but maybe innocuous) that it goes to extra pains to create //UNO/Loader and //Loader as opposed to /UNO/Loader and /Loader. And searching more, I see that this function is actually never called... It is not in any header file of the sdk (not in _any_ header actually), so it can't be part of our public API (nor of our internal API). So actually, in this case, remove the whole function. And also the function of the same name in dbaccess/source/filter/xml/dbloader2.cxx ... I thought at first sight it would be //Loader and //UNO/Loader but then I noticed line 159 aImpl += DBContentLoader::getImplementationName_Static(); So in fact, it would be: /org.openoffice.comp.dbu.DBContentLoader/Loader and /org.openoffice.comp.dbu.DBContentLoader/UNO/Loader (see http://opengrok.libreoffice.org/xref/core/dbaccess/source/ui/browser/dbloader.cxx#80) (see also http://opengrok.libreoffice.org/xref/core/dbaccess/util/dbu.component#57) About removing, I made an Opengrok search and found it was used there: dbaccess/source/ui/misc/uiservices.cxx (see http://opengrok.libreoffice.org/xref/core/dbaccess/source/ui/misc/uiservices.cxx#38) I'm not sure but if we remove the function, it means we should remove it too in uiservices.cxx and so change the interface/api, doesn't it? Julien -- View this message in context: http://nabble.documentfoundation.org/About-writeDBLoaderInfo-function-in-dbloader-cxx-dbaccess-module-tp4072511p4072526.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/svx svx/source sw/source unusedcode.easy
include/svx/nbdtmg.hxx |2 - svx/source/sidebar/nbdtmg.cxx | 45 sw/source/ui/inc/numfmtlb.hxx |4 --- sw/source/ui/utlui/numfmtlb.cxx | 16 -- unusedcode.easy |8 --- 5 files changed, 5 insertions(+), 70 deletions(-) New commits: commit 92ce8daf21f2081eca9b4f4294115b904c168a46 Author: Caolán McNamara caol...@redhat.com Date: Sun Sep 1 09:50:46 2013 +0100 callcatcher: update unused code Change-Id: I3f304f97b91b26b445174255a63e15c6668ad438 diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx index b98fa59..ef5095b 100644 --- a/include/svx/nbdtmg.hxx +++ b/include/svx/nbdtmg.hxx @@ -347,8 +347,6 @@ class SVX_DLLPUBLIC NumberingTypeMgr: public NBOTypeMgrBase virtual sal_Bool ApplyNumRule(SvxNumRule aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0x,sal_Bool isDefault=false,sal_Bool isResetSize=false); virtual String GetDescription(sal_uInt16 nIndex,sal_Bool isDefault=false); virtual sal_Bool IsCustomized(sal_uInt16 nIndex); -sal_uInt16 GetNumCount() const; -NumberSettings_Impl* GetNumSettingByIndex(sal_uInt16 nIndex) const; static NumberingTypeMgr* GetInstance() { if ( _instance == 0 ) diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx index f0d5ffe..5eacb4d 100644 --- a/svx/source/sidebar/nbdtmg.cxx +++ b/svx/source/sidebar/nbdtmg.cxx @@ -1351,34 +1351,6 @@ NumberingTypeMgr::NumberingTypeMgr(const NumberingTypeMgr aTypeMgr): //pNumSettingsArr( new NumSettingsArr_Impl ), pNumberSettingsArr (new NumberSettingsArr_Impl) { -/* -for(sal_uInt16 i=0;iaTypeMgr.GetNumCount();i++) -{ -NumberSettings_Impl* _pSet = aTypeMgr.GetNumSettingByIndex(i); -if ( _pSet ) -{ -pNumberSettingsArr-GetObject(i)-nIndex = _pSet-nIndex; -pNumberSettingsArr-GetObject(i)-nIndexDefault = _pSet-nIndexDefault; -pNumberSettingsArr-GetObject(i)-sDescription = _pSet-sDescription; -pNumberSettingsArr-GetObject(i)-bIsCustomized = _pSet-bIsCustomized; -if ( _pSet-pNumSetting ) -{ -pNumberSettingsArr-GetObject(i)-pNumSetting-nNumberType = _pSet-pNumSetting-nNumberType; - pNumberSettingsArr-GetObject(i)-pNumSetting-nParentNumbering = _pSet-pNumSetting-nParentNumbering; -pNumberSettingsArr-GetObject(i)-pNumSetting-sPrefix = _pSet-pNumSetting-sPrefix; -pNumberSettingsArr-GetObject(i)-pNumSetting-sSuffix = _pSet-pNumSetting-sSuffix; -pNumberSettingsArr-GetObject(i)-pNumSetting-sBulletChar = _pSet-pNumSetting-sBulletChar; -pNumberSettingsArr-GetObject(i)-pNumSetting-sBulletFont = _pSet-pNumSetting-sBulletFont; - - pNumberSettingsArr-GetObject(i)-pNumSetting-eLabelFollowedBy = _pSet-pNumSetting-eLabelFollowedBy; -pNumberSettingsArr-GetObject(i)-pNumSetting-nTabValue = _pSet-pNumSetting-nTabValue; -pNumberSettingsArr-GetObject(i)-pNumSetting-eNumAlign = _pSet-pNumSetting-eNumAlign; -pNumberSettingsArr-GetObject(i)-pNumSetting-nNumAlignAt = _pSet-pNumSetting-nNumAlignAt; -pNumberSettingsArr-GetObject(i)-pNumSetting-nNumIndentAt = _pSet-pNumSetting-nNumIndentAt; -} -} -} -*/ ImplLoad(OUString(standard.syb)); } @@ -1592,23 +1564,6 @@ sal_Bool NumberingTypeMgr::IsCustomized(sal_uInt16 nIndex) return bRet; } -sal_uInt16 NumberingTypeMgr::GetNumCount() const -{ -sal_uInt16 nRet = 0; -if ( pNumberSettingsArr ) -nRet = pNumberSettingsArr-size(); - -return nRet; -} -NumberSettings_Impl* NumberingTypeMgr::GetNumSettingByIndex(sal_uInt16 nIndex) const -{ -NumberSettings_Impl* pRet = 0; -if ( pNumberSettingsArr nIndex pNumberSettingsArr-size() ) -{ -pRet = (*pNumberSettingsArr)[nIndex].get(); -} -return pRet; -} /*** **Multi-level /Outline Type lib*** / diff --git a/sw/source/ui/inc/numfmtlb.hxx b/sw/source/ui/inc/numfmtlb.hxx index 2dd2de9..6ab9a77 100644 --- a/sw/source/ui/inc/numfmtlb.hxx +++ b/sw/source/ui/inc/numfmtlb.hxx @@ -47,10 +47,6 @@ class SW_DLLPUBLIC NumFormatListBox : public ListBox public: NumFormatListBox(Window* pWin, WinBits nStyle); -NumFormatListBox( Window* pWin, SwView* pView, const ResId rResId, -short nFormatType = NUMBERFORMAT_NUMBER, sal_uLong nDefFmt = 0, -sal_Bool bUsrFmts = sal_True ); - ~NumFormatListBox(); voidClear(); diff --git a/sw/source/ui/utlui/numfmtlb.cxx
Re: Thinderbox name
Hi, I just want to clarify: There is one naming system, but I would like to change it. Another possibility: OS_architecture_branch~pull time_LibreOfficeDev_version.file extension Am 31.08.2013 13:06, schrieb Florian Reisinger: Hi, Can you please stay with one naming system? Index of /daily/master/Win-x86@6-debug does it right; master~2013-08-31_04.49.46_LibreOfficeDev_4.2.0.0.alpha0_Win_x86.msi http://dev-builds.libreoffice.org/daily/master/Win-x86@6-debug/current/master%7E2013-08-31_04.49.46_LibreOfficeDev_4.2.0.0.alpha0_Win_x86.msi I really would like, to have an easier nameing sytem daily/libreoffice-4-1/Win-x86@6-debug/current/ http://dev-builds.libreoffice.org/daily/libreoffice-4-1/Win-x86@6-debug/current/ From libreoffice-4-1~2013-08-30_22.39.59_LibreOfficeDev_4.1.2.0.0_Win_x86.msi http://dev-builds.libreoffice.org/daily/libreoffice-4-1/Win-x86@6-debug/current/libreoffice-4-1%7E2013-08-30_22.39.59_LibreOfficeDev_4.1.2.0.0_Win_x86.msi Like this: LibreOfficeDev_LibOversion_branch~Pull time (or whatever the timestamp is)_OS_architecture.file extension E.g.: LibreOfficeDev_4.1.2.0.0_libreoffice-4-1~2013-08-30_22.39.59_Win_x86.msi This would easify downloads by scripts, because the filename always starts in the same way... Your input? Liebe Grüße, / Yours, Florian Reisinger -- Liebe Grüße, / Yours, Florian Reisinger ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: connectivity/source include/connectivity include/svx include/tools include/vcl oox/source sc/source sd/source svx/source tools/source unusedcode.easy vcl/source
connectivity/source/commontools/dbconversion.cxx | 38 - include/connectivity/dbconversion.hxx|6 -- include/svx/AffineMatrixItem.hxx |2 include/tools/stream.hxx |4 - include/vcl/menu.hxx |5 -- include/vcl/status.hxx |3 - oox/source/core/filterbase.cxx | 19 sc/source/filter/inc/sheetdatabuffer.hxx |1 sc/source/filter/inc/stylesbuffer.hxx|2 sc/source/filter/oox/sheetdatabuffer.cxx | 15 -- sc/source/filter/oox/stylesbuffer.cxx|8 --- sd/source/ui/framework/tools/FrameworkHelper.cxx | 27 sd/source/ui/inc/framework/FrameworkHelper.hxx | 21 - svx/source/xoutdev/xattr2.cxx|5 -- tools/source/stream/strmunx.cxx |9 unusedcode.easy | 17 --- vcl/source/window/menu.cxx | 40 -- vcl/source/window/status.cxx | 50 --- 18 files changed, 1 insertion(+), 271 deletions(-) New commits: commit 1d3483ed279982278b2f9fb1bab63485523e48c5 Author: Marcos Paulo de Souza marcos.souza@gmail.com Date: Sat Aug 31 13:10:23 2013 -0300 Remove some unused code from unusedcode.easy Change-Id: Ic3e96eebbb914c5b905a8c58532ead9cb01dd41d Reviewed-on: https://gerrit.libreoffice.org/5721 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/connectivity/source/commontools/dbconversion.cxx b/connectivity/source/commontools/dbconversion.cxx index cd2b1c3..1449b99 100644 --- a/connectivity/source/commontools/dbconversion.cxx +++ b/connectivity/source/commontools/dbconversion.cxx @@ -136,44 +136,6 @@ namespace dbtools return aReturn; } - //-- -sal_Int32 DBTypeConversion::toINT32(const utl::Date rVal) -{ -return ((sal_Int32)(rVal.Day%100)) + -(((sal_Int32)(rVal.Month%100))*100) + -(((sal_Int32) rVal.Year%1)*1); -} - - //-- -sal_Int64 DBTypeConversion::toINT64(const utl::Time rVal) -{ -// normalize time -sal_Int32 nSeconds = rVal.Seconds + rVal.NanoSeconds / nanoSecInSec; -sal_Int32 nNanoSeconds = rVal.NanoSeconds % nanoSecInSec; -sal_Int32 nMinutes = rVal.Minutes + nSeconds / secInMin; -nSeconds= nSeconds % secInMin; -sal_Int32 nHours= rVal.Hours + nMinutes / minInHour; -nMinutes= nMinutes % minInHour; - -// assemble time -return nNanoSeconds + - nSeconds * secMask + - nMinutes * minMask + - nHours * hourMask; -} - - //-- -sal_Int32 DBTypeConversion::getMsFromTime(const utl::Time rVal) -{ -sal_Int32 nHour = rVal.Hours; -sal_Int32 nMin = rVal.Minutes; -sal_Int32 nSec = rVal.Seconds; -sal_Int32 nNanoSec = rVal.NanoSeconds; - -return ((nHour*360)+(nMin*6)+(nSec*1000)+(nNanoSec/100)); -} - - //-- sal_Int64 DBTypeConversion::getNsFromTime(const utl::Time rVal) { sal_Int32 nHour = rVal.Hours; diff --git a/include/connectivity/dbconversion.hxx b/include/connectivity/dbconversion.hxx index 4bc0ed7..d579d0e 100644 --- a/include/connectivity/dbconversion.hxx +++ b/include/connectivity/dbconversion.hxx @@ -110,9 +110,6 @@ namespace dbtools static ::com::sun::star::util::DateTime toDateTime(double dVal, const ::com::sun::star::util::Date _rNullDate = getStandardDate()); static ::com::sun::star::util::DateTime toDateTime(const OUString _sSQLDate); - -// TODO: consider removing getMsFromTime -static sal_Int32 getMsFromTime(const ::com::sun::star::util::Time rVal); static sal_Int64 getNsFromTime(const ::com::sun::star::util::Time rVal); static sal_Int32 toDays(const ::com::sun::star::util::Date _rVal, const ::com::sun::star::util::Date _rNullDate = getStandardDate()); @@ -121,9 +118,6 @@ namespace dbtools static double toDouble(const ::com::sun::star::util::Time rVal); static double toDouble(const ::com::sun::star::util::DateTime rVal, const ::com::sun::star::util::Date _rNullDate = getStandardDate()); -static sal_Int32toINT32(const ::com::sun::star::util::Date rVal); -static sal_Int64toINT64(const ::com::sun::star::util::Time rVal); -
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - setup_native/source vcl/win
setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx |4 ++-- vcl/win/source/gdi/winlayout.cxx|2 +- 2 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 777a659cf8814b7022ce9e1156f3a3b9f3322978 Author: Julien Nabet serval2...@yahoo.fr Date: Sat Aug 31 21:08:42 2013 +0200 cppcheck: Array index is used before limits check Change-Id: I531430ce4bc0937a023d3e2849ae07d8f94e3e70 Reviewed-on: https://gerrit.libreoffice.org/5723 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx index a0f930a..40ed84b 100644 --- a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx +++ b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx @@ -280,7 +280,7 @@ static bool checkSomeExtensionInRegistry( const int nStart, const int nEnd ) int nIndex = nStart; bool bFound = false; -while ( !bFound ( g_Extensions[nIndex] != 0 ) ( nIndex nEnd ) ) +while ( !bFound (nIndex nEnd) (g_Extensions[nIndex] != 0) ) { bFound = ! CheckExtensionInRegistry( g_Extensions[nIndex] ); @@ -296,7 +296,7 @@ static void registerSomeExtensions( MSIHANDLE handle, const int nStart, const in { // Check all file extensions int nIndex = nStart; -while ( ( g_Extensions[nIndex] != 0 ) ( nIndex nEnd ) ) +while ( (nIndex nEnd) (g_Extensions[nIndex] != 0) ) { registerForExtension( handle, nIndex++, bRegister ); } diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx index 174539c..3113b0a 100644 --- a/vcl/win/source/gdi/winlayout.cxx +++ b/vcl/win/source/gdi/winlayout.cxx @@ -2038,7 +2038,7 @@ void UniscribeLayout::Simplify( bool /*bIsBase*/ ) int nMinGlyphPos, nEndGlyphPos, nOrigMinGlyphPos = rVI.mnMinGlyphPos; GetItemSubrange( rVI, nMinGlyphPos, nEndGlyphPos ); i = nMinGlyphPos; -while( (mpOutGlyphs[i] == cDroppedGlyph) (i nEndGlyphPos) ) +while( (i nEndGlyphPos) (mpOutGlyphs[i] == cDroppedGlyph) ) { rVI.mnMinGlyphPos = ++i; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx svx/source
include/svx/svdoole2.hxx|2 +- svx/source/form/filtnav.cxx |4 ++-- svx/source/items/numfmtsh.cxx | 10 +- svx/source/items/pageitem.cxx |6 +++--- svx/source/sdr/contact/viewcontactofgraphic.cxx |8 svx/source/svdraw/svdoole2.cxx |2 +- 6 files changed, 16 insertions(+), 16 deletions(-) New commits: commit 5042636bf462ee6839ec6ab467dfe15f775af97f Author: Caolán McNamara caol...@redhat.com Date: Sun Sep 1 10:09:54 2013 +0100 XubString-OUString Change-Id: I2067b78e10e1805bb678879e3fd54636d848b15c diff --git a/include/svx/svdoole2.hxx b/include/svx/svdoole2.hxx index 3f3b3d4..af3c0f74 100644 --- a/include/svx/svdoole2.hxx +++ b/include/svx/svdoole2.hxx @@ -83,7 +83,7 @@ public: TYPEINFO(); SdrOle2Obj(bool bFrame_ = false); -SdrOle2Obj(const svt::EmbeddedObjectRef rNewObjRef, const String rNewObjName, const Rectangle rNewRect, bool bFrame_ = false); +SdrOle2Obj(const svt::EmbeddedObjectRef rNewObjRef, const OUString rNewObjName, const Rectangle rNewRect, bool bFrame_ = false); virtual ~SdrOle2Obj(); // access to svt::EmbeddedObjectRef diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 7e9218d..1ebc6c2 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -1024,7 +1024,7 @@ void FmFilterModel::EnsureEmptyFilterRows( FmParentData _rItem ) class FmFilterItemsString : public SvLBoxString { public: -FmFilterItemsString( SvTreeListEntry* pEntry, sal_uInt16 nFlags,const XubString rStr ) +FmFilterItemsString( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const OUString rStr ) :SvLBoxString(pEntry,nFlags,rStr){} virtual void Paint(const Point rPos, SvTreeListBox rDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry); @@ -1085,7 +1085,7 @@ class FmFilterString : public SvLBoxString OUString m_aName; public: -FmFilterString( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const XubString rStr, const OUString aName) +FmFilterString( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const OUString rStr, const OUString aName) :SvLBoxString(pEntry,nFlags,rStr) ,m_aName(aName) { diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx index 7a824d2..0c7e03f 100644 --- a/svx/source/items/numfmtsh.cxx +++ b/svx/source/items/numfmtsh.cxx @@ -914,7 +914,7 @@ short SvxNumberFormatShell::FillEListWithUserCurrencys( std::vectorString* rL pTmpCurrencyEntry, bTmpBanking); -XubString rShortSymbol; +OUString rShortSymbol; if(pCurCurrencyEntry==NULL) { @@ -1559,8 +1559,8 @@ void SvxNumberFormatShell::GetCurrencySymbols(std::vectorOUString rList, bool sal_uInt16 nStart=1; -XubString aString( ApplyLreOrRleEmbedding( rCurrencyTable[0].GetSymbol())); -aString += sal_Unicode(' '); +OUString aString( ApplyLreOrRleEmbedding( rCurrencyTable[0].GetSymbol())); +aString += ; aString += ApplyLreOrRleEmbedding( pLanguageTable-GetString( rCurrencyTable[0].GetLanguage())); rList.push_back(aString); @@ -1577,11 +1577,11 @@ void SvxNumberFormatShell::GetCurrencySymbols(std::vectorOUString rList, bool CollatorWrapper aCollator( ::comphelper::getProcessComponentContext()); aCollator.loadDefaultCollator( Application::GetSettings().GetLanguageTag().getLocale(), 0); -const String aTwoSpace( RTL_CONSTASCII_USTRINGPARAM( )); +const OUString aTwoSpace( ); for(sal_uInt16 i = 1; i nCount; ++i) { -XubString aStr( ApplyLreOrRleEmbedding( rCurrencyTable[i].GetBankSymbol())); +OUString aStr( ApplyLreOrRleEmbedding( rCurrencyTable[i].GetBankSymbol())); aStr += aTwoSpace; aStr += ApplyLreOrRleEmbedding( rCurrencyTable[i].GetSymbol()); aStr += aTwoSpace; diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx index ce4a265..87d5c45 100644 --- a/svx/source/items/pageitem.cxx +++ b/svx/source/items/pageitem.cxx @@ -82,7 +82,7 @@ int SvxPageItem::operator==( const SfxPoolItem rAttr ) const eUse == rItem.eUse ); } -inline XubString GetUsageText( const sal_uInt16 eU ) +inline OUString GetUsageText( const sal_uInt16 eU ) { switch( eU 0x000f ) { @@ -90,7 +90,7 @@ inline XubString GetUsageText( const sal_uInt16 eU ) case SVX_PAGE_RIGHT : return SVX_RESSTR(RID_SVXITEMS_PAGE_USAGE_RIGHT); case SVX_PAGE_ALL : return SVX_RESSTR(RID_SVXITEMS_PAGE_USAGE_ALL); case SVX_PAGE_MIRROR: return SVX_RESSTR(RID_SVXITEMS_PAGE_USAGE_MIRROR); -default: return String(); +default: return OUString(); } } @@ -243,7 +243,7 @@ SfxPoolItem* SvxPageItem::Create( SvStream rStream, sal_uInt16 ) const
[Libreoffice-commits] core.git: 2 commits - icon-themes/crystal icon-themes/human icon-themes/industrial icon-themes/oxygen icon-themes/tango icon-themes/tango_testing sd/source
icon-themes/crystal/cmd/lc_fliphorizontal.png |binary icon-themes/crystal/cmd/lc_flipvertical.png |binary icon-themes/crystal/cmd/sc_fliphorizontal.png |binary icon-themes/crystal/cmd/sc_flipvertical.png |binary icon-themes/human/cmd/lc_fliphorizontal.png |binary icon-themes/human/cmd/lc_flipvertical.png |binary icon-themes/human/cmd/sc_fliphorizontal.png |binary icon-themes/human/cmd/sc_flipvertical.png |binary icon-themes/industrial/cmd/lc_fliphorizontal.png|binary icon-themes/industrial/cmd/lc_flipvertical.png |binary icon-themes/industrial/cmd/sc_fliphorizontal.png|binary icon-themes/industrial/cmd/sc_flipvertical.png |binary icon-themes/oxygen/cmd/lc_fliphorizontal.png|binary icon-themes/oxygen/cmd/lc_flipvertical.png |binary icon-themes/oxygen/cmd/sc_fliphorizontal.png|binary icon-themes/oxygen/cmd/sc_flipvertical.png |binary icon-themes/tango/cmd/lc_fliphorizontal.png |binary icon-themes/tango/cmd/lc_flipvertical.png |binary icon-themes/tango/cmd/sc_fliphorizontal.png |binary icon-themes/tango/cmd/sc_flipvertical.png |binary icon-themes/tango_testing/cmd/lc_fliphorizontal.png |binary icon-themes/tango_testing/cmd/lc_fliphorizontal.svg | 3308 icon-themes/tango_testing/cmd/lc_flipvertical.png |binary icon-themes/tango_testing/cmd/lc_flipvertical.svg | 3308 sd/source/ui/dlg/sdtreelb.cxx | 55 sd/source/ui/inc/sdtreelb.hxx | 15 26 files changed, 3342 insertions(+), 3344 deletions(-) New commits: commit 07aefbe310cad43bf9a71ba073486cddd7e062f2 Author: Ivan Timofeev timofeev@gmail.com Date: Sun Sep 1 10:08:38 2013 +0400 fdo#42434: swap flipvertical and fliphorizontal icons in some themes Change-Id: I484a783547c3bed1d80a0f510434b4c0fe37bed7 diff --git a/icon-themes/crystal/cmd/lc_fliphorizontal.png b/icon-themes/crystal/cmd/lc_fliphorizontal.png index 6eed975..5440863 100644 Binary files a/icon-themes/crystal/cmd/lc_fliphorizontal.png and b/icon-themes/crystal/cmd/lc_fliphorizontal.png differ diff --git a/icon-themes/crystal/cmd/lc_flipvertical.png b/icon-themes/crystal/cmd/lc_flipvertical.png index 5440863..6eed975 100644 Binary files a/icon-themes/crystal/cmd/lc_flipvertical.png and b/icon-themes/crystal/cmd/lc_flipvertical.png differ diff --git a/icon-themes/crystal/cmd/sc_fliphorizontal.png b/icon-themes/crystal/cmd/sc_fliphorizontal.png index 73f6b0e..f16cf5e 100644 Binary files a/icon-themes/crystal/cmd/sc_fliphorizontal.png and b/icon-themes/crystal/cmd/sc_fliphorizontal.png differ diff --git a/icon-themes/crystal/cmd/sc_flipvertical.png b/icon-themes/crystal/cmd/sc_flipvertical.png index f16cf5e..73f6b0e 100644 Binary files a/icon-themes/crystal/cmd/sc_flipvertical.png and b/icon-themes/crystal/cmd/sc_flipvertical.png differ diff --git a/icon-themes/human/cmd/lc_fliphorizontal.png b/icon-themes/human/cmd/lc_fliphorizontal.png index b02e1fd..116cad6 100644 Binary files a/icon-themes/human/cmd/lc_fliphorizontal.png and b/icon-themes/human/cmd/lc_fliphorizontal.png differ diff --git a/icon-themes/human/cmd/lc_flipvertical.png b/icon-themes/human/cmd/lc_flipvertical.png index 116cad6..b02e1fd 100644 Binary files a/icon-themes/human/cmd/lc_flipvertical.png and b/icon-themes/human/cmd/lc_flipvertical.png differ diff --git a/icon-themes/human/cmd/sc_fliphorizontal.png b/icon-themes/human/cmd/sc_fliphorizontal.png index 9a2994b..901b218 100644 Binary files a/icon-themes/human/cmd/sc_fliphorizontal.png and b/icon-themes/human/cmd/sc_fliphorizontal.png differ diff --git a/icon-themes/human/cmd/sc_flipvertical.png b/icon-themes/human/cmd/sc_flipvertical.png index 901b218..9a2994b 100644 Binary files a/icon-themes/human/cmd/sc_flipvertical.png and b/icon-themes/human/cmd/sc_flipvertical.png differ diff --git a/icon-themes/industrial/cmd/lc_fliphorizontal.png b/icon-themes/industrial/cmd/lc_fliphorizontal.png index ef1c256..a972d2c 100644 Binary files a/icon-themes/industrial/cmd/lc_fliphorizontal.png and b/icon-themes/industrial/cmd/lc_fliphorizontal.png differ diff --git a/icon-themes/industrial/cmd/lc_flipvertical.png b/icon-themes/industrial/cmd/lc_flipvertical.png index a972d2c..ef1c256 100644 Binary files a/icon-themes/industrial/cmd/lc_flipvertical.png and b/icon-themes/industrial/cmd/lc_flipvertical.png differ diff --git a/icon-themes/industrial/cmd/sc_fliphorizontal.png b/icon-themes/industrial/cmd/sc_fliphorizontal.png index 761d90e..1744b76 100644 Binary files a/icon-themes/industrial/cmd/sc_fliphorizontal.png and b/icon-themes/industrial/cmd/sc_fliphorizontal.png differ diff --git a/icon-themes/industrial/cmd/sc_flipvertical.png b/icon-themes/industrial/cmd/sc_flipvertical.png index 1744b76..761d90e 100644 Binary files a/icon-themes/industrial/cmd/sc_flipvertical.png and
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sw/inc sw/source
sw/inc/crstate.hxx|2 - sw/source/core/layout/trvlfrm.cxx | 45 +++--- 2 files changed, 43 insertions(+), 4 deletions(-) New commits: commit c1db93a0663e9346e165ac58ddeee018f30d35ff Author: Michael Stahl mst...@redhat.com Date: Wed Aug 28 14:16:38 2013 +0200 fdo#66215: sw: fix clicking on text above background fly SwPageFrm::GetCrsrOfst() tries to compare the distance to the closest text vs. fly but does not do it right because GetCharRect() returns just a line of width 1 on the left edge of the character; try to figure out the entire area covered by the character via 2 calls to GetCrsrOfst(), which gives much better clickability. (regression from e8fbe97900f13305b17015d9044993bde4adab36) Change-Id: I825e86daf65692dfb962ad576772c5f543d02d19 (cherry picked from commit edd2db1c783bd571ff796a5298385cacc91877b9) Reviewed-on: https://gerrit.libreoffice.org/5662 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sw/inc/crstate.hxx b/sw/inc/crstate.hxx index 6c8c86f..7bd3cb4 100644 --- a/sw/inc/crstate.hxx +++ b/sw/inc/crstate.hxx @@ -143,7 +143,7 @@ struct SwCrsrMoveState sal_Bool bRealWidth;/// Calculation of the width required sal_Bool b2Lines; /// Check 2line portions and fill p2Lines sal_Bool bNoScroll; /// No scrolling of undersized textframes -sal_Bool bPosMatchesBounds; /** GetCrsrOfst should not return the next +bool bPosMatchesBounds; /** GetCrsrOfst should not return the next position if screen position is inside second have of bound rect */ diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx index 443af12..51d3d13 100644 --- a/sw/source/core/layout/trvlfrm.cxx +++ b/sw/source/core/layout/trvlfrm.cxx @@ -19,6 +19,7 @@ #include hintids.hxx #include hints.hxx +#include comphelper/flagguard.hxx #include tools/bigint.hxx #include tools/line.hxx #include editeng/opaqitem.hxx @@ -283,10 +284,48 @@ sal_Bool SwPageFrm::GetCrsrOfst( SwPosition *pPos, Point rPoint, if ( pTextNd ) { SwCntntFrm* pTextFrm = pTextNd-getLayoutFrm( getRootFrm( ) ); -SwRect rTextRect; -pTextFrm-GetCharRect( rTextRect, aTextPos ); -nTextDistance = lcl_getDistance( rTextRect, rPoint ); +// try this again but prefer the previous position +SwCrsrMoveState aMoveState; +SwCrsrMoveState *const pState((pCMS) ? pCMS : aMoveState); +comphelper::FlagRestorationGuard g( +pState-bPosMatchesBounds, true); +SwPosition prevTextPos(*pPos); +SwLayoutFrm::GetCrsrOfst(prevTextPos, aPoint, pState); + +SwRect aTextRect; +pTextFrm-GetCharRect(aTextRect, prevTextPos); + +if (prevTextPos.nContent pTextNd-Len()) +{ +// aRextRect is just a line on the left edge of the +// previous character; to get a better measure from +// lcl_getDistance, extend that to a rectangle over +// the entire character. +SwPosition const nextTextPos(prevTextPos.nNode, +SwIndex(prevTextPos.nContent, +1)); +SwRect nextTextRect; +pTextFrm-GetCharRect(nextTextRect, nextTextPos); +SWRECTFN(pTextFrm); +if ((aTextRect.*fnRect-fnGetTop)() == +(nextTextRect.*fnRect-fnGetTop)()) // same line? +{ +// need to handle mixed RTL/LTR portions somehow +if ((aTextRect.*fnRect-fnGetLeft)() +(nextTextRect.*fnRect-fnGetLeft)()) +{ +(aTextRect.*fnRect-fnSetRight)( +(nextTextRect.*fnRect-fnGetLeft)()); +} +else // RTL +{ +(aTextRect.*fnRect-fnSetLeft)( +(nextTextRect.*fnRect-fnGetLeft)()); +} +} +} + +nTextDistance = lcl_getDistance(aTextRect, rPoint); bValidTextDistance = true; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sw/source
sw/source/ui/docvw/edtwin.cxx |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 5f387c93e42ba1028e9fc54e10cb0e8c0e1b7a75 Author: Michael Stahl mst...@redhat.com Date: Wed Aug 28 14:28:40 2013 +0200 fdo#67358: sw: fix line painting artifacts when resizing columns SwEditWin::MouseButtonDown(): for unknown reasons invalidating the window here causes the column resizing lines to not be removed after the resize is done, so disable it. (regression from 289185fd02d6d9734b6dbde01f15c4e6c5beacbb) Change-Id: If3ba0a72c53c5c2734fb905ae35d62f6a3e8938b (cherry picked from commit a2c67975c03010b90c706523293f180c1f29e229) Reviewed-on: https://gerrit.libreoffice.org/5663 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx index 37210b2..e971d1e 100644 --- a/sw/source/ui/docvw/edtwin.cxx +++ b/sw/source/ui/docvw/edtwin.cxx @@ -2749,7 +2749,9 @@ void SwEditWin::MouseButtonDown(const MouseEvent _rMEvt) rSh.SetShowHeaderFooterSeparator( Footer, false ); // Repaint everything -rSh.GetWin()-Invalidate(); +// FIXME fdo#67358 for unknown reasons this causes painting +// problems when resizing table columns, so disable it +//rSh.GetWin()-Invalidate(); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - svtools/source
svtools/source/control/ruler.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 943961d67ebc73ed6e87921f8b681bb057e8fd4c Author: Tomaž Vajngerl qui...@gmail.com Date: Fri Aug 30 19:38:53 2013 +0200 fdo#68689 Sub-divide ruler ticks into 1/8 insted of 1/10 for inch Change-Id: Ied2a6982d5564228b0ce7fecb89723f3742b6d0d Reviewed-on: https://gerrit.libreoffice.org/5726 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index 7e5e2f1..7fd44c7 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -124,7 +124,7 @@ static ImplRulerUnitData aImplRulerUnitTab[RULER_UNIT_COUNT] = { MAP_100TH_MM, 1000, 250,500, 1000,1000, 3, cm}, // CM { MAP_MM, 1000, 250,500, 1000, 1, 4, m }, // M { MAP_CM, 10, 25000, 5, 10, 10, 6, km}, // KM -{ MAP_100TH_INCH, 100,10, 50,100,2540, 3, \ }, // INCH +{ MAP_1000TH_INCH,1000, 125,500, 1000, 25400, 3, \ }, // INCH { MAP_100TH_INCH, 1200, 120,600, 1200, 30480, 3, ' }, // FOOT { MAP_10TH_INCH,633600, 63360, 316800, 633600, 1609344, 4, miles }, // MILE { MAP_POINT, 1,12, 12, 36, 353, 2, pt}, // POINT ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - icon-themes/crystal icon-themes/human icon-themes/industrial icon-themes/oxygen icon-themes/tango
icon-themes/crystal/cmd/lc_fliphorizontal.png|binary icon-themes/crystal/cmd/lc_flipvertical.png |binary icon-themes/crystal/cmd/sc_fliphorizontal.png|binary icon-themes/crystal/cmd/sc_flipvertical.png |binary icon-themes/human/cmd/lc_fliphorizontal.png |binary icon-themes/human/cmd/lc_flipvertical.png|binary icon-themes/human/cmd/sc_fliphorizontal.png |binary icon-themes/human/cmd/sc_flipvertical.png|binary icon-themes/industrial/cmd/lc_fliphorizontal.png |binary icon-themes/industrial/cmd/lc_flipvertical.png |binary icon-themes/industrial/cmd/sc_fliphorizontal.png |binary icon-themes/industrial/cmd/sc_flipvertical.png |binary icon-themes/oxygen/cmd/lc_fliphorizontal.png |binary icon-themes/oxygen/cmd/lc_flipvertical.png |binary icon-themes/oxygen/cmd/sc_fliphorizontal.png |binary icon-themes/oxygen/cmd/sc_flipvertical.png |binary icon-themes/tango/cmd/lc_fliphorizontal.png |binary icon-themes/tango/cmd/lc_flipvertical.png|binary icon-themes/tango/cmd/sc_fliphorizontal.png |binary icon-themes/tango/cmd/sc_flipvertical.png|binary 20 files changed New commits: commit 178d86a99820c5e0b9ca668c49300d468ab70e10 Author: Ivan Timofeev timofeev@gmail.com Date: Sun Sep 1 10:08:38 2013 +0400 fdo#42434: swap flipvertical and fliphorizontal icons in some themes (cherry picked from commit 07aefbe310cad43bf9a71ba073486cddd7e062f2) Conflicts: icon-themes/tango_testing/cmd/lc_fliphorizontal.png icon-themes/tango_testing/cmd/lc_fliphorizontal.svg icon-themes/tango_testing/cmd/lc_flipvertical.png Change-Id: I037b55811bf7f14a7aadcb85ae700516022896ce Reviewed-on: https://gerrit.libreoffice.org/5727 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/icon-themes/crystal/cmd/lc_fliphorizontal.png b/icon-themes/crystal/cmd/lc_fliphorizontal.png index 6eed975..5440863 100644 Binary files a/icon-themes/crystal/cmd/lc_fliphorizontal.png and b/icon-themes/crystal/cmd/lc_fliphorizontal.png differ diff --git a/icon-themes/crystal/cmd/lc_flipvertical.png b/icon-themes/crystal/cmd/lc_flipvertical.png index 5440863..6eed975 100644 Binary files a/icon-themes/crystal/cmd/lc_flipvertical.png and b/icon-themes/crystal/cmd/lc_flipvertical.png differ diff --git a/icon-themes/crystal/cmd/sc_fliphorizontal.png b/icon-themes/crystal/cmd/sc_fliphorizontal.png index 73f6b0e..f16cf5e 100644 Binary files a/icon-themes/crystal/cmd/sc_fliphorizontal.png and b/icon-themes/crystal/cmd/sc_fliphorizontal.png differ diff --git a/icon-themes/crystal/cmd/sc_flipvertical.png b/icon-themes/crystal/cmd/sc_flipvertical.png index f16cf5e..73f6b0e 100644 Binary files a/icon-themes/crystal/cmd/sc_flipvertical.png and b/icon-themes/crystal/cmd/sc_flipvertical.png differ diff --git a/icon-themes/human/cmd/lc_fliphorizontal.png b/icon-themes/human/cmd/lc_fliphorizontal.png index b02e1fd..116cad6 100644 Binary files a/icon-themes/human/cmd/lc_fliphorizontal.png and b/icon-themes/human/cmd/lc_fliphorizontal.png differ diff --git a/icon-themes/human/cmd/lc_flipvertical.png b/icon-themes/human/cmd/lc_flipvertical.png index 116cad6..b02e1fd 100644 Binary files a/icon-themes/human/cmd/lc_flipvertical.png and b/icon-themes/human/cmd/lc_flipvertical.png differ diff --git a/icon-themes/human/cmd/sc_fliphorizontal.png b/icon-themes/human/cmd/sc_fliphorizontal.png index 9a2994b..901b218 100644 Binary files a/icon-themes/human/cmd/sc_fliphorizontal.png and b/icon-themes/human/cmd/sc_fliphorizontal.png differ diff --git a/icon-themes/human/cmd/sc_flipvertical.png b/icon-themes/human/cmd/sc_flipvertical.png index 901b218..9a2994b 100644 Binary files a/icon-themes/human/cmd/sc_flipvertical.png and b/icon-themes/human/cmd/sc_flipvertical.png differ diff --git a/icon-themes/industrial/cmd/lc_fliphorizontal.png b/icon-themes/industrial/cmd/lc_fliphorizontal.png index ef1c256..a972d2c 100644 Binary files a/icon-themes/industrial/cmd/lc_fliphorizontal.png and b/icon-themes/industrial/cmd/lc_fliphorizontal.png differ diff --git a/icon-themes/industrial/cmd/lc_flipvertical.png b/icon-themes/industrial/cmd/lc_flipvertical.png index a972d2c..ef1c256 100644 Binary files a/icon-themes/industrial/cmd/lc_flipvertical.png and b/icon-themes/industrial/cmd/lc_flipvertical.png differ diff --git a/icon-themes/industrial/cmd/sc_fliphorizontal.png b/icon-themes/industrial/cmd/sc_fliphorizontal.png index 761d90e..1744b76 100644 Binary files a/icon-themes/industrial/cmd/sc_fliphorizontal.png and b/icon-themes/industrial/cmd/sc_fliphorizontal.png differ diff --git a/icon-themes/industrial/cmd/sc_flipvertical.png b/icon-themes/industrial/cmd/sc_flipvertical.png index 1744b76..761d90e 100644 Binary files a/icon-themes/industrial/cmd/sc_flipvertical.png and b/icon-themes/industrial/cmd/sc_flipvertical.png differ diff --git
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - icon-themes/crystal icon-themes/human icon-themes/industrial icon-themes/oxygen icon-themes/tango icon-themes/tango_testing
icon-themes/crystal/cmd/lc_fliphorizontal.png |binary icon-themes/crystal/cmd/lc_flipvertical.png |binary icon-themes/crystal/cmd/sc_fliphorizontal.png |binary icon-themes/crystal/cmd/sc_flipvertical.png |binary icon-themes/human/cmd/lc_fliphorizontal.png |binary icon-themes/human/cmd/lc_flipvertical.png |binary icon-themes/human/cmd/sc_fliphorizontal.png |binary icon-themes/human/cmd/sc_flipvertical.png |binary icon-themes/industrial/cmd/lc_fliphorizontal.png|binary icon-themes/industrial/cmd/lc_flipvertical.png |binary icon-themes/industrial/cmd/sc_fliphorizontal.png|binary icon-themes/industrial/cmd/sc_flipvertical.png |binary icon-themes/oxygen/cmd/lc_fliphorizontal.png|binary icon-themes/oxygen/cmd/lc_flipvertical.png |binary icon-themes/oxygen/cmd/sc_fliphorizontal.png|binary icon-themes/oxygen/cmd/sc_flipvertical.png |binary icon-themes/tango/cmd/lc_fliphorizontal.png |binary icon-themes/tango/cmd/lc_flipvertical.png |binary icon-themes/tango/cmd/sc_fliphorizontal.png |binary icon-themes/tango/cmd/sc_flipvertical.png |binary icon-themes/tango_testing/cmd/lc_fliphorizontal.png |binary icon-themes/tango_testing/cmd/lc_fliphorizontal.svg | 3308 icon-themes/tango_testing/cmd/lc_flipvertical.png |binary icon-themes/tango_testing/cmd/lc_flipvertical.svg | 3308 24 files changed, 3308 insertions(+), 3308 deletions(-) New commits: commit 3cbe753186c9c0ea437a9bcc6dc64c63082ba37b Author: Ivan Timofeev timofeev@gmail.com Date: Sun Sep 1 10:08:38 2013 +0400 fdo#42434: swap flipvertical and fliphorizontal icons in some themes Change-Id: I484a783547c3bed1d80a0f510434b4c0fe37bed7 (cherry picked from commit 07aefbe310cad43bf9a71ba073486cddd7e062f2) Reviewed-on: https://gerrit.libreoffice.org/5725 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/icon-themes/crystal/cmd/lc_fliphorizontal.png b/icon-themes/crystal/cmd/lc_fliphorizontal.png index 6eed975..5440863 100644 Binary files a/icon-themes/crystal/cmd/lc_fliphorizontal.png and b/icon-themes/crystal/cmd/lc_fliphorizontal.png differ diff --git a/icon-themes/crystal/cmd/lc_flipvertical.png b/icon-themes/crystal/cmd/lc_flipvertical.png index 5440863..6eed975 100644 Binary files a/icon-themes/crystal/cmd/lc_flipvertical.png and b/icon-themes/crystal/cmd/lc_flipvertical.png differ diff --git a/icon-themes/crystal/cmd/sc_fliphorizontal.png b/icon-themes/crystal/cmd/sc_fliphorizontal.png index 73f6b0e..f16cf5e 100644 Binary files a/icon-themes/crystal/cmd/sc_fliphorizontal.png and b/icon-themes/crystal/cmd/sc_fliphorizontal.png differ diff --git a/icon-themes/crystal/cmd/sc_flipvertical.png b/icon-themes/crystal/cmd/sc_flipvertical.png index f16cf5e..73f6b0e 100644 Binary files a/icon-themes/crystal/cmd/sc_flipvertical.png and b/icon-themes/crystal/cmd/sc_flipvertical.png differ diff --git a/icon-themes/human/cmd/lc_fliphorizontal.png b/icon-themes/human/cmd/lc_fliphorizontal.png index b02e1fd..116cad6 100644 Binary files a/icon-themes/human/cmd/lc_fliphorizontal.png and b/icon-themes/human/cmd/lc_fliphorizontal.png differ diff --git a/icon-themes/human/cmd/lc_flipvertical.png b/icon-themes/human/cmd/lc_flipvertical.png index 116cad6..b02e1fd 100644 Binary files a/icon-themes/human/cmd/lc_flipvertical.png and b/icon-themes/human/cmd/lc_flipvertical.png differ diff --git a/icon-themes/human/cmd/sc_fliphorizontal.png b/icon-themes/human/cmd/sc_fliphorizontal.png index 9a2994b..901b218 100644 Binary files a/icon-themes/human/cmd/sc_fliphorizontal.png and b/icon-themes/human/cmd/sc_fliphorizontal.png differ diff --git a/icon-themes/human/cmd/sc_flipvertical.png b/icon-themes/human/cmd/sc_flipvertical.png index 901b218..9a2994b 100644 Binary files a/icon-themes/human/cmd/sc_flipvertical.png and b/icon-themes/human/cmd/sc_flipvertical.png differ diff --git a/icon-themes/industrial/cmd/lc_fliphorizontal.png b/icon-themes/industrial/cmd/lc_fliphorizontal.png index ef1c256..a972d2c 100644 Binary files a/icon-themes/industrial/cmd/lc_fliphorizontal.png and b/icon-themes/industrial/cmd/lc_fliphorizontal.png differ diff --git a/icon-themes/industrial/cmd/lc_flipvertical.png b/icon-themes/industrial/cmd/lc_flipvertical.png index a972d2c..ef1c256 100644 Binary files a/icon-themes/industrial/cmd/lc_flipvertical.png and b/icon-themes/industrial/cmd/lc_flipvertical.png differ diff --git a/icon-themes/industrial/cmd/sc_fliphorizontal.png b/icon-themes/industrial/cmd/sc_fliphorizontal.png index 761d90e..1744b76 100644 Binary files a/icon-themes/industrial/cmd/sc_fliphorizontal.png and b/icon-themes/industrial/cmd/sc_fliphorizontal.png differ diff --git a/icon-themes/industrial/cmd/sc_flipvertical.png b/icon-themes/industrial/cmd/sc_flipvertical.png
[Libreoffice-commits] core.git: sw/source sw/uiconfig sw/UIConfig_swriter.mk
sw/UIConfig_swriter.mk |1 sw/source/ui/docvw/SidebarTxtControl.cxx |4 ++- sw/source/ui/docvw/docvw.hrc |2 - sw/source/ui/docvw/docvw.src |5 --- sw/source/ui/docvw/edtwin.cxx|9 --- sw/uiconfig/swriter/ui/inforeadonlydialog.ui | 34 +++ 6 files changed, 44 insertions(+), 11 deletions(-) New commits: commit 7a64fe91db5fb231b3d980fb5d41fcdc87f86794 Author: Caolán McNamara caol...@redhat.com Date: Sun Sep 1 10:42:47 2013 +0100 convert readonly info to .ui Change-Id: Ib0c7f47ceae35e7255f6ed6fbbcc12e59e0bd956 Reviewed-on: https://gerrit.libreoffice.org/5728 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk index 5f73cd9..4d22eea 100644 --- a/sw/UIConfig_swriter.mk +++ b/sw/UIConfig_swriter.mk @@ -112,6 +112,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\ sw/uiconfig/swriter/ui/indexentry \ sw/uiconfig/swriter/ui/inputfielddialog \ sw/uiconfig/swriter/ui/indentpage \ + sw/uiconfig/swriter/ui/inforeadonlydialog \ sw/uiconfig/swriter/ui/insertautotextdialog \ sw/uiconfig/swriter/ui/insertbookmark \ sw/uiconfig/swriter/ui/insertbreak \ diff --git a/sw/source/ui/docvw/SidebarTxtControl.cxx b/sw/source/ui/docvw/SidebarTxtControl.cxx index efa8fb8..4db10d0 100644 --- a/sw/source/ui/docvw/SidebarTxtControl.cxx +++ b/sw/source/ui/docvw/SidebarTxtControl.cxx @@ -36,6 +36,7 @@ #include vcl/svapp.hxx #include vcl/help.hxx +#include vcl/layout.hxx #include vcl/msgbox.hxx #include vcl/gradient.hxx #include vcl/scrbar.hxx @@ -203,7 +204,8 @@ void SidebarTxtControl::KeyInput( const KeyEvent rKeyEvt ) } else { -InfoBox( this, SW_RES( MSG_READONLY_CONTENT )).Execute(); +MessageDialog(this, InfoReadonlyDialog, +modules/swriter/ui/inforeadonlydialog.ui).Execute(); } } if (bDone) diff --git a/sw/source/ui/docvw/docvw.hrc b/sw/source/ui/docvw/docvw.hrc index fd6cd8e..7f5e5b6 100644 --- a/sw/source/ui/docvw/docvw.hrc +++ b/sw/source/ui/docvw/docvw.hrc @@ -79,8 +79,6 @@ #define STR_DELETE_FOOTER (RC_DOCVW_BEGIN + 26) #define STR_FORMAT_FOOTER (RC_DOCVW_BEGIN + 27) -#define MSG_READONLY_CONTENT(RC_DOCVW_BEGIN + 1) - #define DOCVW_ACT_END STR_SMARTTAG_CLICK #if DOCVW_ACT_END RC_DOCVW_END diff --git a/sw/source/ui/docvw/docvw.src b/sw/source/ui/docvw/docvw.src index 130750e..0451ad1 100644 --- a/sw/source/ui/docvw/docvw.src +++ b/sw/source/ui/docvw/docvw.src @@ -248,11 +248,6 @@ String STR_FTNNOTE Text [ en-US ] = Footnote: ; }; -InfoBox MSG_READONLY_CONTENT -{ -Message [ en-US ] = Readonly content cannot be changed.\nNo modifications will be accepted; -}; - String STR_TABLE_COL_ADJUST { Text [ en-US ] = Adjust table column ; diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx index 3321d28..a49e789 100644 --- a/sw/source/ui/docvw/edtwin.cxx +++ b/sw/source/ui/docvw/edtwin.cxx @@ -1832,7 +1832,8 @@ KEYINPUT_CHECKTABLE_INSDEL: } else { -InfoBox( this, SW_RES( MSG_READONLY_CONTENT )).Execute(); +MessageDialog(this, InfoReadonlyDialog, + modules/swriter/ui/inforeadonlydialog.ui).Execute(); eKeyState = KS_End; } break; @@ -1992,7 +1993,8 @@ KEYINPUT_CHECKTABLE_INSDEL: } else { -InfoBox( this, SW_RES( MSG_READONLY_CONTENT )).Execute(); +MessageDialog(this, InfoReadonlyDialog, + modules/swriter/ui/inforeadonlydialog.ui).Execute(); eKeyState = KS_End; } break; @@ -2397,7 +2399,8 @@ KEYINPUT_CHECKTABLE_INSDEL: } else { -InfoBox( this, SW_RES( MSG_READONLY_CONTENT )).Execute(); +MessageDialog(this, InfoReadonlyDialog, +modules/swriter/ui/inforeadonlydialog.ui).Execute(); eKeyState = KS_End; } break; diff --git a/sw/uiconfig/swriter/ui/inforeadonlydialog.ui b/sw/uiconfig/swriter/ui/inforeadonlydialog.ui new file mode 100644 index 000..d96c668 --- /dev/null +++ b/sw/uiconfig/swriter/ui/inforeadonlydialog.ui @@ -0,0 +1,34 @@ +?xml version=1.0 encoding=UTF-8? +interface + !-- interface-requires gtk+ 3.0 -- + object class=GtkMessageDialog id=InfoReadonlyDialog +property name=can_focusFalse/property +property name=border_width12/property +property
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/ooxmlexport/data/a4andborders.docx |binary sw/qa/extras/ooxmlexport/ooxmlexport.cxx| 14 ++ 2 files changed, 14 insertions(+) New commits: commit 91455ec39fef5b16fc6873a51d3963941a952347 Author: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com Date: Wed Aug 28 15:30:27 2013 +0200 docx export: add unit test for page size with page borders Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Change-Id: I999fa2893fc404f90136b2a2e79aefa93f177896 Reviewed-on: https://gerrit.libreoffice.org/5665 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sw/qa/extras/ooxmlexport/data/a4andborders.docx b/sw/qa/extras/ooxmlexport/data/a4andborders.docx new file mode 100755 index 000..afeb91c Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/a4andborders.docx differ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index b9c5ba7..1445ccc 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -114,6 +114,7 @@ public: void testTransparentShadow(); void testBnc834035(); void testFdo68418(); +void testA4AndBorders(); CPPUNIT_TEST_SUITE(Test); #if !defined(MACOSX) !defined(WNT) @@ -204,6 +205,7 @@ void Test::run() {transparent-shadow.docx, Test::testTransparentShadow}, {bnc834035.odt, Test::testBnc834035}, {fdo68418.docx, Test::testFdo68418}, +{a4andborders.docx, Test::testA4AndBorders}, }; // Don't test the first import of these, for some reason those tests fail const char* aBlacklist[] = { @@ -1250,6 +1252,18 @@ void Test::testFdo68418() CPPUNIT_ASSERT_EQUAL(OUString(), xFooterParagraph-getString()); // I get an error that it expects '' } +void Test::testA4AndBorders() +{ +/* + * The problem was that in case of a document with borders, the pgSz attribute + * was exported as a child of pgBorders, thus being ignored on reload. + * We assert dimension against A4 size in mm (to avoid minor rounding errors) + */ +uno::Referencebeans::XPropertySet xPageStyle(getStyles(PageStyles)-getByName(DEFAULT_STYLE), uno::UNO_QUERY); +CPPUNIT_ASSERT_EQUAL_MESSAGE(Incorrect Page Width (mm), sal_Int32(210), getPropertysal_Int32(xPageStyle, Width) / 100); +CPPUNIT_ASSERT_EQUAL_MESSAGE(Incorrect Page Height (mm), sal_Int32(297), getPropertysal_Int32(xPageStyle, Height) / 100); +} + CPPUNIT_TEST_SUITE_REGISTRATION(Test); CPPUNIT_PLUGIN_IMPLEMENT(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Update not working as expected?
Hi all Just checked for updates under Windows XP x86 with LibreOffice 4.1.0.1 and got LibreOffice 4.1 is up to date. Not only 4.1.0.1 wasn't the last RC in the 4.1.0 release but 4.1.1 (aka rc2) was officially released. Is this (another) XP issue or is there some problem with version checking? Cheers, Pedro -- View this message in context: http://nabble.documentfoundation.org/Update-not-working-as-expected-tp4072550.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Update not working as expected?
Hi Pedro, I've just read about this comment: https://bugs.freedesktop.org/show_bug.cgi?id=67556#c2 In brief, 4.1 will be proposed via update checking when 4.1.3 or 4.1.4 will be released (see release plan here: https://wiki.documentfoundation.org/ReleasePlan#4.1_release) Julien -- View this message in context: http://nabble.documentfoundation.org/Update-not-working-as-expected-tp4072550p4072554.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Update not working as expected?
Hi Julien julien2412 wrote I've just read about this comment: https://bugs.freedesktop.org/show_bug.cgi?id=67556#c2 In brief, 4.1 will be proposed via update checking when 4.1.3 or 4.1.4 will be released (see release plan here: https://wiki.documentfoundation.org/ReleasePlan#4.1_release) That is news to me. What the ESC said a few days ago was + upgrade 3.6 users to 4.0.5 once that is out (Cloph) [ update switched on 3.6 - 4.0.5 and 4.1 - 4.1.0, in a few days update to 4.1.1 - waiting on feedback. Makes sense - have some slow mirrors (Thorsten) ] http://nabble.documentfoundation.org/minutes-of-ESC-call-td4072185.html Which makes sense for 4.1.1 which was officially released 2 days ago but 4.1.0 final was released in July 25th... Pedro -- View this message in context: http://nabble.documentfoundation.org/Update-not-working-as-expected-tp4072550p4072555.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/docxattributeoutput.cxx | 32 --- sw/source/filter/ww8/wrtw8sty.cxx|3 -- 2 files changed, 16 insertions(+), 19 deletions(-) New commits: commit 35657f636580227e364ccf089ef434d3dbeee6ba Author: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com Date: Wed Aug 28 15:28:38 2013 +0200 docx export: simplify pgBorders handling, and fix pgSz bug If a document had page borders, pgSz was wrongly exported as a child of pgBorders. Change-Id: Ibd47d3efd387f942274c0162fd0cbc46662348d5 Reviewed-on: https://gerrit.libreoffice.org/5664 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 2cf7058..342bd75 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -3230,10 +3230,22 @@ void DocxAttributeOutput::SectionPageBorders( const SwFrmFmt* pFmt, const SwFrmF FSNS( XML_w, XML_offsetFrom ), bExportDistanceFromPageEdge ? page : text, FSEND ); -m_pSerializer-mark(); +OutputBorderOptions aOutputBorderOptions = lcl_getBoxBorderOptions(); + +// Check if the distance is larger than 31 points +aOutputBorderOptions.bCheckDistanceSize = true; + +// Check if there is a shadow item +const SfxPoolItem* pItem = GetExport().HasItem( RES_SHADOW ); +if ( pItem ) +{ +const SvxShadowItem* pShadowItem = (const SvxShadowItem*)pItem; +aOutputBorderOptions.aShadowLocation = pShadowItem-GetLocation(); +} + +impl_borders( m_pSerializer, rBox, aOutputBorderOptions, m_pageMargins ); m_pSerializer-endElementNS( XML_w, XML_pgBorders ); -m_pSerializer-mark(); } } @@ -5177,21 +5189,7 @@ void DocxAttributeOutput::FormatBox( const SvxBoxItem rBox ) aOutputBorderOptions.aShadowLocation = pShadowItem-GetLocation(); } - -if ( m_bOpenedSectPr GetWritingHeaderFooter() == false) -{ -// Inside a section - -// Check if the distance is larger than 31 points -aOutputBorderOptions.bCheckDistanceSize = true; - -impl_borders( m_pSerializer, rBox, aOutputBorderOptions, m_pageMargins ); - -// Special handling for pgBorder -m_pSerializer-mergeTopMarks( sax_fastparser::MERGE_MARKS_PREPEND ); -m_pSerializer-mergeTopMarks( ); -} -else +if ( !m_bOpenedSectPr || GetWritingHeaderFooter()) { // Not inside a section diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index 9f29d91..573e98a 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -1664,8 +1664,6 @@ void MSWordExportBase::SectionProperties( const WW8_SepInfo rSepInfo, WW8_PdAtt const SfxItemSet* pOldI = pISet; -AttrOutput().SectionPageBorders( pPdFmt, pPdFirstPgFmt ); - const SfxPoolItem* pItem; if ( titlePage SFX_ITEM_SET == pPdFirstPgFmt-GetItemState( RES_PAPER_BIN, true, pItem ) ) @@ -1700,6 +1698,7 @@ void MSWordExportBase::SectionProperties( const WW8_SepInfo rSepInfo, WW8_PdAtt pISet = pPdFmt-GetAttrSet(); AttrOutput().OutputStyleItemSet( pPdFmt-GetAttrSet(), true, false ); +AttrOutput().SectionPageBorders( pPdFmt, pPdFirstPgFmt ); pISet = pOldI; // then the rest of the settings from PageDesc ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/AllLangResTarget_chartcontroller.mk chart2/source chart2/uiconfig chart2/UIConfig_chart2.mk extras/source
chart2/AllLangResTarget_chartcontroller.mk|1 chart2/UIConfig_chart2.mk |1 chart2/source/controller/dialogs/TextDirectionListBox.cxx | 21 + chart2/source/controller/dialogs/tp_TitleRotation.cxx | 47 +-- chart2/source/controller/dialogs/tp_TitleRotation.hxx | 16 - chart2/source/controller/dialogs/tp_TitleRotation.src | 87 -- chart2/source/controller/inc/HelpIds.hrc |3 chart2/source/controller/inc/TextDirectionListBox.hxx |2 chart2/uiconfig/ui/titlerotationtabpage.ui| 188 ++ extras/source/glade/libreoffice-catalog.xml.in|5 10 files changed, 246 insertions(+), 125 deletions(-) New commits: commit 0e2ef09316246c10140b1b25036f5c44dfc432ba Author: Manal Alhassoun malhass...@kacst.edu.sa Date: Sun Sep 1 15:28:18 2013 +0300 titlerotationtabpage.ui widgets Change-Id: I187ec2b6bbee10820fcea5b770972fc63b2f7117 Reviewed-on: https://gerrit.libreoffice.org/5729 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/chart2/AllLangResTarget_chartcontroller.mk b/chart2/AllLangResTarget_chartcontroller.mk index ce4309f..3c0cde9 100644 --- a/chart2/AllLangResTarget_chartcontroller.mk +++ b/chart2/AllLangResTarget_chartcontroller.mk @@ -60,7 +60,6 @@ $(eval $(call gb_SrsTarget_add_files,chart2/res,\ chart2/source/controller/dialogs/tp_PolarOptions.src \ chart2/source/controller/dialogs/tp_RangeChooser.src \ chart2/source/controller/dialogs/tp_Scale.src \ -chart2/source/controller/dialogs/tp_TitleRotation.src \ chart2/source/controller/dialogs/tp_Trendline.src \ chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src \ )) diff --git a/chart2/UIConfig_chart2.mk b/chart2/UIConfig_chart2.mk index 1ad18c7..ea08c58 100644 --- a/chart2/UIConfig_chart2.mk +++ b/chart2/UIConfig_chart2.mk @@ -35,6 +35,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/schart,\ chart2/uiconfig/ui/insertgriddlg \ chart2/uiconfig/ui/smoothlinesdlg \ chart2/uiconfig/ui/steppedlinesdlg \ + chart2/uiconfig/ui/titlerotationtabpage \ chart2/uiconfig/ui/tp_SeriesToAxis \ )) diff --git a/chart2/source/controller/dialogs/TextDirectionListBox.cxx b/chart2/source/controller/dialogs/TextDirectionListBox.cxx index af699e4..25efde3 100644 --- a/chart2/source/controller/dialogs/TextDirectionListBox.cxx +++ b/chart2/source/controller/dialogs/TextDirectionListBox.cxx @@ -22,6 +22,7 @@ #include Strings.hrc #include svl/languageoptions.hxx #include vcl/window.hxx +#include vcl/builder.hxx namespace chart { @@ -41,6 +42,26 @@ TextDirectionListBox::TextDirectionListBox( Window* pParent, const ResId rResId } } +TextDirectionListBox::TextDirectionListBox( Window* pParent, Window* pWindow1, Window* pWindow2 ) : +svx::FrameDirectionListBox( pParent, WB_BORDER | WB_TABSTOP | WB_DROPDOWN) +{ +InsertEntryValue( SCH_RESSTR( STR_TEXT_DIRECTION_LTR ), FRMDIR_HORI_LEFT_TOP ); +InsertEntryValue( SCH_RESSTR( STR_TEXT_DIRECTION_RTL ), FRMDIR_HORI_RIGHT_TOP ); +InsertEntryValue( SCH_RESSTR( STR_TEXT_DIRECTION_SUPER ), FRMDIR_ENVIRONMENT ); + +if( !SvtLanguageOptions().IsCTLFontEnabled() ) +{ +Hide(); +if( pWindow1 ) pWindow1-Hide(); +if( pWindow2 ) pWindow2-Hide(); +} +} + +extern C SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeTextDirectionListBox(Window *pParent, VclBuilder::stringmap ) + { + return new TextDirectionListBox(pParent); + } + TextDirectionListBox::~TextDirectionListBox() { } diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx b/chart2/source/controller/dialogs/tp_TitleRotation.cxx index 225398a..e79b3b3 100644 --- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx +++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx @@ -34,34 +34,31 @@ namespace chart SchAlignmentTabPage::SchAlignmentTabPage(Window* pWindow, const SfxItemSet rInAttrs, bool bWithRotation) : -SfxTabPage(pWindow, SchResId(TP_ALIGNMENT), rInAttrs), -aFlAlign( this, SchResId( FL_ALIGN ) ), -aCtrlDial ( this, SchResId( CTR_DIAL ) ), -aFtRotate ( this, SchResId( FT_DEGREES ) ), -aNfRotate ( this, SchResId( NF_ORIENT ) ), -aCbStacked ( this, SchResId( BTN_TXTSTACKED ) ), -aOrientHlp ( aCtrlDial, aNfRotate, aCbStacked ), -aFtTextDirection( this, SchResId( FT_TEXTDIR ) ), -aLbTextDirection( this, SchResId( LB_TEXTDIR ), aFtTextDirection ) +SfxTabPage(pWindow, TitleRotationTabPage,modules/schart/ui/titlerotationtabpage.ui, rInAttrs) { -FreeResource(); - -aCbStacked.EnableTriState( sal_False ); -aOrientHlp.AddDependentWindow( aFtRotate, STATE_CHECK ); +get(m_pCtrlDial,dialCtrl); +get(m_pFtRotate,degreeL); +
[Libreoffice-commits] core.git: sw/source
sw/source/core/inc/noteurl.hxx | 12 ++-- sw/source/core/text/noteurl.cxx |2 +- 2 files changed, 7 insertions(+), 7 deletions(-) New commits: commit 2f9fca080d8f558681da4c0730b274968afab1a8 Author: Caolán McNamara caol...@redhat.com Date: Sun Sep 1 14:49:02 2013 +0100 XubString-OUString Change-Id: Ib14fef2055d90b2427c41865b0ad42d5f7b81d6a diff --git a/sw/source/core/inc/noteurl.hxx b/sw/source/core/inc/noteurl.hxx index 8c73f6d..4c6f26c 100644 --- a/sw/source/core/inc/noteurl.hxx +++ b/sw/source/core/inc/noteurl.hxx @@ -30,15 +30,15 @@ class MapMode; class SwURLNote { -String aURL; -String aTarget; +OUString aURL; +OUString aTarget; SwRect aRect; public: -SwURLNote( const String rURL, const String rTarget, const SwRect rRect ) +SwURLNote( const OUString rURL, const OUString rTarget, const SwRect rRect ) : aURL( rURL ), aTarget( rTarget ), aRect( rRect ) {} -const String GetURL() const { return aURL; } -const String GetTarget() const { return aTarget; } +const OUString GetURL() const { return aURL; } +const OUString GetTarget() const { return aTarget; } const SwRect GetRect() const { return aRect; } sal_Bool operator==( const SwURLNote rSwURLNote ) const { return aRect == rSwURLNote.aRect; } @@ -52,7 +52,7 @@ class SwNoteURL public: SwNoteURL() {} sal_uInt16 Count() const { return aList.size(); } -void InsertURLNote( const String rURL, const String rTarget, +void InsertURLNote( const OUString rURL, const OUString rTarget, const SwRect rRect ); const SwURLNote GetURLNote( sal_uInt16 nPos ) const { return aList[ nPos ]; } diff --git a/sw/source/core/text/noteurl.cxx b/sw/source/core/text/noteurl.cxx index f70bcf0..fa42983 100644 --- a/sw/source/core/text/noteurl.cxx +++ b/sw/source/core/text/noteurl.cxx @@ -29,7 +29,7 @@ SwNoteURL *pNoteURL = NULL; -void SwNoteURL::InsertURLNote( const XubString rURL, const XubString rTarget, +void SwNoteURL::InsertURLNote( const OUString rURL, const OUString rTarget, const SwRect rRect ) { MSHORT i; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |5 - source/text/schart/01/05020201.xhp | 16 2 files changed, 8 insertions(+), 13 deletions(-) New commits: commit be97fb306d6baefa28ee840b0907142ed72af3e5 Author: Caolán McNamara caol...@redhat.com Date: Sun Sep 1 15:15:44 2013 +0100 update help ids for chart title alignment page .ui conversion Change-Id: I566bc7ceab187c130a9ec00aea310a18f6d268e8 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 91fcff1..def7b61 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -3045,10 +3045,6 @@ HID_RPT_START_TITLE,64516, HID_RPT_VERT_SCROLLBAR,64459, HID_RUBY_DIALOG,34187, HID_SCDLG_CONFLICTS,59023, -HID_SCH_ALIGNMENT,63284, -HID_SCH_ALIGNMENT_CTR_DIAL,63315, -HID_SCH_ALIGNMENT_DEGREES,63317, -HID_SCH_ALIGNMENT_STACKED,63316, HID_SCH_CHART_AUTO_FORMAT,63324, HID_SCH_CTL_DATA,63290, HID_SCH_CTL_TYPE,63293, @@ -3112,7 +3108,6 @@ HID_SCH_TBI_DATA_SWAP_ROW,63308, HID_SCH_TBX_DATA,63314, HID_SCH_TEXTDIRECTION,63395, HID_SCH_TEXTDIRECTION_EQUATION,63397, -HID_SCH_TEXTDIRECTION_TITLE,63396, HID_SCH_TITLE_MAIN,63360, HID_SCH_TITLE_SECONDARY_X,63372, HID_SCH_TITLE_SECONDARY_Y,63373, diff --git a/source/text/schart/01/05020201.xhp b/source/text/schart/01/05020201.xhp index 87e5f20..3eb3849 100644 --- a/source/text/schart/01/05020201.xhp +++ b/source/text/schart/01/05020201.xhp @@ -28,6 +28,7 @@ /meta body section id=ausrichtung +bookmark xml-lang=en-US branch=modules/schart/ui/titlerotationtabpage/TitleRotationTabPage id=bm_id8467056 localize=false/ paragraph role=heading id=hd_id3149656 xml-lang=en-US level=1 l10n=U oldref=1link href=text/schart/01/05020201.xhp name=AlignmentAlignment/link/paragraphcommentnew name: Label/comment paragraph role=paragraph id=par_id3156422 xml-lang=en-US l10n=U oldref=2Modifies the alignment of axes or title labels./paragraph /section @@ -35,7 +36,6 @@ section id=howtoget embed href=text/schart/00/0004.xhp#frttyab/ /section -!-- removed HID SCH:CHECKBOX:TP_AXIS_LABEL:CB_AXIS_LABEL_SCHOW_DESCR -- bookmark xml-lang=en-US branch=hid/chart2:CheckBox:TP_AXIS_LABEL:CB_AXIS_LABEL_SCHOW_DESCR id=bm_id8467055 localize=false/ paragraph role=heading id=hd_id3145750 xml-lang=en-US level=2 l10n=U oldref=71Show labels/paragraph paragraph role=paragraph id=par_id3154319 xml-lang=en-US l10n=U oldref=72ahelp hid=SCH:CHECKBOX:TP_AXIS_LABEL:CB_AXIS_LABEL_SCHOW_DESCRSpecifies whether to show or hide the axis labels./ahelp/paragraph @@ -46,16 +46,16 @@ section id=schreibr paragraph role=heading id=hd_id3150717 xml-lang=en-US level=2 l10n=U oldref=4Rotate text/paragraph paragraph role=paragraph id=par_id3154510 xml-lang=en-US l10n=U oldref=5ahelp hid=.uno:ToggleAxisDescrDefines the text direction of cell contents./ahelp Click one of the ABCD buttons to assign the required direction./paragraph -bookmark xml-lang=en-US branch=hid/CHART2_HID_SCH_ALIGNMENT_CTR_DIAL id=bm_id3145642 localize=false/ +bookmark xml-lang=en-US branch=modules/schart/ui/titlerotationtabpage/dialCtrl id=bm_id3145642 localize=false/ paragraph role=heading id=hd_id3150327 xml-lang=en-US level=3 l10n=U oldref=50ABCD wheel/paragraph -paragraph role=paragraph id=par_id3149018 xml-lang=en-US l10n=U oldref=49ahelp hid=HID_SCH_ALIGNMENT_CTR_DIALClicking anywhere on the wheel defines the variable text orientation./ahelp The letters ABCD on the button correspond to the new setting./paragraph -bookmark xml-lang=en-US branch=hid/CHART2_HID_SCH_ALIGNMENT_STACKED id=bm_id3149255 localize=false/ +paragraph role=paragraph id=par_id3149018 xml-lang=en-US l10n=U oldref=49ahelp hid=modules/schart/ui/titlerotationtabpage/dialCtrlClicking anywhere on the wheel defines the variable text orientation./ahelp The letters ABCD on the button correspond to the new setting./paragraph +bookmark xml-lang=en-US branch=hid/modules/schart/ui/titlerotationtabpage/stackedCB id=bm_id3149255 localize=false/ paragraph role=heading id=hd_id3154254 xml-lang=en-US level=3 l10n=U oldref=51ABCD button/paragraph -paragraph role=paragraph id=par_id3154702 xml-lang=en-US l10n=U oldref=52ahelp hid=HID_SCH_ALIGNMENT_STACKEDAssigns vertical text orientation for cell contents./ahelp/paragraph +paragraph role=paragraph id=par_id3154702 xml-lang=en-US l10n=U oldref=52ahelp hid=modules/schart/ui/titlerotationtabpage/stackedCBAssigns vertical text orientation for cell contents./ahelp/paragraph paragraph role=note id=par_id3150342 xml-lang=en-US l10n=U oldref=53If you define a vertical x-axis label, the text may be cut off by the line of the x-axis./paragraph -bookmark xml-lang=en-US branch=hid/CHART2_HID_SCH_ALIGNMENT_DEGREES id=bm_id3150371 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/schart/ui/titlerotationtabpage/OrientDegree id=bm_id3150371 localize=false/ paragraph role=heading id=hd_id3166432 xml-lang=en-US level=3 l10n=U oldref=54Degrees/paragraph -paragraph role=paragraph id=par_id3150199
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit abe2173ac5a89dd43b648b6dcb93c5ae1f1e8836 Author: Caolán McNamara caol...@redhat.com Date: Sun Sep 1 15:15:44 2013 +0100 Updated core Project: help be97fb306d6baefa28ee840b0907142ed72af3e5 diff --git a/helpcontent2 b/helpcontent2 index 1c370d2..be97fb3 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 1c370d227679f86ad3830d3952f879588c1bf7ac +Subproject commit be97fb306d6baefa28ee840b0907142ed72af3e5 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8par.cxx | 29 + sw/source/filter/ww8/ww8par.hxx |4 ++-- 2 files changed, 19 insertions(+), 14 deletions(-) New commits: commit ade517fd88b743d30a82788a91a027ee9e885ec9 Author: Matteo Casalin matteo.casa...@yahoo.com Date: Mon Aug 26 21:44:59 2013 +0200 String to OUString Change-Id: I0285d1ad9edaf07be869c5e8325ed693beaee5f2 Reviewed-on: https://gerrit.libreoffice.org/5730 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 4cb36f6..729ad84 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -24,6 +24,8 @@ #include unotools/ucbstreamhelper.hxx #include rtl/random.h +#include rtl/ustring.hxx +#include rtl/ustrbuf.hxx #include sfx2/docinf.hxx #include sfx2/request.hxx @@ -1797,13 +1799,13 @@ long SwWW8ImplReader::Read_And(WW8PLCFManResult* pRes) if( !pSD ) return 0; -String sAuthor; -String sInitials; -String sName; +OUString sAuthor; +OUString sInitials; +OUString sName; if( bVer67 ) { const WW67_ATRD* pDescri = (const WW67_ATRD*)pSD-GetData(); -const String* pA = GetAnnotationAuthor(SVBT16ToShort(pDescri-ibst)); +const OUString* pA = GetAnnotationAuthor(SVBT16ToShort(pDescri-ibst)); if (pA) sAuthor = *pA; else @@ -1815,12 +1817,15 @@ long SwWW8ImplReader::Read_And(WW8PLCFManResult* pRes) const WW8_ATRD* pDescri = (const WW8_ATRD*)pSD-GetData(); { -sal_uInt16 nLen = SVBT16ToShort(pDescri-xstUsrInitl[0]); +const sal_uInt16 nLen = SVBT16ToShort(pDescri-xstUsrInitl[0]); +OUStringBuffer aBuf; +aBuf.setLength(nLen); for(sal_uInt16 nIdx = 1; nIdx = nLen; ++nIdx) -sInitials += SVBT16ToShort(pDescri-xstUsrInitl[nIdx]); +aBuf[nIdx-1] = SVBT16ToShort(pDescri-xstUsrInitl[nIdx]); +sInitials = aBuf.makeStringAndClear(); } -if (const String* pA = GetAnnotationAuthor(SVBT16ToShort(pDescri-ibst))) +if (const OUString* pA = GetAnnotationAuthor(SVBT16ToShort(pDescri-ibst))) sAuthor = *pA; else sAuthor = sInitials; @@ -5497,12 +5502,12 @@ void SwWW8ImplReader::SetOutLineStyles() } } -const String* SwWW8ImplReader::GetAnnotationAuthor(sal_uInt16 nIdx) +const OUString* SwWW8ImplReader::GetAnnotationAuthor(sal_uInt16 nIdx) { if (!mpAtnNames pWwFib-lcbGrpStAtnOwners) { // Determine authors: can be found in the TableStream -mpAtnNames = new ::std::vectorString; +mpAtnNames = new ::std::vectorOUString; SvStream rStrm = *pTableStream; long nOldPos = rStrm.Tell(); @@ -5515,19 +5520,19 @@ const String* SwWW8ImplReader::GetAnnotationAuthor(sal_uInt16 nIdx) { mpAtnNames-push_back(read_uInt8_PascalString(rStrm, RTL_TEXTENCODING_MS_1252)); -nRead += mpAtnNames-rbegin()-Len() + 1; // Length + sal_uInt8 count +nRead += mpAtnNames-rbegin()-getLength() + 1; // Length + sal_uInt8 count } else { mpAtnNames-push_back(read_uInt16_PascalString(rStrm)); // Unicode: double the length + sal_uInt16 count -nRead += mpAtnNames-rbegin()-Len() * 2 + 2; +nRead += (mpAtnNames-rbegin()-getLength() + 1)*2; } } rStrm.Seek( nOldPos ); } -const String *pRet = 0; +const OUString *pRet = 0; if (mpAtnNames nIdx mpAtnNames-size()) pRet = ((*mpAtnNames)[nIdx]); return pRet; diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index c700971..4613727 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -1164,7 +1164,7 @@ private: SwMSDffManager* pMSDffManager; -std::vectorString* mpAtnNames; +std::vectorOUString* mpAtnNames; boost::shared_ptr std::mapsal_uInt32, int mpAtnIndexes; boost::shared_ptrWW8PLCFspecial mpAtnStarts; boost::shared_ptrWW8PLCFspecial mpAtnEnds; @@ -1553,7 +1553,7 @@ private: // spaeter zu ersetzen durch Aufruf in entsprechend erweiterten SvxMSDffManager -const String* GetAnnotationAuthor(sal_uInt16 nIdx); +const OUString* GetAnnotationAuthor(sal_uInt16 nIdx); int GetAnnotationIndex(sal_uInt32 nTag); WW8_CP GetAnnotationStart(int nIndex); WW8_CP GetAnnotationEnd(int nIndex); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Unable to build master with Visual Studio Express since last weekend
There were two more places I had to add conditions before I could finish the build. Sent in my changes for review. I hope that they are correct, at least they build and pass make check. https://gerrit.libreoffice.org/#/c/5740 Hmm... I accidentally made it dependent on an earlier patch, is there a way to remove that dependency somehow? The patches are completely unrelated. Thanks, Niklas Johansson Michael Stahl skrev 2013-08-29 22:41: On 29/08/13 13:07, Niklas Johansson wrote: This week I started to get this error: /cygdrive/c/sources/libo-core/embeddedobj/Library_emboleobj.mk:11: *** Library emboleobj must be registered in Repository.mk. Stop. make: *** [build] Error 2 while trying to build master with Visual Studio Express. This is my autogen.input: --with-external-tar=/cygdrive/c/sources/lo-externalsrc --with-junit=/cygdrive/c/sources/junit-4.10.jar --with-ant-home=/cygdrive/c/sources/apache-ant-1.9.2 --enable-pch --disable-ccache --disable-activex --disable-atl --enable-debug Sorry for not being able to fix this myself. I tried to pull and make clean few times during this week, just in case someone already fixed the problem, but without any luck. it's caused by --disable-atl, should be fixed now on master with commit 9d7c5dcf448fed668cc772d3cffa31712b1834a3 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
FW: Smart-Art in Writer - Correct 'Import' approach ?
Anyone ? any thoughts on the correct approach to take ? I haven't received any feedback about the main question … :\ *Adam Fyne* *Office:* +972-77-517-5008 Twitter http://www.twitter.com/cloudoninc | LinkedInhttp://www.linkedin.com/company/cloudon | Facebook http://www.facebook.com/cloudoninc | Bloghttp://www.cloudon.com/ *From:* Adam Fyne [mailto:adam.f...@cloudon.com] *Sent:* Tuesday, August 27, 2013 3:54 PM *To:* 'libreoffice@lists.freedesktop.org' *Cc:* Tsahi Glik (tsahi.g...@cloudon.com) *Subject:* Smart-Art in Writer - Correct 'Import' approach ? Hi Community, We are doing some work on implementing 'Smart-Art *Preservation*' in Writer. Meaning – if the user doesWordèLOèWordround-trip we plan that they won't lose their Smart-Art object. Currently Smart-Art is being imported into *simple shapes* in Writer (which don't exactly look the same), and most of the actual data and binding between shapes is lost (not to mention it doesn't look the same). In order to preserve the original Smart-Art object – we would plan on loading the entire XML nodes and attributes of Smart-Art to property maps (e.g. Miklos's great 'InteropGrabBag'). In addition, instead of showing to the user simple shapes (that he can currently edit and move around) – we would like to change this and show the user a *locked* bitmap of the smart-art, that the user cannot manipulate (so that he can at least preserve the original Smart-Art). Is the approach we are taking good (changing the current malfunctioning behavior that converts Smart-Art to shapes). Should we take a different approach that maybe pops a message when loading a DOCX with Smart-Art asking the user: *We noticed you are importing a DOCX with Smart-Art. Would you like to preserve it and keep it un-editable or convert it to simple shapes ?* And then act according to the user's choice? (choosing simple shapes will lose the 'Smart-Art' functionality, while choosing 'preserve' will not let the user edit the smart-art, only see it). Best, *Adam Fyne* *Office:* +972-77-517-5008 Twitter http://www.twitter.com/cloudoninc | LinkedInhttp://www.linkedin.com/company/cloudon | Facebook http://www.facebook.com/cloudoninc | Bloghttp://www.cloudon.com/ ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8par5.cxx | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) New commits: commit 82db0be16028b5ca6c0e1fa976074750a3b8fc3f Author: Matteo Casalin matteo.casa...@yahoo.com Date: Tue Aug 27 00:52:38 2013 +0200 EqualsIgnoreCaseAscii(char, 1, 0) in SwWW8ImplReader? Probably a typo for EqualsIgnoreCaseAscii(char, 0, 1). Standalone fix before String to OUString conversion. Change-Id: Id549f1fd1d45c45c458fbebda05146cc9ce36383 Reviewed-on: https://gerrit.libreoffice.org/5731 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index a7ef736..288d97a 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -2302,7 +2302,7 @@ eF_ResT SwWW8ImplReader::Read_F_Macro( WW8FieldDesc*, String rStr) aVText += aReadParam.GetResult(); if (bNewVText) { -bBracket = aVText.EqualsIgnoreCaseAscii(OUString('['), 1, 0) +bBracket = aVText.EqualsIgnoreCaseAscii(OUString('['), 0, 1) ? true : false; bNewVText = false; } @@ -2616,7 +2616,7 @@ void SwWW8ImplReader::Read_SubF_Combined( WW8ReadFieldParams rReadParam) case 'A': { String sTemp = rReadParam.GetResult(); -if ( !sTemp.EqualsIgnoreCaseAscii(d, 1, 0) ) +if ( !sTemp.EqualsIgnoreCaseAscii(d, 0, 1) ) { break; } @@ -2624,7 +2624,7 @@ void SwWW8ImplReader::Read_SubF_Combined( WW8ReadFieldParams rReadParam) } case -2: { -if ( rReadParam.GetResult().EqualsIgnoreCaseAscii('(', 1, 0) ) +if ( rReadParam.GetResult().EqualsIgnoreCaseAscii('(', 0, 1) ) { for (int i=0;i2;i++) { @@ -2634,8 +2634,8 @@ void SwWW8ImplReader::Read_SubF_Combined( WW8ReadFieldParams rReadParam) if (-2 != rReadParam.SkipToNextToken()) break; String sF = rReadParam.GetResult(); -if ((('u' == cChar) sF.EqualsIgnoreCaseAscii('p', 1, 0)) -|| (('d' == cChar) sF.EqualsIgnoreCaseAscii('o', 1, 0))) +if ((('u' == cChar) sF.EqualsIgnoreCaseAscii('p', 0, 1)) +|| (('d' == cChar) sF.EqualsIgnoreCaseAscii('o', 0, 1))) { if (-2 == rReadParam.SkipToNextToken()) { @@ -2740,7 +2740,7 @@ void SwWW8ImplReader::Read_SubF_Ruby( WW8ReadFieldParams rReadParam) if ('u' == nRet) { if (-2 == rReadParam.SkipToNextToken() - (rReadParam.GetResult().EqualsIgnoreCaseAscii(OUString('p'), 1, 0))) + (rReadParam.GetResult().EqualsIgnoreCaseAscii(OUString('p'), 0, 1))) { if (-2 == rReadParam.SkipToNextToken()) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8par5.cxx | 327 +-- 1 file changed, 148 insertions(+), 179 deletions(-) New commits: commit 5114a1ecfad8e78dad8f4acec96a6ca1e6a6e047 Author: Matteo Casalin matteo.casa...@yahoo.com Date: Fri Aug 30 00:00:27 2013 +0200 String to OUString, xub_StrLen to sal_Int32 Change-Id: I3e21da63ce60b518681e1479d72d60d94c8b586e Reviewed-on: https://gerrit.libreoffice.org/5732 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index 288d97a..b88cddd 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -98,38 +98,44 @@ using namespace nsSwDocInfoSubType; class WW8ReadFieldParams { private: -String aData; -xub_StrLen nLen, nFnd, nNext, nSavPtr; +OUString aData; +sal_Int32 nLen; +sal_Int32 nFnd; +sal_Int32 nNext; +sal_Int32 nSavPtr; public: -WW8ReadFieldParams( const String rData ); +WW8ReadFieldParams( const OUString rData ); ~WW8ReadFieldParams(); -xub_StrLen GoToTokenParam(); -long SkipToNextToken(); -xub_StrLen GetTokenSttPtr() const { return nFnd; } +sal_Int32 GoToTokenParam(); +sal_Int32 SkipToNextToken(); +sal_Int32 GetTokenSttPtr() const { return nFnd; } -xub_StrLen FindNextStringPiece( xub_StrLen _nStart = STRING_NOTFOUND ); -bool GetTokenSttFromTo(xub_StrLen* _pFrom, xub_StrLen* _pTo, -xub_StrLen _nMax); +sal_Int32 FindNextStringPiece( sal_Int32 _nStart = -1 ); +bool GetTokenSttFromTo(sal_Int32* _pFrom, sal_Int32* _pTo, sal_Int32 _nMax); -String GetResult() const; +OUString GetResult() const; }; -WW8ReadFieldParams::WW8ReadFieldParams( const String _rData ) -: aData( _rData ), nLen( _rData.Len() ), nNext( 0 ) +WW8ReadFieldParams::WW8ReadFieldParams( const OUString _rData ) +: aData( _rData ) +, nLen( _rData.getLength() ) +, nFnd( 0 ) +, nNext( 0 ) +, nSavPtr( 0 ) { /* erstmal nach einer oeffnenden Klammer oder einer Leerstelle oder einem Anfuehrungszeichen oder einem Backslash suchen, damit der Feldbefehl (also INCLUDEPICTURE bzw EINFUeGENGRAFIK bzw ...) ueberlesen wird */ -while( (nLen nNext) (aData.GetChar( nNext ) == ' ') ) +while ( nNextnLen aData[nNext]==' ' ) ++nNext; sal_Unicode c; while( nLen nNext - (c = aData.GetChar( nNext )) != ' ' + (c = aData[nNext]) != ' ' c != '' c != '\\' c != 132 @@ -147,55 +153,45 @@ WW8ReadFieldParams::~WW8ReadFieldParams() } -String WW8ReadFieldParams::GetResult() const +OUString WW8ReadFieldParams::GetResult() const { -return(STRING_NOTFOUND == nFnd) -? aEmptyStr -: aData.Copy( nFnd, (nSavPtr - nFnd) ); +return nFnd0 nSavPtrnFnd ? OUString() : aData.copy( nFnd, nSavPtr-nFnd ); } -xub_StrLen WW8ReadFieldParams::GoToTokenParam() +sal_Int32 WW8ReadFieldParams::GoToTokenParam() { -xub_StrLen nOld = nNext; +const sal_Int32 nOld = nNext; if( -2 == SkipToNextToken() ) return GetTokenSttPtr(); nNext = nOld; -return STRING_NOTFOUND; +return -1; } // ret: -2: NOT a '\' parameter but normal Text -long WW8ReadFieldParams::SkipToNextToken() +sal_Int32 WW8ReadFieldParams::SkipToNextToken() { -long nRet = -1; // Ende -if ( - (STRING_NOTFOUND != nNext) (nLen nNext) - STRING_NOTFOUND != (nFnd = FindNextStringPiece(nNext)) - ) +if ( nNext0 || nNext=nLen ) +return -1; + +nFnd = FindNextStringPiece(nNext); +if ( nFnd0 ) +return -1; + +nSavPtr = nNext; + +if ( aData[nFnd]=='\\' nFnd+1nLen aData[nFnd+1]!='\\' ) { -nSavPtr = nNext; +const sal_Int32 nRet = aData[++nFnd]; +nNext = ++nFnd; // und dahinter setzen +return nRet; +} -if ('\\' == aData.GetChar(nFnd) '\\' != aData.GetChar(nFnd + 1)) -{ -nRet = aData.GetChar(++nFnd); -nNext = ++nFnd; // und dahinter setzen -} -else -{ -nRet = -2; -if ( - (STRING_NOTFOUND != nSavPtr ) - ( - ('' == aData.GetChar(nSavPtr - 1)) || - (0x201d == aData.GetChar(nSavPtr - 1)) - ) - ) -{ ---nSavPtr; -} -} +if ( nSavPtr0 (aData[nSavPtr-1]=='' || aData[nSavPtr-1]==0x201d ) ) +{ +--nSavPtr; } -return nRet; +return -2; } // FindNextPara sucht naechsten Backslash-Parameter oder naechste Zeichenkette @@ -207,48 +203,48 @@ long WW8ReadFieldParams::SkipToNextToken() // Returnwert: 0 falls String-Ende erreicht, // ansonsten Anfang des Paramters
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8par5.cxx |3 --- 1 file changed, 3 deletions(-) New commits: commit 858592ad16815e338ec6f68109b6d636ba9baf67 Author: Matteo Casalin matteo.casa...@yahoo.com Date: Fri Aug 30 00:04:41 2013 +0200 Remove unused #include Change-Id: I233fd84b96c038e0e462c568c0cd76e5dd466e72 Reviewed-on: https://gerrit.libreoffice.org/5733 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index b88cddd..42bb38e 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -18,9 +18,6 @@ */ -#include ctype.h // tolower -#include stdio.h // sscanf() - #include sal/types.h #include tools/solar.h #include comphelper/processfactory.hxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8par5.cxx | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) New commits: commit 520130dbdb79ec3c5d617e4c798fab791d7e0af3 Author: Matteo Casalin matteo.casa...@yahoo.com Date: Fri Aug 30 00:45:32 2013 +0200 Remove unneeded member data Change-Id: Ifc8cd48b9cfdd7d1fcd0ed9472b7080ba8ff6c6c Reviewed-on: https://gerrit.libreoffice.org/5734 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index 42bb38e..59aa231 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -95,8 +95,7 @@ using namespace nsSwDocInfoSubType; class WW8ReadFieldParams { private: -OUString aData; -sal_Int32 nLen; +const OUString aData; sal_Int32 nFnd; sal_Int32 nNext; sal_Int32 nSavPtr; @@ -117,7 +116,6 @@ public: WW8ReadFieldParams::WW8ReadFieldParams( const OUString _rData ) : aData( _rData ) -, nLen( _rData.getLength() ) , nFnd( 0 ) , nNext( 0 ) , nSavPtr( 0 ) @@ -127,6 +125,8 @@ WW8ReadFieldParams::WW8ReadFieldParams( const OUString _rData ) Anfuehrungszeichen oder einem Backslash suchen, damit der Feldbefehl (also INCLUDEPICTURE bzw EINFUeGENGRAFIK bzw ...) ueberlesen wird */ +const sal_Int32 nLen = aData.getLength(); + while ( nNextnLen aData[nNext]==' ' ) ++nNext; @@ -168,7 +168,7 @@ sal_Int32 WW8ReadFieldParams::GoToTokenParam() // ret: -2: NOT a '\' parameter but normal Text sal_Int32 WW8ReadFieldParams::SkipToNextToken() { -if ( nNext0 || nNext=nLen ) +if ( nNext0 || nNext=aData.getLength() ) return -1; nFnd = FindNextStringPiece(nNext); @@ -177,7 +177,7 @@ sal_Int32 WW8ReadFieldParams::SkipToNextToken() nSavPtr = nNext; -if ( aData[nFnd]=='\\' nFnd+1nLen aData[nFnd+1]!='\\' ) +if ( aData[nFnd]=='\\' nFnd+1aData.getLength() aData[nFnd+1]!='\\' ) { const sal_Int32 nRet = aData[++nFnd]; nNext = ++nFnd; // und dahinter setzen @@ -202,6 +202,7 @@ sal_Int32 WW8ReadFieldParams::SkipToNextToken() // sal_Int32 WW8ReadFieldParams::FindNextStringPiece(const sal_Int32 nStart) { +const sal_Int32 nLen = aData.getLength(); sal_Int32 n = nStart0 ? nFnd : nStart; // Anfang sal_Int32 n2; // Ende ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8par5.cxx | 32 1 file changed, 16 insertions(+), 16 deletions(-) New commits: commit 1339e2081013b6f2419dcc21f488e049b3d58269 Author: Matteo Casalin matteo.casa...@yahoo.com Date: Fri Aug 30 00:54:37 2013 +0200 This member function can return just a bool Change-Id: Iba6661eca670c83d27630c1918f4b5421bbbf08f Reviewed-on: https://gerrit.libreoffice.org/5735 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index 59aa231..977aea2 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -103,7 +103,7 @@ public: WW8ReadFieldParams( const OUString rData ); ~WW8ReadFieldParams(); -sal_Int32 GoToTokenParam(); +bool GoToTokenParam(); sal_Int32 SkipToNextToken(); sal_Int32 GetTokenSttPtr() const { return nFnd; } @@ -156,13 +156,13 @@ OUString WW8ReadFieldParams::GetResult() const } -sal_Int32 WW8ReadFieldParams::GoToTokenParam() +bool WW8ReadFieldParams::GoToTokenParam() { const sal_Int32 nOld = nNext; if( -2 == SkipToNextToken() ) -return GetTokenSttPtr(); +return GetTokenSttPtr()=0; nNext = nOld; -return -1; +return false; } // ret: -2: NOT a '\' parameter but normal Text @@ -270,7 +270,7 @@ bool WW8ReadFieldParams::GetTokenSttFromTo(sal_Int32* pFrom, sal_Int32* pTo, sal { sal_Int32 nStart = 0; sal_Int32 nEnd = 0; -if ( GoToTokenParam()=0 ) +if ( GoToTokenParam() ) { const OUString sParams( GetResult() ); @@ -1276,7 +1276,7 @@ eF_ResT SwWW8ImplReader::Read_F_Input( WW8FieldDesc* pF, String rStr ) break; case 'd': case 'D': -if ( aReadParam.GoToTokenParam()=0 ) +if ( aReadParam.GoToTokenParam() ) aDef = aReadParam.GetResult(); break; } @@ -1462,7 +1462,7 @@ eF_ResT SwWW8ImplReader::Read_F_InputVar( WW8FieldDesc* pF, String rStr ) break; case 'd': case 'D': -if ( aReadParam.GoToTokenParam()=0 ) +if ( aReadParam.GoToTokenParam() ) aDef = aReadParam.GetResult(); break; } @@ -1966,12 +1966,12 @@ eF_ResT SwWW8ImplReader::Read_F_Symbol( WW8FieldDesc*, String rStr ) break; case 'f': case 'F': -if ( aReadParam.GoToTokenParam()=0 ) +if ( aReadParam.GoToTokenParam() ) aName = aReadParam.GetResult(); break; case 's': case 'S': -if ( aReadParam.GoToTokenParam()=0 ) +if ( aReadParam.GoToTokenParam() ) { const OUString aSiz = aReadParam.GetResult(); if ( !aSiz.isEmpty() ) @@ -2852,7 +2852,7 @@ static void lcl_toxMatchACSwitch( SwWW8ImplReader /*rReader*/, WW8ReadFieldParams rParam, SwCaptionDisplay eCaptionType) { -if ( rParam.GoToTokenParam()=0 ) +if ( rParam.GoToTokenParam() ) { SwTOXType* pType = (SwTOXType*)rDoc.GetTOXType( TOX_ILLUSTRATIONS, 0); rBase.RegisterToTOXType( *pType ); @@ -2920,7 +2920,7 @@ static void EnsureMaxLevelForTemplates(SwTOXBase rBase) static void lcl_toxMatchTSwitch(SwWW8ImplReader rReader, SwTOXBase rBase, WW8ReadFieldParams rParam) { -if ( rParam.GoToTokenParam()=0 ) +if ( rParam.GoToTokenParam() ) { String sParams( rParam.GetResult() ); if( sParams.Len() ) @@ -3073,7 +3073,7 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, String rStr ) switch( nRet ) { case 'c': -if ( aReadParam.GoToTokenParam()=0 ) +if ( aReadParam.GoToTokenParam() ) { const OUString sParams( aReadParam.GetResult() ); // if NO String just ignore the \c @@ -3085,7 +3085,7 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, String rStr ) break; case 'e': { -if ( aReadParam.GoToTokenParam()=0 ) // if NO String just ignore the \e +if ( aReadParam.GoToTokenParam() ) // if NO String just ignore the \e { String sDelimiter( aReadParam.GetResult() ); SwForm aForm( pBase-GetTOXForm() ); @@ -3209,7 +3209,7 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, String rStr ) break; case 'p': { -if ( aReadParam.GoToTokenParam()=0 ) // if NO String just ignore the \p +if ( aReadParam.GoToTokenParam() ) // if NO String
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8par5.cxx | 154 +-- 1 file changed, 101 insertions(+), 53 deletions(-) New commits: commit 3e885e2e6c7438af0d3f706614aaa7c46412ff97 Author: Matteo Casalin matteo.casa...@yahoo.com Date: Fri Aug 30 01:12:05 2013 +0200 Rework some loops Change-Id: I756ebba899838caa2193bad4f9e4e6df841f15d1 Reviewed-on: https://gerrit.libreoffice.org/5736 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index 977aea2..ea6cd21 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -130,14 +130,13 @@ WW8ReadFieldParams::WW8ReadFieldParams( const OUString _rData ) while ( nNextnLen aData[nNext]==' ' ) ++nNext; -sal_Unicode c; -while( nLen nNext - (c = aData[nNext]) != ' ' - c != '' - c != '\\' - c != 132 - c != 0x201c ) +while ( nNextnLen ) +{ +const sal_Unicode c = aData[nNext]; +if ( c==' ' || c=='' || c=='\\' || c==132 || c==0x201c ) +break; ++nNext; +} nFnd = nNext; nSavPtr = nNext; @@ -1264,10 +1263,12 @@ eF_ResT SwWW8ImplReader::Read_F_Input( WW8FieldDesc* pF, String rStr ) { String aDef; String aQ; -sal_Int32 nRet; WW8ReadFieldParams aReadParam( rStr ); -while( -1 != ( nRet = aReadParam.SkipToNextToken() )) +for (;;) { +const sal_Int32 nRet = aReadParam.SkipToNextToken(); +if ( nRet==-1 ) +break; switch( nRet ) { case -2: @@ -1448,10 +1449,12 @@ eF_ResT SwWW8ImplReader::Read_F_InputVar( WW8FieldDesc* pF, String rStr ) String sOrigName; String aQ; String aDef; -sal_Int32 nRet; WW8ReadFieldParams aReadParam( rStr ); -while( -1 != ( nRet = aReadParam.SkipToNextToken() )) +for (;;) { +const sal_Int32 nRet = aReadParam.SkipToNextToken(); +if ( nRet==-1 ) +break; switch( nRet ) { case -2: @@ -1521,10 +1524,12 @@ eF_ResT SwWW8ImplReader::Read_F_Seq( WW8FieldDesc*, String rStr ) bool bCountOn = true; String sStart; SvxExtNumType eNumFormat = SVX_NUM_ARABIC; -sal_Int32 nRet; WW8ReadFieldParams aReadParam( rStr ); -while( -1 != ( nRet = aReadParam.SkipToNextToken() )) +for (;;) { +const sal_Int32 nRet = aReadParam.SkipToNextToken(); +if ( nRet==-1 ) +break; switch( nRet ) { case -2: @@ -1597,9 +1602,11 @@ eF_ResT SwWW8ImplReader::Read_F_DocInfo( WW8FieldDesc* pF, String rStr ) { String aDocProperty; WW8ReadFieldParams aReadParam( rStr ); -sal_Int32 nRet; -while( -1 != ( nRet = aReadParam.SkipToNextToken() )) +for (;;) { +const sal_Int32 nRet = aReadParam.SkipToNextToken(); +if ( nRet==-1 ) +break; switch( nRet ) { case -2: @@ -1785,9 +1792,11 @@ eF_ResT SwWW8ImplReader::Read_F_DocInfo( WW8FieldDesc* pF, String rStr ) if ( 64 == pF-nId ) { WW8ReadFieldParams aReadParam( rStr ); -sal_Int32 nRet; -while( -1 != ( nRet = aReadParam.SkipToNextToken() )) +for (;;) { +const sal_Int32 nRet = aReadParam.SkipToNextToken(); +if ( nRet==-1) +break; switch( nRet ) { case -2: @@ -1838,9 +1847,11 @@ eF_ResT SwWW8ImplReader::Read_F_DateTime( WW8FieldDesc*pF, String rStr ) { bool bHijri = false; WW8ReadFieldParams aReadParam(rStr); -sal_Int32 nTok; -while (-1 != (nTok = aReadParam.SkipToNextToken())) +for (;;) { +const sal_Int32 nTok = aReadParam.SkipToNextToken(); +if ( nTok==-1 ) +break; switch (nTok) { default: @@ -1898,10 +1909,12 @@ eF_ResT SwWW8ImplReader::Read_F_DateTime( WW8FieldDesc*pF, String rStr ) eF_ResT SwWW8ImplReader::Read_F_FileName(WW8FieldDesc*, String rStr) { SwFileNameFormat eType = FF_NAME; -sal_Int32 nRet; WW8ReadFieldParams aReadParam(rStr); -while (-1 != (nRet = aReadParam.SkipToNextToken())) +for (;;) { +const sal_Int32 nRet = aReadParam.SkipToNextToken(); +if ( nRet==-1 ) +break; switch (nRet) { case 'p': @@ -1954,10 +1967,12 @@ eF_ResT SwWW8ImplReader::Read_F_Symbol( WW8FieldDesc*, String rStr ) String aQ; String aName; sal_Int32 nSize = 0; -sal_Int32 nRet; WW8ReadFieldParams aReadParam( rStr ); -while( -1 != ( nRet = aReadParam.SkipToNextToken() )) +for (;;) { +const sal_Int32 nRet = aReadParam.SkipToNextToken(); +if ( nRet==-1 ) +
[Libreoffice-commits] core.git: 3 commits - officecfg/registry sd/source
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 16 -- sd/source/ui/dlg/tpaction.cxx | 56 +- sd/source/ui/inc/tpaction.hxx |6 - 3 files changed, 31 insertions(+), 47 deletions(-) New commits: commit a3411f532c40b4326d5ee2e1d2fe23fea457e0a6 Author: Ivan Timofeev timofeev@gmail.com Date: Sun Sep 1 16:38:29 2013 +0400 String-OUString Change-Id: I4d822fdb3dfb1e07d2c0e0352809f9d51bf9dfc4 diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index 53e5b1a..225d01c 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -71,7 +71,7 @@ using namespace ::com::sun::star; using namespace com::sun::star::uno; using namespace com::sun::star::lang; -#define DOCUMENT_TOKEN (sal_Unicode('#')) +#define DOCUMENT_TOKEN '#' /** * Constructor of the Tab dialog: appends the pages to the dialog @@ -91,8 +91,8 @@ SdActionDlg::SdActionDlg ( SetTabPage( pNewPage ); -String aStr( pNewPage-GetText() ); -if( aStr.Len() ) +OUString aStr( pNewPage-GetText() ); +if( !aStr.isEmpty() ) SetText( aStr ); } @@ -238,7 +238,7 @@ void SdTPAction::Construct() embed::VerbDescriptor aVerb = aVerbs[i]; if( aVerb.VerbAttributes embed::VerbAttributes::MS_VERBATTR_ONCONTAINERMENU ) { -String aTmp( aVerb.VerbName ); +OUString aTmp( aVerb.VerbName ); aVerbVector.push_back( aVerb.VerbID ); aLbOLEAction.InsertEntry( MnemonicGenerator::EraseAllMnemonicChars( aTmp ) ); } @@ -287,14 +287,14 @@ sal_Bool SdTPAction::FillItemSet( SfxItemSet rAttrs ) else rAttrs.InvalidateItem( ATTR_ACTION ); -String aFileName = GetEditText( sal_True ); -if( aFileName.Len() == 0 ) +OUString aFileName = GetEditText( sal_True ); +if( aFileName.isEmpty() ) rAttrs.InvalidateItem( ATTR_ACTION_FILENAME ); else { if( mpDoc mpDoc-GetDocSh() mpDoc-GetDocSh()-GetMedium() ) { -String aBaseURL = mpDoc-GetDocSh()-GetMedium()-GetBaseURL(); +OUString aBaseURL = mpDoc-GetDocSh()-GetMedium()-GetBaseURL(); if( eCA == presentation::ClickAction_SOUND || eCA == presentation::ClickAction_DOCUMENT || eCA == presentation::ClickAction_PROGRAM ) @@ -319,7 +319,7 @@ sal_Bool SdTPAction::FillItemSet( SfxItemSet rAttrs ) void SdTPAction::Reset( const SfxItemSet rAttrs ) { presentation::ClickAction eCA = presentation::ClickAction_NONE; -String aFileName; +OUString aFileName; // aLbAction if( rAttrs.GetItemState( ATTR_ACTION ) != SFX_ITEM_DONTCARE ) @@ -350,7 +350,7 @@ void SdTPAction::Reset( const SfxItemSet rAttrs ) case presentation::ClickAction_DOCUMENT: { if( comphelper::string::getTokenCount(aFileName, DOCUMENT_TOKEN) == 2 ) -aLbTreeDocument.SelectEntry( aFileName.GetToken( 1, DOCUMENT_TOKEN ) ); +aLbTreeDocument.SelectEntry( aFileName.getToken( 1, DOCUMENT_TOKEN ) ); } break; @@ -418,13 +418,13 @@ void SdTPAction::OpenFileDialog() } else { -String aFile( GetEditText() ); +OUString aFile( GetEditText() ); if (bSound) { SdOpenSoundFileDialog aFileDialog; -if( !aFile.Len() ) +if( aFile.isEmpty() ) aFile = SvtPathOptions().GetGraphicPath(); aFileDialog.SetPath( aFile ); @@ -455,7 +455,7 @@ void SdTPAction::OpenFileDialog() sfx2::FileDialogHelper aFileDialog( ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, 0); -if (bDocument !aFile.Len()) +if (bDocument aFile.isEmpty()) aFile = SvtPathOptions().GetWorkPath(); aFileDialog.SetDisplayDirectory( aFile ); @@ -465,7 +465,7 @@ void SdTPAction::OpenFileDialog() // filter makes the (Windows system) open file dialog follow // links on the desktop to directories. aFileDialog.AddFilter ( -String (SfxResId (STR_SFX_FILTERNAME_ALL)), +SFX2_RESSTR(STR_SFX_FILTERNAME_ALL), OUString(*.*)); @@ -678,7 +678,7 @@ IMPL_LINK_NOARG(SdTPAction, SelectTreeHdl) IMPL_LINK_NOARG(SdTPAction, CheckFileHdl) { -String aFile( GetEditText() ); +OUString aFile( GetEditText() ); if( aFile != aLastFile ) { @@ -749,17 +749,17 @@ void SdTPAction::SetActualClickAction( presentation::ClickAction eCA ) // -void SdTPAction::SetEditText( String const rStr ) +void SdTPAction::SetEditText( OUString const rStr ) { presentation::ClickAction eCA =
[GSOC]Firebird Integration Weekly Update 12
Hello everyone, Current status of the firebird-sdbc driver is: - (Var)Char, Numeric and Date/Time types all supported. (No support for blob/clob/array/etc. yet.) - Data Editing in the GUI works. - Data Insertion works. (- Table and Column definition/manipulation is mostly complete, there might still be a few minor-to-major issues, indexes aren't supported at all.) - Usable on Linux, Mac, Windows (thanks to tml for fixing the fbembed library / loading on Mac). Progress this week: -Set FIREBIRD_TMP/FIREBIRD_LOCK: by default firebird uses /tmp or C: \temp for temporary storage, which can often be incorrect (specifically detected by tml when using Mac sandboxing) -- we now tell fb to use whatever the correct tmp dir is (determined by osl::FileBase). - Implement integer types retrieval and storage. - Implement Date/Time/Timestamp retrieval and storage. - Implement float/double retrieval and storage. - Fix some metadata to do with floats/doubles. - Fix OGeneralPageWizard: I put the code for dealing with the embedded db list in the wrong class, this class is reused for a dialog that allows changing the database connection for remote dbs, which was crashing since the .ui files don't contain the embedded db selector. - Implemented retrieval of change count (number of rows inserted/updated/deleted/selected) which is used for executeUpdate currently. - Fixed the strange behaviour that was occuring when an inserted row was displayed wrongly in the UI -- this was since executeUpdate returned 0 (as a temporary measure until I got round to implementing it) and dbaccess/KeySet relies on this value to detect that an insert actually occured. This week I'll try and look at implementing stuff to do with indexes and foreign keys, this would allow me to do some testing around the icu/index issues. I'll also try and set up a few different builds with different icu versions for testing once I have suitable code ready. (I'm also currently looking at implementing local .fdb loading.) Cheers, Andrzej ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Maxim momonas...@gmail.com changed: What|Removed |Added Depends on||68431 --- Comment #79 from Maxim momonas...@gmail.com --- I add Bug 68431 - FILESAVE: Style Font name incompatible with older versions. Users can't force other users to upgrade their installation, just to correctly open their presentation. (Seems like a partially fixed Bug 67665) -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/calc-online-spellcheck' - 8 commits - editeng/source include/editeng sc/inc sc/source
editeng/source/editeng/editdoc.cxx | 19 +++ editeng/source/editeng/editdoc.hxx |3 + editeng/source/editeng/editeng.cxx |5 +++ editeng/source/editeng/impedit.hxx |1 editeng/source/editeng/impedit4.cxx |6 +++ include/editeng/editeng.hxx |1 sc/inc/column.hxx |2 - sc/inc/dociter.hxx |7 sc/inc/document.hxx |6 --- sc/inc/spellcheckcontext.hxx|4 ++ sc/inc/table.hxx|2 - sc/source/core/data/column2.cxx | 46 sc/source/core/data/dociter.cxx | 11 -- sc/source/core/data/documen8.cxx| 38 --- sc/source/core/data/table4.cxx |6 --- sc/source/ui/app/inputhdl.cxx | 16 ++ sc/source/ui/app/scmod.cxx | 14 +--- sc/source/ui/app/uiitems.cxx| 47 + sc/source/ui/docshell/docfunc.cxx |1 sc/source/ui/inc/gridwin.hxx|3 + sc/source/ui/inc/tabview.hxx|7 sc/source/ui/inc/uiitems.hxx|9 + sc/source/ui/view/cellsh3.cxx |5 ++- sc/source/ui/view/gridwin.cxx | 51 +++- sc/source/ui/view/gridwin2.cxx |9 - sc/source/ui/view/spellcheckcontext.cxx | 32 sc/source/ui/view/tabview.cxx | 33 sc/source/ui/view/tabview4.cxx |3 + sc/source/ui/view/tabvwsh4.cxx |4 +- sc/source/ui/view/viewfun3.cxx |8 +++-- sc/source/ui/view/viewfunc.cxx |4 ++ 31 files changed, 243 insertions(+), 160 deletions(-) New commits: commit 820c7a94bf43697661a71206da254bbad5a2e9a0 Author: Kohei Yoshida kohei.yosh...@gmail.com Date: Sun Sep 1 14:31:36 2013 -0400 Reset auto spell data in the view shell instead of in the doc shell. It makes more sense that way. Change-Id: Ib2e2167228b1c2a2a19a750477652e18ae69d105 diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index acbee87..15355ee 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -2010,9 +2010,6 @@ bool ScDocFunc::InsertCells( const ScRange rRange, const ScMarkData* pTabMark, rDocShell.ErrorMessage(STR_INSERT_FULL);// Spalte/Zeile voll } -if (pViewSh) -pViewSh-ResetAutoSpell(); - aModificator.SetDocumentModified(); SFX_APP()-Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) ); @@ -2494,10 +2491,6 @@ bool ScDocFunc::DeleteCells( const ScRange rRange, const ScMarkData* pTabMark, } } -ScTabViewShell* pViewSh = rDocShell.GetBestViewShell(); -if (pViewSh) -pViewSh-ResetAutoSpell(); - aModificator.SetDocumentModified(); SFX_APP()-Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) ); diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx index ec74970..aa4b9e9 100644 --- a/sc/source/ui/view/viewfun3.cxx +++ b/sc/source/ui/view/viewfun3.cxx @@ -1268,11 +1268,9 @@ bool ScViewFunc::PasteFromClip( sal_uInt16 nFlags, ScDocument* pClipDoc, true, false, bIncludeFiltered ); } - pDocSh-UpdatePaintExt( nExtFlags, nStartCol, nStartRow, nStartTab, nEndCol, nEndRow, nEndTab ); // content after the change - // ggf. Autofilter-Koepfe loeschen if (bCutMode) if (pDoc-RefreshAutoFilter( nClipStartX,nClipStartY, nClipStartX+nClipSizeX, @@ -1355,6 +1353,7 @@ bool ScViewFunc::PasteFromClip( sal_uInt16 nFlags, ScDocument* pClipDoc, nPaint, nExtFlags); // AdjustBlockHeight has already been called above +ResetAutoSpell(); aModificator.SetDocumentModified(); PostPasteFromClip(aUserRange, rMark); @@ -1530,6 +1529,8 @@ bool ScViewFunc::PasteMultiRangesFromClip( pUndoMgr-LeaveListAction(); } + +ResetAutoSpell(); aModificator.SetDocumentModified(); PostPasteFromClip(aMarkedRange, aMark); return true; @@ -1686,6 +1687,8 @@ bool ScViewFunc::PasteFromClipToMultiRanges( pUndoMgr-AddUndoAction(pUndo, false); pUndoMgr-LeaveListAction(); } + +ResetAutoSpell(); aModificator.SetDocumentModified(); PostPasteFromClip(aRanges, aMark); @@ -1808,6 +1811,7 @@ sal_Bool ScViewFunc::MoveBlockTo( const ScRange rSource, const ScAddress rDest pDocSh-UpdateOle(GetViewData()); SelectionChanged(); +ResetAutoSpell(); } return bSuccess; } diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx index 2096db7..6e026fb 100644 --- a/sc/source/ui/view/viewfunc.cxx +++ b/sc/source/ui/view/viewfunc.cxx @@ -1489,6 +1489,7 @@ sal_Bool
[Libreoffice-commits] core.git: 3 commits - sw/source
sw/source/core/layout/fly.cxx | 21 - sw/source/core/layout/flycnt.cxx | 11 --- sw/source/core/layout/flyincnt.cxx |4 3 files changed, 36 deletions(-) New commits: commit 4bc3a58a648f6c0ce95b4eb41f2cbf46175629ed Author: Miklos Vajna vmik...@suse.cz Date: Sun Sep 1 20:29:52 2013 +0200 sw: unused includes in flyincnt Change-Id: Icb195e98cfb890d5ab9fc6a94506a5a9193ba59d diff --git a/sw/source/core/layout/flyincnt.cxx b/sw/source/core/layout/flyincnt.cxx index a0d9a3f..e7d72c0 100644 --- a/sw/source/core/layout/flyincnt.cxx +++ b/sw/source/core/layout/flyincnt.cxx @@ -18,14 +18,10 @@ */ -#include cntfrm.hxx #include doc.hxx -#include flyfrm.hxx #include frmtool.hxx -#include frmfmt.hxx #include hints.hxx #include fmtornt.hxx -#include fmtfsize.hxx #include txtfrm.hxx //fuer IsLocked() #include flyfrms.hxx // OD 2004-01-19 #110582# commit 6ecc7d37d29b07bcd4e56faecc0ac8c4ec3d397c Author: Miklos Vajna vmik...@suse.cz Date: Sun Sep 1 20:26:43 2013 +0200 sw: unused includes in fly Change-Id: Ie1cb1f4f48a1b67a038347b12083dda1b3f975c4 diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx index d921849..3f13e69 100644 --- a/sw/source/core/layout/fly.cxx +++ b/sw/source/core/layout/fly.cxx @@ -17,64 +17,43 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include hintids.hxx #include svl/itemiter.hxx #include svtools/imap.hxx -#include vcl/graph.hxx -#include tools/poly.hxx #include tools/helpers.hxx -#include svx/contdlg.hxx #include editeng/protitem.hxx #include editeng/opaqitem.hxx #include editeng/ulspitem.hxx -#include editeng/lrspitem.hxx #include editeng/frmdiritem.hxx -#include editeng/keepitem.hxx -#include fmtanchr.hxx #include fmtfsize.hxx #include fmtclds.hxx #include fmtcntnt.hxx #include fmturl.hxx #include fmtsrnd.hxx #include fmtornt.hxx -#include fmtpdsc.hxx #include fmtcnct.hxx #include layhelp.hxx -#include ndtxt.hxx -#include svx/svdogrp.hxx #include ndgrf.hxx #include tolayoutanchoredobjectposition.hxx #include fmtfollowtextflow.hxx #include sortedobjs.hxx #include objectformatter.hxx -#include anchoredobject.hxx #include ndole.hxx #include swtable.hxx #include svx/svdpage.hxx -#include doc.hxx -#include viewsh.hxx #include layouter.hxx #include pagefrm.hxx #include rootfrm.hxx -#include cntfrm.hxx -#include pam.hxx -#include frmatr.hxx #include viewimp.hxx #include viewopt.hxx #include dcontact.hxx #include dflyobj.hxx #include dview.hxx -#include flyfrm.hxx #include frmtool.hxx -#include frmfmt.hxx #include hints.hxx -#include swregion.hxx #include tabfrm.hxx #include txtfrm.hxx -#include ndnotxt.hxx #include notxtfrm.hxx // GetGrfArea #include flyfrms.hxx -#include ndindex.hxx // GetGrfArea #include sectfrm.hxx #include vcl/svapp.hxx #include switerator.hxx commit 3003613389f1d2d2fd79812c8ccc6c111b64962e Author: Miklos Vajna vmik...@suse.cz Date: Sun Sep 1 20:15:39 2013 +0200 sw: unused includes in flycnt Change-Id: I33ebd4757cebf95c60cd8af1500a382cb45d0092 diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx index 32c6f89..3cac75a 100644 --- a/sw/source/core/layout/flycnt.cxx +++ b/sw/source/core/layout/flycnt.cxx @@ -20,23 +20,12 @@ #include tools/bigint.hxx #include pagefrm.hxx -#include cntfrm.hxx -#include flyfrm.hxx #include txtfrm.hxx #include doc.hxx #include IDocumentUndoRedo.hxx -#include viewsh.hxx -#include viewimp.hxx -#include pam.hxx -#include frmfmt.hxx #include frmtool.hxx #include dflyobj.hxx #include hints.hxx -#include ndtxt.hxx -#include swundo.hxx -#include editeng/ulspitem.hxx -#include editeng/lrspitem.hxx -#include fmtanchr.hxx #include fmtornt.hxx #include fmtfsize.hxx #include fmtsrnd.hxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8par.hxx |2 sw/source/filter/ww8/ww8par2.cxx |2 sw/source/filter/ww8/ww8par5.cxx |4 - sw/source/filter/ww8/ww8par6.cxx | 80 -- sw/source/filter/ww8/ww8scan.cxx | 30 ++ sw/source/filter/ww8/ww8struc.hxx |2 6 files changed, 45 insertions(+), 75 deletions(-) New commits: commit b0db7c60f12c0eb9931856507b40332086d42106 Author: Matteo Casalin matteo.casa...@yahoo.com Date: Sat Aug 31 15:25:24 2013 +0200 String to OUString Change-Id: Ibb2489e4e895f3f855208fe20749f7078a360710 Reviewed-on: https://gerrit.libreoffice.org/5737 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index 4613727..4409fdb 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -1344,7 +1344,7 @@ private: const bool bFirstLineOfStSet = false, const bool bLeftIndentSet = false ); -bool GetFontParams(sal_uInt16, FontFamily, String, FontPitch, +bool GetFontParams(sal_uInt16, FontFamily, OUString, FontPitch, rtl_TextEncoding); bool SetNewFontAttr(sal_uInt16 nFCode, bool bSetEnums, sal_uInt16 nWhich); void ResetCharSetVars(); diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index 3bf32a7..955266e 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -645,7 +645,7 @@ void SwWW8ImplReader::SetAnlvStrings(SwNumFmt rNum, WW8_ANLV rAV, if( bListSymbol ) { FontFamily eFamily; -String aName; +OUString aName; FontPitch ePitch; if( GetFontParams( SVBT16ToShort( rAV.ftc ), eFamily, aName, diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index ea6cd21..c4383ed 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -2355,11 +2355,11 @@ eF_ResT SwWW8ImplReader::Read_F_Macro( WW8FieldDesc*, String rStr) for ( ; i pFonts-GetMax(); i++ ) { FontFamily eFamily; -String aFontName; +OUString aFontName; FontPitch ePitch; CharSet eSrcCharSet; if( GetFontParams( i, eFamily, aFontName, ePitch, eSrcCharSet ) - aFontName.EqualsAscii(Wingdings) ) + aFontName==Wingdings ) { break; } diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index a01fb7d..e8766e0 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -3359,7 +3359,7 @@ void SwWW8ImplReader::Read_UnderlineColor(sal_uInt16, const sal_uInt8* pData, sh } } bool SwWW8ImplReader::GetFontParams( sal_uInt16 nFCode, FontFamily reFamily, -String rName, FontPitch rePitch, CharSet reCharSet ) +OUString rName, FontPitch rePitch, CharSet reCharSet ) { // Die Defines, aus denen diese Tabellen erzeugt werden, stehen in windows.h static const FontPitch ePitchA[] = @@ -3370,14 +3370,14 @@ bool SwWW8ImplReader::GetFontParams( sal_uInt16 nFCode, FontFamily reFamily, static const FontFamily eFamilyA[] = { FAMILY_DONTKNOW, FAMILY_ROMAN, FAMILY_SWISS, FAMILY_MODERN, -FAMILY_SCRIPT, FAMILY_DECORATIVE +FAMILY_SCRIPT, FAMILY_DECORATIVE, FAMILY_DONTKNOW, FAMILY_DONTKNOW }; const WW8_FFN* pF = pFonts-GetFont( nFCode ); // Info dazu if( !pF ) // FontNummer unbekannt ? return false; // dann ignorieren -rName = String( pF-sFontname ); +rName = pF-sFontname; // pF-prg : Pitch rePitch = ePitchA[pF-prg]; @@ -3396,62 +3396,34 @@ bool SwWW8ImplReader::GetFontParams( sal_uInt16 nFCode, FontFamily reFamily, reCharSet = rtl_getTextEncodingFromWindowsCharset( pF-chs ); } -// pF-ff : Family -sal_uInt8 b = pF-ff; - // make sure Font Family Code is set correctly // at least for the most important fonts // ( might be set wrong when Doc was not created by // Winword but by third party program like Applixware... ) -/* -0: FAMILY_DONTKNOW -1: FAMILY_ROMAN -2: FAMILY_SWISS -3: FAMILY_MODERN -4: FAMILY_SCRIPT -5: FAMILY_DECORATIVE -*/ -#define FONTNAMETAB_SZ14 -#define MAX_FONTNAME_ROMAN 6 -static const sal_Char -// first comes ROMAN -sFontName0[] = \x07Tms Rmn, -sFontName1[] = \x07Timmons, -sFontName2[] = \x08CG Times, -sFontName3[] = \x08MS Serif, -sFontName4[] = \x08Garamond, -sFontName5[] = \x11Times Roman, -sFontName6[] = \x15Times New Roman, -// from here SWISS -- see above: #define MAX_FONTNAME_ROMAN 6 -
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8struc.hxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit ddb52017952e28da84fcd7fc9954cf54495939b6 Author: Matteo Casalin matteo.casa...@yahoo.com Date: Sat Aug 31 16:07:43 2013 +0200 WW8: really reserve those FFN bits All of the information that I found on the Internet seem to agree on that. This patch could also make unnecessary some special cases in FFN handling (e.g. in ww8par6.cxx). Change-Id: If86f2da2697200f1a01a3c70badae7230125c3a2 Reviewed-on: https://gerrit.libreoffice.org/5738 Tested-by: Caolán McNamara caol...@redhat.com Reviewed-by: Caolán McNamara caol...@redhat.com diff --git a/sw/source/filter/ww8/ww8struc.hxx b/sw/source/filter/ww8/ww8struc.hxx index b4ed4a2..eec8ae2 100644 --- a/sw/source/filter/ww8/ww8struc.hxx +++ b/sw/source/filter/ww8/ww8struc.hxx @@ -202,9 +202,9 @@ struct WW8_FFN_BASE // Font Descriptor sal_uInt8prg: 2; // 0x1:03 pitch request sal_uInt8fTrueType : 1; // 0x1:04 when 1, font is a TrueType font -// 0x1:08 reserved +sal_uInt8_reserved1 : 1; // 0x1:08 reserved sal_uInt8ff : 3; // 0x1:70 font family id -// 0x1:80 reserved +sal_uInt8_reserved2 : 1; // 0x1:80 reserved short wWeight; // 0x2 base weight of font sal_uInt8chs;// 0x4 character set identifier ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |8 1 file changed, 8 deletions(-) New commits: commit d04e98d4ef8d15c9e8c76d0a61fd0aa45e75b1e8 Author: Ivan Timofeev timofeev@gmail.com Date: Sun Sep 1 17:48:32 2013 +0400 fdo#67584: remove .uno:FlipVertical from WriterCommands.xcu mismerge in c991fb49aa174f300be0b978d89bc63e01e0aa2b Change-Id: I7d890495bac0fa1a458a86c8625158c94cdba717 (cherry picked from commit 58aa737b2a37fa939580ee65f8976a13870b1de9) Reviewed-on: https://gerrit.libreoffice.org/5741 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu index c8dc745..a4f5bcc 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu @@ -720,14 +720,6 @@ value xml:lang=en-USOutline to ~Clipboard/value /prop /node - node oor:name=.uno:FlipVertical oor:op=replace -prop oor:name=Label oor:type=xs:string - value xml:lang=en-USFlip Horizontally/value -/prop -prop oor:name=Properties oor:type=xs:int - value1/value -/prop - /node node oor:name=.uno:RotateLeft oor:op=replace prop oor:name=Label oor:type=xs:string value xml:lang=en-USRotate 90° ~Left/value ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - icon-themes/crystal icon-themes/human icon-themes/industrial icon-themes/oxygen icon-themes/tango
icon-themes/crystal/cmd/lc_fliphorizontal.png|binary icon-themes/crystal/cmd/lc_flipvertical.png |binary icon-themes/crystal/cmd/sc_fliphorizontal.png|binary icon-themes/crystal/cmd/sc_flipvertical.png |binary icon-themes/human/cmd/lc_fliphorizontal.png |binary icon-themes/human/cmd/lc_flipvertical.png|binary icon-themes/human/cmd/sc_fliphorizontal.png |binary icon-themes/human/cmd/sc_flipvertical.png|binary icon-themes/industrial/cmd/lc_fliphorizontal.png |binary icon-themes/industrial/cmd/lc_flipvertical.png |binary icon-themes/industrial/cmd/sc_fliphorizontal.png |binary icon-themes/industrial/cmd/sc_flipvertical.png |binary icon-themes/oxygen/cmd/lc_fliphorizontal.png |binary icon-themes/oxygen/cmd/lc_flipvertical.png |binary icon-themes/oxygen/cmd/sc_fliphorizontal.png |binary icon-themes/oxygen/cmd/sc_flipvertical.png |binary icon-themes/tango/cmd/lc_fliphorizontal.png |binary icon-themes/tango/cmd/lc_flipvertical.png|binary icon-themes/tango/cmd/sc_fliphorizontal.png |binary icon-themes/tango/cmd/sc_flipvertical.png|binary 20 files changed New commits: commit addd1a6a9b0f4e21648ddbafeb2ffd6c324aa2e1 Author: Ivan Timofeev timofeev@gmail.com Date: Sun Sep 1 22:33:45 2013 +0400 Revert fdo#42434: swap flipvertical and fliphorizontal icons in some themes This reverts commit 178d86a99820c5e0b9ca668c49300d468ab70e10. Turns out it's not needed in this branch. The bug version is 3.4.3, so I thought that all versions 3-4..4-2 are broken. Surprisingly 4-0 was already fixed, and 4-1 is broken again... Change-Id: I48bc00d72e360073db3c4e1cd9d14dd5fcb5ebf6 Reviewed-on: https://gerrit.libreoffice.org/5744 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/icon-themes/crystal/cmd/lc_fliphorizontal.png b/icon-themes/crystal/cmd/lc_fliphorizontal.png index 5440863..6eed975 100644 Binary files a/icon-themes/crystal/cmd/lc_fliphorizontal.png and b/icon-themes/crystal/cmd/lc_fliphorizontal.png differ diff --git a/icon-themes/crystal/cmd/lc_flipvertical.png b/icon-themes/crystal/cmd/lc_flipvertical.png index 6eed975..5440863 100644 Binary files a/icon-themes/crystal/cmd/lc_flipvertical.png and b/icon-themes/crystal/cmd/lc_flipvertical.png differ diff --git a/icon-themes/crystal/cmd/sc_fliphorizontal.png b/icon-themes/crystal/cmd/sc_fliphorizontal.png index f16cf5e..73f6b0e 100644 Binary files a/icon-themes/crystal/cmd/sc_fliphorizontal.png and b/icon-themes/crystal/cmd/sc_fliphorizontal.png differ diff --git a/icon-themes/crystal/cmd/sc_flipvertical.png b/icon-themes/crystal/cmd/sc_flipvertical.png index 73f6b0e..f16cf5e 100644 Binary files a/icon-themes/crystal/cmd/sc_flipvertical.png and b/icon-themes/crystal/cmd/sc_flipvertical.png differ diff --git a/icon-themes/human/cmd/lc_fliphorizontal.png b/icon-themes/human/cmd/lc_fliphorizontal.png index 116cad6..b02e1fd 100644 Binary files a/icon-themes/human/cmd/lc_fliphorizontal.png and b/icon-themes/human/cmd/lc_fliphorizontal.png differ diff --git a/icon-themes/human/cmd/lc_flipvertical.png b/icon-themes/human/cmd/lc_flipvertical.png index b02e1fd..116cad6 100644 Binary files a/icon-themes/human/cmd/lc_flipvertical.png and b/icon-themes/human/cmd/lc_flipvertical.png differ diff --git a/icon-themes/human/cmd/sc_fliphorizontal.png b/icon-themes/human/cmd/sc_fliphorizontal.png index 901b218..9a2994b 100644 Binary files a/icon-themes/human/cmd/sc_fliphorizontal.png and b/icon-themes/human/cmd/sc_fliphorizontal.png differ diff --git a/icon-themes/human/cmd/sc_flipvertical.png b/icon-themes/human/cmd/sc_flipvertical.png index 9a2994b..901b218 100644 Binary files a/icon-themes/human/cmd/sc_flipvertical.png and b/icon-themes/human/cmd/sc_flipvertical.png differ diff --git a/icon-themes/industrial/cmd/lc_fliphorizontal.png b/icon-themes/industrial/cmd/lc_fliphorizontal.png index a972d2c..ef1c256 100644 Binary files a/icon-themes/industrial/cmd/lc_fliphorizontal.png and b/icon-themes/industrial/cmd/lc_fliphorizontal.png differ diff --git a/icon-themes/industrial/cmd/lc_flipvertical.png b/icon-themes/industrial/cmd/lc_flipvertical.png index ef1c256..a972d2c 100644 Binary files a/icon-themes/industrial/cmd/lc_flipvertical.png and b/icon-themes/industrial/cmd/lc_flipvertical.png differ diff --git a/icon-themes/industrial/cmd/sc_fliphorizontal.png b/icon-themes/industrial/cmd/sc_fliphorizontal.png index 1744b76..761d90e 100644 Binary files a/icon-themes/industrial/cmd/sc_fliphorizontal.png and b/icon-themes/industrial/cmd/sc_fliphorizontal.png differ diff --git a/icon-themes/industrial/cmd/sc_flipvertical.png b/icon-themes/industrial/cmd/sc_flipvertical.png index 761d90e..1744b76 100644 Binary files a/icon-themes/industrial/cmd/sc_flipvertical.png and b/icon-themes/industrial/cmd/sc_flipvertical.png differ diff --git
[Libreoffice-commits] core.git: svtools/source
svtools/source/misc/langtab.src |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b81d16d79990dccf263367356826a30f23439367 Author: Khaled Hosny khaledho...@eglug.org Date: Sun Sep 1 19:32:44 2013 +0200 fdo#68795: Fix name of Assamese language The name of the language is Assamese not Assami. Change-Id: I29c64a6d3de28783ac34f9505f206a61781e08f6 Reviewed-on: https://gerrit.libreoffice.org/5743 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src index 5c177e9..db2ef94 100644 --- a/svtools/source/misc/langtab.src +++ b/svtools/source/misc/langtab.src @@ -63,7 +63,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE Arabic (Yemen) ; LANGUAGE_ARABIC_YEMEN ; ; Aragonese ; LANGUAGE_USER_ARAGONESE ; ; Armenian ; LANGUAGE_ARMENIAN ; ; - Assami ; LANGUAGE_ASSAMESE ; ; + Assamese ; LANGUAGE_ASSAMESE ; ; Azerbaijani Latin ; LANGUAGE_AZERI_LATIN ; ; Azerbaijani Cyrillic ; LANGUAGE_AZERI_CYRILLIC ; ; Basque ; LANGUAGE_BASQUE ; ; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] add automatic git hook setting in autogen.sh
Hi, I would like you to review the following patch: https://gerrit.libreoffice.org/5745 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/libcdr refs/changes/45/5745/1 add automatic git hook setting in autogen.sh Change-Id: I95eb02dc2d347337d7b85f85d6459353278fb137 --- A .git-hooks/README A .git-hooks/commit-msg A .git-hooks/post-merge A .git-hooks/pre-commit M autogen.sh 5 files changed, 366 insertions(+), 7 deletions(-) diff --git a/.git-hooks/README b/.git-hooks/README new file mode 100644 index 000..3ddd71a --- /dev/null +++ b/.git-hooks/README @@ -0,0 +1,9 @@ +Git hooks are executable scripts you can place in $GIT_DIR/hooks directory to trigger action at certain points. + +There are two groups of these hooks: client side and server side. +The client-side hooks: +are for client operations such as committing and merging. +The server-side hooks: +are for Git server operations such as receiving pushed commits. + +See Also [ http://git-scm.com/book/en/Customizing-Git-Git-Hooks ] \ No newline at end of file diff --git a/.git-hooks/commit-msg b/.git-hooks/commit-msg new file mode 100755 index 000..e3dfe69 --- /dev/null +++ b/.git-hooks/commit-msg @@ -0,0 +1,181 @@ +#!/bin/sh +# +# An example hook script to check the commit log message. +# Called by git-commit with one argument, the name of the file +# that has the commit message. The hook should exit with non-zero +# status after issuing an appropriate message if it wants to stop the +# commit. The hook is allowed to edit the commit message file. +# +# To enable this hook, make this file executable. + +# Uncomment the below to add a Signed-off-by line to the message. +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*\).*$/Signed-off-by: \1/p') +# grep -qs ^$SOB $1 || echo $SOB $1 + +# This example catches duplicate Signed-off-by lines. + +base_dir=$(dirname $0) +MSG=$1 + +abort() { +cp $1 $1.save +cat 2 EOF +Commit aborted, your commit message was saved as '$1.save'. + +Reason: $2 + +EOF +exit 1 +} + +test = $(grep '^Signed-off-by: ' $1 | +sort | uniq -c | sed -e '/^[ ]*1[]/d') || { + abort $1 Duplicate Signed-off-by lines. +} + +# Check that the first line exists, and is not an asterisk + +if [ -z `head -n 1 $1 | grep -v '^[[:blank:]]*\*$'` ] ; then +abort $1 Please provide the general description on the first line. +fi + +# ...and that it is not too long + +if [ `head -n 1 $1 | wc -c` -gt 79 ] ; then +abort $1 The first line is too long, please try to fit into 79 characters. +fi + +# ...and that it does not continue on the second line +if [ `wc -l $1` -gt 1 -a -n `head -n 2 $1 | tail -n 1 | sed 's/^#.*//'` ] ; then +abort $1 The second line is not empty - maybe the first line continues there? +fi + +# Check that the message is not a ChangeLog-like one + +if [ -n `head -n 1 $1 | grep '^[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}.*.*@.*'` ] ; then +abort $1 The commit message looks like ChangeLog, please use the git form. +fi + +# Check for whitespace in front of *'s + +if [ -n `sed '/^#/,$d' $1 | grep '^[[:space:]]\+\*.*:'` -a -z `grep '^\*' $1` ] ; then +abort $1 Please don't use whitespace in front of '* file: Description.' entries. +fi + +# Check that lines do not start with '#something' (possibly accidental commit, +# such as starting the message with '#ifdef', git commits start with '#whitespace'. + +if [ -n `grep '^#[^[:blank:]]' $1` ] ; then +abort $1 Possible accidental comment in the commit message (leading # without space). +fi + + +#-- copied gerrit commit-msg hook to handle ChangeId -- +# From Gerrit Code Review 2.3 +# +# Part of Gerrit Code Review (http://code.google.com/p/gerrit/) +# +# Copyright (C) 2009 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the License); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an AS IS BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +CHANGE_ID_AFTER=Bug|Issue + +# Check for, and add if missing, a unique Change-Id +# +add_ChangeId() { +clean_message=`sed -e ' +/^diff --git a\/.*/{ +s/// +q +} +/^Signed-off-by:/d +/^#/d +' $MSG | git stripspace` +if test -z $clean_message +then +return +fi + +id=`grep -i '^Change-Id:' $MSG | sed -e s/.*: I//` +temp_msg=`grep -v -i '^Change-Id:' $MSG` +echo $temp_msg $MSG + +if test -z $id +then +id=`_gen_ChangeId` +
[Libreoffice-commits] core.git: embedserv/Module_embedserv.mk sw/CppunitTest_sw_ww8export.mk
embedserv/Module_embedserv.mk |2 +- sw/CppunitTest_sw_ww8export.mk |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 907445612298aae4f3322a7d9cdc6871d54ba47a Author: Niklas Johansson sleeping.pil...@gmail.com Date: Sun Sep 1 16:06:57 2013 +0200 Make it possible to build without ATL Change-Id: I381934bc00273da7bf359610bb471ec4cbc49545 Reviewed-on: https://gerrit.libreoffice.org/5740 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/embedserv/Module_embedserv.mk b/embedserv/Module_embedserv.mk index 009d63e..fc11190 100644 --- a/embedserv/Module_embedserv.mk +++ b/embedserv/Module_embedserv.mk @@ -13,7 +13,7 @@ $(eval $(call gb_Module_Module,embedserv)) ifeq ($(OS),WNT) $(eval $(call gb_Module_add_targets,embedserv,\ - Library_inprocserv \ + $(if $(filter WNT-TRUE,$(OS)-$(DISABLE_ATL)),,Library_inprocserv) \ )) ifeq ($(DISABLE_ATL),) diff --git a/sw/CppunitTest_sw_ww8export.mk b/sw/CppunitTest_sw_ww8export.mk index c75d929..2b1a475 100644 --- a/sw/CppunitTest_sw_ww8export.mk +++ b/sw/CppunitTest_sw_ww8export.mk @@ -19,7 +19,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_ww8export, \ comphelper \ cppu \ cppuhelper \ -emboleobj \ +$(if $(filter WNT-TRUE,$(OS)-$(DISABLE_ATL)),,emboleobj) \ sal \ test \ unotest \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: accessibility/bridge
accessibility/bridge/org/openoffice/java/accessibility/AccessibleEditableTextImpl.java |9 ++--- accessibility/bridge/org/openoffice/java/accessibility/AccessibleTextImpl.java |8 +++- 2 files changed, 5 insertions(+), 12 deletions(-) New commits: commit 277b339371727134851da1b695d9d8d30889a961 Author: Niklas Johansson sleeping.pil...@gmail.com Date: Sun Aug 25 18:29:59 2013 +0200 fdo#68346 Accessibility bridge should exspose the font name. At the moment it tells the user if the font is proportional or monospaced. Change-Id: I5073fed730aab1435fd9cc3bd4a897e95f97e783 Reviewed-on: https://gerrit.libreoffice.org/5739 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleEditableTextImpl.java b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleEditableTextImpl.java index c7202bc..8dd7e36 100644 --- a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleEditableTextImpl.java +++ b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleEditableTextImpl.java @@ -166,13 +166,8 @@ public class AccessibleEditableTextImpl extends AccessibleTextImpl implements ja attribute = as.getAttribute(StyleConstants.FontFamily); if (null != attribute) { com.sun.star.beans.PropertyValue propertyValue = new com.sun.star.beans.PropertyValue(); -propertyValue.Name = CharFontPitch; - -if (StyleConstants.getFontFamily(as).equals( Proportional )) { -propertyValue.Value = new Short(2); -} else { -propertyValue.Value = new Short(1); -} +propertyValue.Name = CharFontName; +propertyValue.Value = new String(StyleConstants.getFontFamily(as)); propertyValues.add(propertyValue); } diff --git a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleTextImpl.java b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleTextImpl.java index c22eebe0..92c10de 100644 --- a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleTextImpl.java +++ b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleTextImpl.java @@ -36,7 +36,7 @@ public class AccessibleTextImpl implements javax.accessibility.AccessibleText { final static double toPointFactor = 1 / ((7 / 10) + 34.5); final static String[] attributeList = { ParaAdjust, CharBackColor, CharWeight, ParaFirstLineIndent, -CharFontPitch, CharHeight, CharColor, CharPosture, +CharFontName, CharHeight, CharColor, CharPosture, ParaLeftMargin, ParaLineSpacing, ParaTopMargin, ParaBottomMargin, CharStrikeout, CharEscapement, ParaTabStops, CharUnderline }; @@ -296,10 +296,8 @@ public class AccessibleTextImpl implements javax.accessibility.AccessibleText { (float) (toPointFactor * AnyConverter.toInt(property.Value))); // Set font family attribute -} else if (property.Name.equals(CharFontPitch)) { -if (AnyConverter.toShort(property.Value) == 2) { -StyleConstants.setFontFamily(as, Proportional); -} +} else if (property.Name.equals(CharFontName)) { +StyleConstants.setFontFamily(as, AnyConverter.toString(property.Value)); // Set font size attribute } else if (property.Name.equals(CharHeight)) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx svx/source
include/svx/svdedtv.hxx |6 +++--- include/svx/svdpagv.hxx |8 include/svx/svdpntv.hxx |4 ++-- svx/source/svdraw/svdedtv.cxx |4 ++-- svx/source/svdraw/svdpagv.cxx | 12 ++-- svx/source/svdraw/svdpntv.cxx |6 +++--- 6 files changed, 20 insertions(+), 20 deletions(-) New commits: commit 6c5c0302f3624ec7c3b862c98d5514f29328bbe9 Author: Caolán McNamara caol...@redhat.com Date: Sun Sep 1 20:26:27 2013 +0100 XubString-OUString Change-Id: I8bf16712cee985c1a9e42479f22de2a43597 diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx index 0b0305c..fead690 100644 --- a/include/svx/svdedtv.hxx +++ b/include/svx/svdedtv.hxx @@ -189,11 +189,11 @@ public: void AddUndoActions( std::vector SdrUndoAction* ); // Layerverwaltung. Mit Undo. -SdrLayer* InsertNewLayer(const String rName, sal_uInt16 nPos=0x); +SdrLayer* InsertNewLayer(const OUString rName, sal_uInt16 nPos=0x); // Loeschen eines Layer inkl. aller darauf befindlichen Objekte -void DeleteLayer(const String rName); +void DeleteLayer(const OUString rName); // Verschieben eines Layer (Layerreihenfolge aendern) -void MoveLayer(const String rName, sal_uInt16 nNewPos); +void MoveLayer(const OUString rName, sal_uInt16 nNewPos); // Markierte Objekte die ausserhalb ihrer Page liegen // werden ggf. einer anderen Page zugewiesen diff --git a/include/svx/svdpagv.hxx b/include/svx/svdpagv.hxx index 2a485be..d4de159 100644 --- a/include/svx/svdpagv.hxx +++ b/include/svx/svdpagv.hxx @@ -119,8 +119,8 @@ private: void ImpInvalidateHelpLineArea(sal_uInt16 nNum) const; -void SetLayer(const String rName, SetOfByte rBS, sal_Bool bJa); -sal_Bool IsLayer(const String rName, const SetOfByte rBS) const; +void SetLayer(const OUString rName, SetOfByte rBS, bool bJa); +bool IsLayer(const OUString rName, const SetOfByte rBS) const; // Nachsehen, ob AktGroup noch Inserted ist. void CheckAktGroup(); @@ -195,8 +195,8 @@ public: Rectangle MarkBound() { return aMarkBound; } Rectangle MarkSnap() { return aMarkSnap; } -void SetLayerVisible(const String rName, sal_Bool bShow = sal_True) { SetLayer(rName, aLayerVisi, bShow); if(!bShow) AdjHdl(); InvalidateAllWin(); } -sal_Bool IsLayerVisible(const String rName) const { return IsLayer(rName, aLayerVisi); } +void SetLayerVisible(const OUString rName, bool bShow = true) { SetLayer(rName, aLayerVisi, bShow); if(!bShow) AdjHdl(); InvalidateAllWin(); } +bool IsLayerVisible(const OUString rName) const { return IsLayer(rName, aLayerVisi); } void SetLayerLocked(const String rName, sal_Bool bLock = sal_True) { SetLayer(rName, aLayerLock, bLock); if(bLock) AdjHdl(); } sal_Bool IsLayerLocked(const String rName) const { return IsLayer(rName,aLayerLock); } diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx index 2e9bc25..69bc1ff 100644 --- a/include/svx/svdpntv.hxx +++ b/include/svx/svdpntv.hxx @@ -353,8 +353,8 @@ public: virtual void AddWindowToPaintView(OutputDevice* pNewWin); virtual void DeleteWindowFromPaintView(OutputDevice* pOldWin); -void SetLayerVisible(const String rName, sal_Bool bShow=sal_True); -bool IsLayerVisible(const String rName) const; +void SetLayerVisible(const OUString rName, bool bShow=true); +bool IsLayerVisible(const OUString rName) const; void SetLayerLocked(const String rName, sal_Bool bLock=sal_True); bool IsLayerLocked(const String rName) const; diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx index 0194e05..d8ea1f4 100644 --- a/svx/source/svdraw/svdedtv.cxx +++ b/svx/source/svdraw/svdedtv.cxx @@ -102,7 +102,7 @@ SdrEditView::~SdrEditView() -SdrLayer* SdrEditView::InsertNewLayer(const XubString rName, sal_uInt16 nPos) +SdrLayer* SdrEditView::InsertNewLayer(const OUString rName, sal_uInt16 nPos) { SdrLayerAdmin rLA=pMod-GetLayerAdmin(); sal_uInt16 nMax=rLA.GetLayerCount(); @@ -196,7 +196,7 @@ void SdrEditView::ImpDelLayerDelObjs(SdrObjList* pOL, SdrLayerID nDelID) } } -void SdrEditView::DeleteLayer(const XubString rName) +void SdrEditView::DeleteLayer(const OUString rName) { SdrLayerAdmin rLA = pMod-GetLayerAdmin(); SdrLayer* pLayer = rLA.GetLayer(rName, sal_True); diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx index cd13358..310897d 100644 --- a/svx/source/svdraw/svdpagv.cxx +++ b/svx/source/svdraw/svdpagv.cxx @@ -612,7 +612,7 @@ void SdrPageView::AdjHdl() GetView().AdjustMarkHdl(); } -void SdrPageView::SetLayer(const XubString rName, SetOfByte rBS, sal_Bool bJa) +void SdrPageView::SetLayer(const OUString rName, SetOfByte rBS, bool bJa) { if(!GetPage()) return; @@ -623,16 +623,16 @@ void SdrPageView::SetLayer(const
[Libreoffice-commits] core.git: Branch 'feature/calc-online-spellcheck' - sc/source
sc/source/ui/view/dbfunc.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 71e5e82e3869310ecc39904b8068cedec0a247ca Author: Kohei Yoshida kohei.yosh...@gmail.com Date: Sun Sep 1 15:14:37 2013 -0400 Reset auto spell data after sorting. Change-Id: Ia42387e42cbc3c65f666fe28de917479c7262ff4 diff --git a/sc/source/ui/view/dbfunc.cxx b/sc/source/ui/view/dbfunc.cxx index 0bfc312..534e853 100644 --- a/sc/source/ui/view/dbfunc.cxx +++ b/sc/source/ui/view/dbfunc.cxx @@ -288,6 +288,8 @@ void ScDBFunc::Sort( const ScSortParam rSortParam, sal_Bool bRecord, sal_Bool b rSortParam.nDestTab ); MarkRange( aDestRange ); } + +ResetAutoSpell(); } // filters ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/dbfunc.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit a6a06e0f23a6aced46b9f0b899cd81bd8d2f2dec Author: Kohei Yoshida kohei.yosh...@gmail.com Date: Sun Sep 1 15:14:37 2013 -0400 Reset auto spell data after sorting. Change-Id: Ia42387e42cbc3c65f666fe28de917479c7262ff4 diff --git a/sc/source/ui/view/dbfunc.cxx b/sc/source/ui/view/dbfunc.cxx index 0bfc312..534e853 100644 --- a/sc/source/ui/view/dbfunc.cxx +++ b/sc/source/ui/view/dbfunc.cxx @@ -288,6 +288,8 @@ void ScDBFunc::Sort( const ScSortParam rSortParam, sal_Bool bRecord, sal_Bool b rSortParam.nDestTab ); MarkRange( aDestRange ); } + +ResetAutoSpell(); } // filters ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: About writeDBLoaderInfo function in dbloader.cxx (dbaccess module)
On Sun, Sep 01, 2013 at 12:39:25AM -0700, julien2412 [via Document Foundation Mail Archive] wrote: Lionel Elie Mamane wrote On the gripping hand, I can't find where the //Loader key is used afterwards either, so maybe my search-fu simply failed me. Or maybe the whole function is pointless. As an added bonus remark, it seems weird (but maybe innocuous) that it goes to extra pains to create //UNO/Loader and //Loader as opposed to /UNO/Loader and /Loader. I thought at first sight it would be //Loader and //UNO/Loader but then I noticed line 159 aImpl += DBContentLoader::getImplementationName_Static(); So in fact, it would be: /org.openoffice.comp.dbu.DBContentLoader/Loader and /org.openoffice.comp.dbu.DBContentLoader/UNO/Loader Yes, right. Missed that :) And searching more, I see that this function is actually never called... So actually, in this case, remove the whole function. And also the function of the same name in dbaccess/source/filter/xml/dbloader2.cxx ... About removing, I made an Opengrok search and found it was used there: dbaccess/source/ui/misc/uiservices.cxx (see http://opengrok.libreoffice.org/xref/core/dbaccess/source/ui/misc/uiservices.cxx#38) I'm not sure but if we remove the function, it means we should remove it too in uiservices.cxx and so change the interface/api, doesn't it? My understanding is that this is not used, that's just the declaration, the stuff that is usually put in headers (but here was repeated in every .c(xx) file where the function was used). The actual use was removed by commit 8e88ac109dc9eba88db92940d13933fc3a4393d8 Author: sb s...@openoffice.org Date: Fri Sep 10 13:10:07 2010 +0200 sb129: #i113189# change UNO components to use passive registration -- Lionel -- View this message in context: http://nabble.documentfoundation.org/About-writeDBLoaderInfo-function-in-dbloader-cxx-dbaccess-module-tp4072511p4072595.html Sent from the Dev mailing list archive at Nabble.com.___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
GSOC weekly report [Code completion in BASIC IDE]
Hi all, This is the report of my last two weeks. This week I had a lots of things to do, so I was mostly off(this week I have some pre-school thigs to do, so I'll mostly be off), but I've pulled, merged and rebuilt my work (will be pushed within a few days, I just need to get my laptop), I'll test it once more and push it into master. Previous week I've removed several smaller issues, simplified funtction CodeCompleteWindow::ResizeListBox (was renamed to ResizeAndPositionListBox ), recoded it's calculations, fixed some errors connected to the TextPaM class, fixed the arrow navigation to the left and right, etc. Regards, Gergő ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Update not working as expected?
Hi Julien, *, On Sun, Sep 1, 2013 at 9:15 AM, julien2412 serval2...@yahoo.fr wrote: Hi Pedro, I've just read about this comment: https://bugs.freedesktop.org/show_bug.cgi?id=67556#c2 In brief, 4.1 will be proposed via update checking when 4.1.3 or 4.1.4 will be released (see release plan here: That is for updates from one minor version to the next minor version. The current method for updating from A.B.C to A.B+1.Z is this: If Z is larger or equals Z, then an update is suggested. I.e. if you're running 4.0.2 and 4.1.0 is available, you won't get the update available message. But when 4.1.2 is available, and you're still on 4.0.2, then it would suggest the update for 4.1.2 This is the automatic rule that is in effect all the time. What you refer to is the decision when the new line is declared as stable even for conservative users and when a version is pushed to all users. But this is not what Pedro meant. It is as he found in the ESC Minutes - the new version has not been made available via the update method immediately. So despite 4.1.1 being released and available as final from the download page, the update-check will not yet suggest it. This is to have another round of feedback from the various system configurations that are impossible to cover by QA-Testing alone - even more so since the Windows and Linux builds have been compiled on a different machine than before. The update will be enabled tomorrow - but probably only in the afternoon, as I have to replace the HD in my system the second time within two weeks (since the SSD I had in use for only a week after the old hdd start dying also decided to crap out, so I'll have to replace that and restore my backup) ciao Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Build with jemalloc
Thanks for you reply. On Sat, 31 Aug 2013 12:20:04 +0200 Michael Stahl mst...@redhat.com wrote: although as far as i vaguely remember the really bad system memory allocators are in Windows XP and earlier; the Vista and newer allocators are said to be much better. It is a interesting things. I tried to watch memory usage on XP and 7, And the output is a little different. and i would suspect if LibreOffice requires more memory than MS Office it is most likely not because of the memory allocator but because of sub-optimal data structures in the application cores (plus some constant overhead because LibreOffice is portable and thus needs more platform abstraction layers). From my inspection, VCL calls quite many malloc/free pair (in the face, new() call of some objects). UI compornent on LibreOffice supported many platform, so it woud be unavoidable. i don't know why this does not work for the specific case of soffice.bin, because i don't know what symbols are in the extra libraries you link. perhaps there are different calling conventions in the jemalloc library and the soffice.bin objects or something like that, so it still picks up the allocator symbols from msvcrt.lib. Thank you your comment. I tested building avery small program with jemalloc, and it seems fine. So I check build related things again. this does not work on Windows because DLLs do not have a global symbol namespace, their namespace is local to each DLL. and every DLL knows not only the name of an imported symbol, but also which other DLL it is imported from. so i think what you would need to do to replace the memory allocator on Windows is to link _every_ DLL and executable against your custom allocator. Actually, I also tried to modify another link commands, almost passed the build but cli_maker was not. oh, and for quite a lot of classes in the code base a custom memory allocator is used anyway due to overloading operator new for the particular class, see include/tools/mempool.hxx and the underlying rtl_cache API in include/rtl/alloc.h. this implements a SLAB like allocator which is used for the most-used classes and should be quite efficient and reduce the fragmentation considerably. Sounds good. So I understand that LibreOffice supports jemalloc in many Unix-like systems but Windows is not. And many classes are used internal memory allocator on Unicos and Windows. Is this right? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Modificacion de Corrector de Lenguaje
Hola soy Desarrollador y me gustaría modificar el corrector ortográfico de Libreoffice para agregar un nuevo idioma el Guaraní para poder utilizarlo en nuestro pais si pudieran ayudarnos de algún modo con contactos o tutoriales que nos ayuden para el desarrollo. Desde ya muchas gracias. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
juan lopez te ha añadido a sus círculos y te ha invitado a entrar en Google+
juan lopez te ha añadido a sus círculos y te ha invitado a entrar en Google+. Haz clic aquí para empezar a utilizar Google+: https://plus.google.com/_/notifications/emlink?emr=02075156984695612420emid=CLig-JvJq7kCFUWg3godeQYAAApath=%2F%3Fgpinv%3DAMIXal91vUN__LRg3rEZRz8wT2zNHG9VPx3Ojd22geshNEYRcdsBv_3y4sqHTN6Gt9B5l4WZBhde2bZCImjjjNLoGwQ5xos8gSpQcfCNdx6k_Q4fk0OBOE4dt=1378085681109uob=10 Con Google+, compartir en la Web es casi como compartir en la vida real. Has recibido este mensaje porque juan lopez te ha invitado libreoffice@lists.freedesktop.org a entrar en Google+. Haz clic aquí para anular tu suscripción a estos correos electrónicos: https://plus.google.com/_/notifications/emlink?emr=02075156984695612420emid=CLig-JvJq7kCFUWg3godeQYAAApath=%2F_%2Fnonplus%2Femailsettings%3Fgpinv%3DAMIXal91vUN__LRg3rEZRz8wT2zNHG9VPx3Ojd22geshNEYRcdsBv_3y4sqHTN6Gt9B5l4WZBhde2bZCImjjjNLoGwQ5xos8gSpQcfCNdx6k_Q4fk0OBOE4%26est%3DADH5u8VIxQ1wwnPnPnVtWBLyfC3O8kH5_CnEW7Zn4a6GjcAp_5yjPG02TpVKE4mqGRI0OB7LVVQ7Gpdq8JRewvOxP2azwQREz5XfWUK0D6E5oOKE4cZLDKRfVHkPXX2RhBhEFA27HE4vtNY6kesO907wApupI1a5_o2z5wP2zIsto90kL4_nx3wdt=1378085681109uob=10 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-bugs] [Bug 40657] L10N LANGUAGE Settings defaults to incorrect LOCALE
https://bugs.freedesktop.org/show_bug.cgi?id=40657 --- Comment #5 from tommy27 ba...@quipo.it --- @At2010 I think this is the same issue as bug 55083. I know you reported this earlier than that one but expert developers are already on CC list over there. I pasted your useful informations in that bug report and added you to CC list. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 44323] Spell Dialog Does Not Add to Dict Immediately per Shown Text
https://bugs.freedesktop.org/show_bug.cgi?id=44323 Urmas davian...@gmail.com changed: What|Removed |Added CC||r...@sc3d.org --- Comment #1 from Urmas davian...@gmail.com --- *** Bug 56317 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 56317] Spell checker queries again for added words that occur more than once in dialog view
https://bugs.freedesktop.org/show_bug.cgi?id=56317 Urmas davian...@gmail.com changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE --- Comment #5 from Urmas davian...@gmail.com --- *** This bug has been marked as a duplicate of bug 44323 *** -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 48021] Spellcheck options not accessible unless there's a spelling error
https://bugs.freedesktop.org/show_bug.cgi?id=48021 Urmas davian...@gmail.com changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE --- Comment #3 from Urmas davian...@gmail.com --- *** This bug has been marked as a duplicate of bug 42935 *** -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 42935] Ease to open spelling options while editing a document with no misspelled words.
https://bugs.freedesktop.org/show_bug.cgi?id=42935 Urmas davian...@gmail.com changed: What|Removed |Added CC||rca...@gmail.com --- Comment #5 from Urmas davian...@gmail.com --- *** Bug 48021 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68751] Date Controls changed in Basic
https://bugs.freedesktop.org/show_bug.cgi?id=68751 --- Comment #4 from Lionel Elie Mamane lio...@mamane.lu --- (In reply to comment #3) I failed to find any release notes that warned me of this impending change. Good point. Added to https://wiki.documentfoundation.org/ReleaseNotes/4.1#Changes_to_UNO_APIs (the Basic error message was not exactly helpful) Yes, I agree. That's (half of) bug 40144. I was also a bit frantic since my Ubuntu LO 4.1 ppa wouldn't let me go back to 4.1.0 If you use aptitude as front-end, then the installation files (.debs) for everything you ever installed in the past are in /var/cache/apt/archives/ until you empty the cache (from the aptitude menu). Doesn't make it particularly easy to use them, though. Maybe Ubuntu has a service similar to snapshot.debian.org that archives past versions? Dunno. I'd never have guessed how to use the com.sun.star.util.Date type, so thanks for that. Star Basic is annoying with structures... Actually, since bug 42819 and bug 47263 are fixed (I forgot they were...), you could try: aDateControl.Date.Year = 2013 aDateControl.Date.Month = 5 aDateControl.Date.Day = 3 If it does not work, I'll make it a new Basic bug report / enhancement request. Note, however, that this is not strictly equivalent to my previous example. E.g. if the current value of the control is 2012-10-30, and DateMax is 2013-06-30, then the above will fail. This aDateControl.Date.Day = 3 aDateControl.Date.Month = 5 aDateControl.Date.Year = 2013 will succeed in this case, but fail if DateMin is 2012-10-15... -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68796] Other: missing msvcr100.dll
https://bugs.freedesktop.org/show_bug.cgi?id=68796 tommy27 ba...@quipo.it changed: What|Removed |Added CC||ba...@quipo.it --- Comment #1 from tommy27 ba...@quipo.it --- do you mean you had to install it twice to make it work? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 48507] EDITING: Suggestion for Guides (colors and lock)
https://bugs.freedesktop.org/show_bug.cgi?id=48507 tommy27 ba...@quipo.it changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO CC||ba...@quipo.it Ever confirmed|0 |1 --- Comment #3 from tommy27 ba...@quipo.it --- @Vitaliy could you please provide a screenshot of what you call guide ? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68791] Using OpenJDK instead of JAVA
https://bugs.freedesktop.org/show_bug.cgi?id=68791 --- Comment #1 from Urmas davian...@gmail.com --- The last thing LO needs is a bundled piece of insecure junk called Java. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68751] Date Controls changed in Basic
https://bugs.freedesktop.org/show_bug.cgi?id=68751 --- Comment #5 from t...@tim-passingham.co.uk --- Thanks for that. When I found the structure existed (by entering a date in the form and seeing what the attribute contained using the IDE) I saw that it contained Year, Month and Day. I then tried setting these in Basic but it failed. What seemed to happen is that until the Structure has been initialised in some way you can't just set the individual attributes. So oControl.Date.Year = 2013 fails unless the control has been initialised (eg by entering data manually in the form). However, setting the Date control to a local struct does work (ie oControl.Date = dDate where dDate is a com.sun.star.util.Date struct), and from then on the Year, Month etc can be set individually. Odd. Anyway, I think I have found fixed all my date time code now for this, so not too much of a problem :-) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68791] Using OpenJDK instead of JAVA
https://bugs.freedesktop.org/show_bug.cgi?id=68791 --- Comment #2 from david.vantyg...@free.fr --- Perhaps. But for three years, I'm asking when LibreOffice will not use anymore JAVA and each year, I've got the same answer : it will be done soon. I'm sure that in 10 years, LibreOffice will still need JAVA for databases etc. So, it would be a good idea to use OpenJDK instead of saying people download and install Oracle JAVA on java.fr. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68764] table borders appear different when printed
https://bugs.freedesktop.org/show_bug.cgi?id=68764 --- Comment #3 from link5...@hotmail.com --- Created attachment 84991 -- https://bugs.freedesktop.org/attachment.cgi?id=84991action=edit file used in example pictures -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 48851] VIEWING: Random display corruption of headings in document
https://bugs.freedesktop.org/show_bug.cgi?id=48851 tommy27 ba...@quipo.it changed: What|Removed |Added CC||ba...@quipo.it Summary|VIEWING, UI: Random display |VIEWING: Random display |corruption of headings in |corruption of headings in |document|document Version|3.5.2 release |3.4 all versions --- Comment #38 from tommy27 ba...@quipo.it --- it never happened in 3.3 or earlier (OO.org before that). It started in 3.4 and has been getting less frequent, but still happens. so I'm updating version field to 3.4 all versions. not reproducible on my 4.1.1 final release under Win7 64bit (but I know it's an hard to reproduce bug). have you tried upgrading to 4.1.1? do you still see this? and how frequent it is? once in a week? every day? does it happen just with .odt or even with .doc? what about graphic cards? do your computers have the same card or not? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68764] table borders appear different when printed
https://bugs.freedesktop.org/show_bug.cgi?id=68764 --- Comment #4 from link5...@hotmail.com --- Created attachment 84992 -- https://bugs.freedesktop.org/attachment.cgi?id=84992action=edit How it appears in Writer -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68764] table borders appear different when printed
https://bugs.freedesktop.org/show_bug.cgi?id=68764 --- Comment #5 from link5...@hotmail.com --- Created attachment 84993 -- https://bugs.freedesktop.org/attachment.cgi?id=84993action=edit How it appears in PDF or printed format -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68764] table borders appear different when printed
https://bugs.freedesktop.org/show_bug.cgi?id=68764 --- Comment #6 from link5...@hotmail.com --- Note about attached pictures: zoomed to 150% because dotted lines were invisible in Writer's page preview at 100% -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 55083] Locale wrongly taken as Default Language
https://bugs.freedesktop.org/show_bug.cgi?id=55083 Kumāra kumara.bhik...@gmail.com changed: What|Removed |Added OS|All |Windows (All) --- Comment #16 from Kumāra kumara.bhik...@gmail.com --- (In reply to comment #13) I wondered if you may have identified a different issue. So, I tried to explain to you how to replicate it. While doing so, I found that I can't replicate as before! Something must have changed in the latest version I'm using (4.1.1.2). However, as you experienced, upon restarting LibO, the bug become apparent again. Following my original report, the Replacements and exceptions for language: indicates Malay (Malaysia). This is consistent with the Locale setting (in Tools - Options - Language Settings - Languages). By right (according to my logic), it should follow Default languages for documents: Western (which I indicate as English (UK)). -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68795] mistake in language name: Assami should read Assamese
https://bugs.freedesktop.org/show_bug.cgi?id=68795 --- Comment #5 from Peter Maunder peter.maun...@wanadoo.fr --- In case this is of any interest. According to the Unicode 5.0 standard manual published in 2007 - page 312. Bengali: U+0980 - U+09FF is a North Indian script closely related to Devanagari (U+0900 - U+097F). It is used to write Bengali language primarily in the West Bengal state.It is also used to write Assamese in Assam and a number of other minority languages such as I notice that LibO 4.1.1 Writer en-GB spellchecker, and Firefox does pick up Assami as an incorrectly spelt word but allows Assam and Assamese. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68796] Other: missing msvcr100.dll
https://bugs.freedesktop.org/show_bug.cgi?id=68796 --- Comment #2 from yves.poi...@free.fr --- (In reply to comment #1) do you mean you had to install it twice to make it work? No, I unstalled the version 4.1.1 and re-install v4.1.0 that works fine. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68806] New: SIDEBAR: Wrong Paragraph spacing values right after file open
https://bugs.freedesktop.org/show_bug.cgi?id=68806 Priority: medium Bug ID: 68806 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: SIDEBAR: Wrong Paragraph spacing values right after file open Severity: normal Classification: Unclassified OS: All Reporter: momonas...@gmail.com Hardware: Other Status: UNCONFIRMED Version: 4.1.0.4 release Component: UI Product: LibreOffice Created attachment 84994 -- https://bugs.freedesktop.org/attachment.cgi?id=84994action=edit test-case Sidebar shows wrong values for spacing, right after opening a file. It affects both 4.1.0.4 and 4.1.1.2. Steps to reproduce: 1) Open Writer and type some text 2) Set some paragraph spacing (doesn't matter which of them) 3) Save the file close 4) Reopen the file 5) See the wrong values on sidebar (you can compare them with the ones from Paragraph dialog) For some reason, It doesn't happen with values 21 and if value = 30. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68806] SIDEBAR: Wrong Paragraph spacing values right after file open
https://bugs.freedesktop.org/show_bug.cgi?id=68806 Maxim momonas...@gmail.com changed: What|Removed |Added Attachment #84994|text/plain |application/vnd.oasis.opend mime type||ocument.text -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68806] SIDEBAR: Wrong Paragraph spacing values right after file open
https://bugs.freedesktop.org/show_bug.cgi?id=68806 --- Comment #1 from Maxim momonas...@gmail.com --- Created attachment 84995 -- https://bugs.freedesktop.org/attachment.cgi?id=84995action=edit Screenshot (LO 4.1.1.2 on Windows 7 32-bit) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 55083] Locale wrongly taken as Default Language
https://bugs.freedesktop.org/show_bug.cgi?id=55083 --- Comment #17 from tommy27 ba...@quipo.it --- (In reply to comment #16) (In reply to comment #13) I wondered if you may have identified a different issue. maybe it's a different issue... Default language for documents is the language to use when you open a blank new document. The option settings resets when I choose English (USA) and reverts to locale settings but sticks there when I choose other languages. This is certainly a bug. have you tried changing from English (UK) to USA and see if the change remains after closing or reverts to your Malaysian locale? p.s. (Language Settings / Language / Default language for documents / Western) So, I tried to explain to you how to replicate it. While doing so, I found that I can't replicate as before! Something must have changed in the latest version I'm using (4.1.1.2). However, as you experienced, upon restarting LibO, the bug become apparent again. Following my original report, the Replacements and exceptions for language: indicates Malay (Malaysia). I confirm this in autocorrect. Despite having set Default language for documents as English (Namibia), when I load the autocorrect options menu it loads my locale setting list Italian, if I change it to English (Namibia) it stays there until relaunch when Italian locale list lost pops out again. This is consistent with the Locale setting (in Tools - Options - Language Settings - Languages). By right (according to my logic), it should follow Default languages for documents: Western (which I indicate as English (UK)). as you may see the autocorrect replacement table follows the Locale Settings and not the Default language for documents. Unlike the bug I reported before there's no change in the Default language for documents user selection. I agree to your logic... autocorrect should follow Default language for documents. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68806] SIDEBAR: Wrong Paragraph spacing values right after file open
https://bugs.freedesktop.org/show_bug.cgi?id=68806 --- Comment #2 from Maxim momonas...@gmail.com --- Created attachment 84996 -- https://bugs.freedesktop.org/attachment.cgi?id=84996action=edit Screenshot (master on Windows 7 32-bit) The situation is even worse with master (4.2.0.0.alpha0+ Build ID: d6b4644da2c74500aa5ddfe69c36fc1f987bce0d TinderBox: Win-x86@6-debug, Branch:master, Time: 2013-08-31_22:06:59) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 40657] L10N LANGUAGE Settings defaults to incorrect LOCALE
https://bugs.freedesktop.org/show_bug.cgi?id=40657 tommy27 ba...@quipo.it changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|DUPLICATE |--- Version|3.5.0 Beta2 |3.4.3 release --- Comment #6 from tommy27 ba...@quipo.it --- I'm not sure it's a duplicate anymore... so I reopen and change status to NEEDINFO. what I need to know is if your bug still present with recent 4.0.5 or 4.1.1 releases. thanks and sorry for the noise. P.S. change version field to 3.4.3 since it's first version where the bug is reported. you should always indicate earlier version not last versione where the bug in present. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 40657] L10N LANGUAGE Settings defaults to incorrect LOCALE
https://bugs.freedesktop.org/show_bug.cgi?id=40657 tommy27 ba...@quipo.it changed: What|Removed |Added Status|REOPENED|NEEDINFO -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 55083] Locale wrongly taken as Default Language
https://bugs.freedesktop.org/show_bug.cgi?id=55083 --- Comment #18 from tommy27 ba...@quipo.it --- (In reply to comment #14) *** Bug 40657 has been marked as a duplicate of this bug. *** after reading better that bug description I think it's not a duplicate of the current one. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68619] REPORTBUILDER: Grouping fields do not work anymore
https://bugs.freedesktop.org/show_bug.cgi?id=68619 --- Comment #10 from franco.vi...@gmail.com --- In a new database, selecting the sum field I see in the data property Function, Table field, Sum, and context group. In the example I uploaded, I just see a User Function and it's name. In effect it works, but when opening a report for maintenance, the end user does not understand clearly what is running on the field. Finally, if you play with the dialog, you see that the functions are nested and the end-user is not able to manage the definition. In the first example, a report showing the data section correctly. In the second, a nested data section. In my opinion the exact behaviour odb has to use is the first. Franco. 2013/8/30 bugzilla-dae...@freedesktop.org *Comment # 9 https://bugs.freedesktop.org/show_bug.cgi?id=68619#c9 on bug 68619 https://bugs.freedesktop.org/show_bug.cgi?id=68619 from rob...@familiegrosskopf.de * (In reply to comment #8 https://bugs.freedesktop.org/show_bug.cgi?id=68619#c8) - On this field, try do sum esp-anno or something else numeric - After the choice SUM the dialog boxes are reset and swith to user functions What should be wrong with this behavior? LO creates a user-function, which builds a sum. I could see the same behavior in LO 3.3.4 and in LO 4.1.1.2. -- You are receiving this mail because: - You reported the bug. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68619] REPORTBUILDER: Grouping fields do not work anymore
https://bugs.freedesktop.org/show_bug.cgi?id=68619 --- Comment #11 from franco.vi...@gmail.com --- Created attachment 84998 -- https://bugs.freedesktop.org/attachment.cgi?id=84998action=edit attachment-21116-1.dat --- Comment #12 from franco.vi...@gmail.com --- Created attachment 84999 -- https://bugs.freedesktop.org/attachment.cgi?id=84999action=edit Schermata da 2013-09-01 11:19:25.png --- Comment #13 from franco.vi...@gmail.com --- Created attachment 85000 -- https://bugs.freedesktop.org/attachment.cgi?id=85000action=edit Schermata da 2013-09-01 11:20:30.png -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68689] UI: Rulers only available in tenths increments
https://bugs.freedesktop.org/show_bug.cgi?id=68689 --- Comment #3 from Caolán McNamara caol...@redhat.com --- Any reason not to allow 1/16 of an inch? Physical rulers are typically subdivided into 16ths e.g. http://www.mathatube.com/measurement-reading-a-ruler-starderd-unite.html -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68487] ooofilt_x64.dll causes permanent high CPU load via SearchFilterHost.exe
https://bugs.freedesktop.org/show_bug.cgi?id=68487 maspelic maspe...@gmail.com changed: What|Removed |Added CC||maspe...@gmail.com --- Comment #8 from maspelic maspe...@gmail.com --- Bug confirmed with 4.1.1.2 version on two Win8 machines. Full core CPU usage starts when windows search host tries to index open document file. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 67534] FILEOPEN SMB File claimed to be Locked By Unknown User when opened via double-click in Explorer
https://bugs.freedesktop.org/show_bug.cgi?id=67534 --- Comment #27 from Ivo i...@pehabo.nl --- Extra info Opening from windows explorer gives the problem (Linux bases synology network drive) Opening from LO with [File], [open] gives no problem whatsoever. So I think it is not a problem with the operating system (files locked or so) but within LO. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 53509] CONFIGURATION: English Language Dictionary always fails and has to be re-installed
https://bugs.freedesktop.org/show_bug.cgi?id=53509 tommy27 ba...@quipo.it changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO CC||ba...@quipo.it Ever confirmed|0 |1 --- Comment #3 from tommy27 ba...@quipo.it --- Micheal says his bug looks fixed (see https://bugs.freedesktop.org/show_bug.cgi?id=64004#c2) @Stephen Judge again, do you still see your reported bug in recent 4.0.5 or 4.1.1 LibO releases? changing status to NEEDINFO. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68764] table borders appear different when printed
https://bugs.freedesktop.org/show_bug.cgi?id=68764 tommy27 ba...@quipo.it changed: What|Removed |Added Status|UNCONFIRMED |NEW CC||mst...@redhat.com Version|unspecified |3.4.6 release Ever confirmed|0 |1 --- Comment #7 from tommy27 ba...@quipo.it --- tested under Win7 Pro 64bit 3.3.3 -- .odt input and .pdf output look the same 3.4.6 / 3.5.7 / 3.6.7 / 4.0.4 / 4.1.1 -- .odt input and .pdf output look different I confirm your bug also in 4.2.0.0.alpha0+ Build ID: 94730f359023a3e90fd6d5239a12a150f41f4dd2 TinderBox: Win-x86@39, Branch:master, Time: 2013-08-31_03:30:47 I set status to NEW and add Writer expert to CC list. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 57776] Bad strings cause word count to fail in Japanese
https://bugs.freedesktop.org/show_bug.cgi?id=57776 tommy27 ba...@quipo.it changed: What|Removed |Added OS|Mac OS X (All) |All Status|UNCONFIRMED |RESOLVED Resolution|--- |WORKSFORME CC||ba...@quipo.it --- Comment #8 from tommy27 ba...@quipo.it --- I reproduce the bug with 3.5.7 under Win7 64bit (chars count is 980/990) I don't reproduce it with LibO 4.1.1 (chars count is 980/980) marking as RESOLVED WORKSFORME do you still see this bug in recent 4.0.5 or 4.1.1 releases? if the bug is still there change it to REOPENED -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68808] New: EDITING: Font name combobox shows wrong font for fields when paragraph is RTL
https://bugs.freedesktop.org/show_bug.cgi?id=68808 Priority: medium Bug ID: 68808 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: EDITING: Font name combobox shows wrong font for fields when paragraph is RTL Severity: normal Classification: Unclassified OS: All Reporter: momonas...@gmail.com Hardware: Other Status: UNCONFIRMED Version: Inherited From OOo Component: Writer Product: LibreOffice Font name combobox shows wrong font for fields when paragraph directionality set to RTL. Steps to reproduce: 1) Open Writer and insert some field (like page number). 2) Make sure that the paragraph directionality set to RTL. 3) As you can see, the font that used to display the field is not the same font as displayed in the font combobox. If you'll switch to LTR, you'll see that the field displayed with the right font, but switching back to RTL reverts that. Extra steps: 4) Select the field and try to change the font name. 5) As you can see, the font combobox shows the new font name, while the field itself still displayed with another font. 6) If you change the directionality of the field to LTR, you'll see the font change, but if you switch back to RTL you won't. Workaround: Open Character dialog (Format-Character...) and set 'CTL Font'. It's a bug, since even if a field should be treated as CTL text when directionality = RTL, the font combobox should expose the CTL font as well. Affected Versions: Reproducible with OOo 3.3 and with all LO versions since then, including master ( 4.2.0.0.alpha0+ Build ID: d6b4644da2c74500aa5ddfe69c36fc1f987bce0d TinderBox: Win-x86@6-debug, Branch:master, Time: 2013-08-31_22:06:59). -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68771] Crash on launch on OS X
https://bugs.freedesktop.org/show_bug.cgi?id=68771 --- Comment #5 from James spa...@gmx.net --- Steve, any chance you can update your OS? Using OS X 10.8.4 I can not reproduce this problem. So might be related to OS X (which is a very old OS btw). -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 67917] Moving by word right moves to the beginning of next word, not end of current word on OS X
https://bugs.freedesktop.org/show_bug.cgi?id=67917 --- Comment #7 from James spa...@gmx.net --- Not sure if I agree. alt + right-arrow moves to beginning of the next word. If you end on the word you are in or end at the start of the next word is just a design choice. It does neither improve nor degrade a workflow. Boris, do you know if this is a recommendation in some Apple Design Guideline? If so, could you link to that? Just checked and indeed all other softwares behave as you describe, so for the sake of consistency this should be changed. Not sure if this goes for all platforms or only OS X, though. Khaled, this behavior is not new to LO 4.2. It exists already in 4.1.1.2. Not sure about older versions but I'd guess they behave the same. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68772] Other: LibreOffice (3.5.2.2) not listed in Control Panel
https://bugs.freedesktop.org/show_bug.cgi?id=68772 James spa...@gmx.net changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |WORKSFORME --- Comment #6 from James spa...@gmx.net --- As it is old unsupported version of LibreOffice I think that it is not so crucial to solve it so we can close that bug. I'll just install 4.1 Agreed. Tyle, if this re-appears with any of the newer versions, please re-open this bug and then I think it would be worht looking into this more closely. Setting to WORKSFORME since we are unsure if this is valid for newer versions. If for anybody this happens with a newer release please re-open. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 42434] 'mirror horizontally' and 'mirror vertically' icons look inverted
https://bugs.freedesktop.org/show_bug.cgi?id=42434 Ivan Timofeev timofeev@gmail.com changed: What|Removed |Added Status|NEW |ASSIGNED Assignee|libreoffice-b...@lists.free |timofeev@gmail.com |desktop.org | -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68801] EDITING: SOLID Status Bar
https://bugs.freedesktop.org/show_bug.cgi?id=68801 --- Comment #1 from James spa...@gmx.net --- Could you provide more info? What do you see? What do you expect instead? Please attach 1 or 2 screenshots displaying the issue and exact steps to reproduce. This will help tremendously in speeding up the process of confirming and successively fixing this bug. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68806] SIDEBAR: Wrong Paragraph spacing values right after file open
https://bugs.freedesktop.org/show_bug.cgi?id=68806 --- Comment #3 from Maxim momonas...@gmail.com --- (In reply to comment #0) For some reason, It doesn't happen with values 21 and if value = 30. I meant 0.21cm 0.30cm. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 48851] VIEWING: Random display corruption of headings in document
https://bugs.freedesktop.org/show_bug.cgi?id=48851 --- Comment #39 from James spa...@gmx.net --- Can't reproduce with LO 4.1.1.2 or 4.2 on OS X 10.8.4. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68771] Crash on launch on OS X
https://bugs.freedesktop.org/show_bug.cgi?id=68771 --- Comment #6 from Steve Piercy w...@stevepiercy.com --- (In reply to comment #5) Steve, any chance you can update your OS? Nope. I still need to use creaky, rusty, old 10.5.8 for certain apps. I have LO 4.0.5.2 installed and working on that Mac. Using OS X 10.8.4 I can not reproduce this problem. So might be related to OS X (which is a very old OS btw). On my other Mac, which uses 10.8.4, LO 4.1.1.2 rc works just fine. Maybe the bug is in the documentation and system requirements. http://www.libreoffice.org/download/system-requirements/ Macintosh The software and hardware prerequisites for installing on a Macintosh computer are as follows: MacOSX 10.4 (Tiger) or higher; I was surprised to see Tiger listed. If it is decided that LO 4.1.x will no longer support 10.5.x and earlier, then the sysreqs should indicate that decision. If support shall be continued, then I can provide further information, including crash logs. Here's what I got when I last tried to launch LO 4.1 on Mac 10.5.8: 8/30/13 2:18:34 PM [0x0-0x161c61b].org.libreoffice.script[91479] dyld: unknown required load command 0x8022 8/30/13 2:18:34 PM com.apple.launchd[1292] ([0x0-0x161c61b].org.libreoffice.script[91479]) Exited abnormally: Trace/BPT trap -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68619] REPORTBUILDER: Grouping fields do not work anymore
https://bugs.freedesktop.org/show_bug.cgi?id=68619 --- Comment #14 from rob...@familiegrosskopf.de --- I must test a little bit. I can reproduce this behavior with the attached example, but I can't reproduce it with a *.odb-file I created by myself. There it looks always like https://bugs.freedesktop.org/attachment.cgi?id=84999. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68619] REPORTBUILDER: Functions in fields were changed to user-defined-functions in properties of the field
https://bugs.freedesktop.org/show_bug.cgi?id=68619 rob...@familiegrosskopf.de changed: What|Removed |Added Summary|REPORTBUILDER: Grouping |REPORTBUILDER: Functions in |fields do not work anymore |fields were changed to ||user-defined-functions in ||properties of the field -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs