Re: [PATCH]fdo#52636:VIEWING: unintuitive Heading for 'Enable experimental Features
Hi Joel, On Wed, 2012-08-01 at 13:53 -0700, Joel Madero wrote: I'll fix both. I'll leave limited since it fits, I actually noticed that right after I sent out the email. What does that limited mean, can I ask? I can't really make that out. I'll be moving a lot of stuff around when I move the measurement unit to the general tree, maybe a good solution is moving the experimental stuff to its own tab. Well, the Java panel is quite empty (or at least its space isn't used very well). Renaming that to Advanced and putting the experiments section there might be viable. Astron. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-commits] Revert sorted_vector: turn Find parameter into template
On 08/01/2012 03:01 PM, Michael Stahl wrote: commit 8291d41667b1a63d35bf818aaf9d75529e1f12f0 Author: Michael Stahl mst...@redhat.com Date: Wed Aug 1 14:41:43 2012 +0200 Revert sorted_vector: turn Find parameter into template This reverts commit 3e3acee762fac71f7356ed1305a64e0278278081. It was a nice idea, but C++ is not yet ready for it; with the travesty of parametric polymorphism in C++ the find_unique inside the definition of find_unique actually refers to find_uniqueValue, Compare, so there is no way to actually refer to templateValue, Compare find_unique inside its definition. Thanks to Luboš Luňák for explaining the problem to me. Somehow this does work in GCC 4.7 even with -std=c++98, likely by accident. The way to refer to the find_unique template from within the class definition itself is with o3tl::find_unique. So much for language design. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - solenv/gbuild
solenv/gbuild/WinResTarget.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 996e1931e0a57e3c37b75308a7e1c391f83d16b0 Author: Michael Stahl mst...@redhat.com Date: Fri Jul 27 21:39:39 2012 +0200 gbuild: WinResTarget: fix dep-target dependencies: Windows specific fallout of 8b5a984d45005d3df1c89eae897d6e04612625d8, similar to 236055746ffe92ce3b2a7a9316b1083da046deb9; can be observed by building with make check from scratch, on the subsequentcheck target one res file depends on some lngconvex executable by way of a custom target in shell, which causes udkapi to rebuild itself before the make restart. Change-Id: I14f370a66f4ac5088da4af7eceede09f5a6bae84 (cherry picked from commit 8a05f1265e6307c34b2ffdb5fc5279870c8397b7) Signed-off-by: David Tardon dtar...@redhat.com diff --git a/solenv/gbuild/WinResTarget.mk b/solenv/gbuild/WinResTarget.mk index c8d5393..1731db6 100644 --- a/solenv/gbuild/WinResTarget.mk +++ b/solenv/gbuild/WinResTarget.mk @@ -27,7 +27,7 @@ endif endef ifeq ($(gb_FULLDEPS),$(true)) -$(call gb_WinResTarget_get_dep_target,%) : $(call gb_WinResTarget_get_target,%) +$(call gb_WinResTarget_get_dep_target,%) : $(call gb_WinResTarget__command_dep,$@,$*,$) endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED 3-6] Re: spurious IDL rebuilds on master fixed now
On Wed, Aug 01, 2012 at 11:04:01PM +0200, Michael Stahl wrote: then there was another problem that is Windows only, which is a spurious dep-target dependency in WinResTarget, fixed by the following commit, which would make sense for libreoffice-3-6 as well (but not -3-5 because the dependencies were different then): 8a05f1265e6307c34b2ffdb5fc5279870c8397b7 now it should hopefully be possible to run make check from scratch on Windows without having spurious rebuilds in make subsequentcheck. +1 D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: oowintool
oowintool |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 710202f71ce5b4aa3dc5bc9bc869031b7d1ccec5
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Aug 2 08:49:32 2012 +0200
Missing newline
Change-Id: I8dd2d6f059b027122657e5000b95298e874e51e8
diff --git a/oowintool b/oowintool
index 9afc1cd..c9d74f6 100755
--- a/oowintool
+++ b/oowintool
@@ -296,7 +296,7 @@ sub msvc_copy_msms($$)
}
foreach $fname (Microsoft_VC100_CRT_x86$postfix.msm) {
print STDERR Copying $msm_path/$fname to $dest\n;
-copy ($msm_path/$fname, $dest) || print copy failed: $!;
+copy ($msm_path/$fname, $dest) || print copy failed: $!\n;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 5 commits - sw/qa test/source writerfilter/source
sw/qa/extras/rtfimport/data/fdo49892.rtf | 238 +
sw/qa/extras/rtfimport/rtfimport.cxx | 24 ++
test/source/bootstrapfixture.cxx | 21 +-
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 16 +
writerfilter/source/rtftok/rtfdocumentimpl.hxx |3
writerfilter/source/rtftok/rtfsdrimport.cxx| 24 +-
6 files changed, 307 insertions(+), 19 deletions(-)
New commits:
commit 8a59191c15c6b22f825f999f633e1bbe2a7698b2
Author: Miklos Vajna vmik...@suse.cz
Date: Wed Aug 1 21:35:08 2012 +0200
test: string cleanup in BootstrapFixture
Change-Id: I468c295713fc34b64403a1c31f802820e6608b07
diff --git a/test/source/bootstrapfixture.cxx b/test/source/bootstrapfixture.cxx
index 86e2acb..b560913 100644
--- a/test/source/bootstrapfixture.cxx
+++ b/test/source/bootstrapfixture.cxx
@@ -48,10 +48,10 @@ using namespace ::com::sun::star;
static void aBasicErrorFunc( const String rErr, const String rAction )
{
-rtl::OStringBuffer aErr( Unexpected dialog: );
-aErr.append( rtl::OUStringToOString( rAction, RTL_TEXTENCODING_ASCII_US )
);
+OStringBuffer aErr( Unexpected dialog: );
+aErr.append( OUStringToOString( rAction, RTL_TEXTENCODING_ASCII_US ) );
aErr.append( Error: );
-aErr.append( rtl::OUStringToOString( rErr, RTL_TEXTENCODING_ASCII_US ) );
+aErr.append( OUStringToOString( rErr, RTL_TEXTENCODING_ASCII_US ) );
CPPUNIT_ASSERT_MESSAGE( aErr.getStr(), false);
}
@@ -72,29 +72,28 @@ void test::BootstrapFixture::setUp()
// force locale (and resource files loaded) to en-US
const LanguageType eLang=LANGUAGE_ENGLISH_US;
-rtl::OUString aLang, aCountry;
+OUString aLang, aCountry;
MsLangId::convertLanguageToIsoNames(eLang, aLang, aCountry);
-lang::Locale aLocale(aLang, aCountry, rtl::OUString());
+lang::Locale aLocale(aLang, aCountry, OUString());
ResMgr::SetDefaultLocale( aLocale );
if (m_bNeedUCB)
{
// initialise UCB-Broker
uno::Sequenceuno::Any aUcbInitSequence(2);
-aUcbInitSequence[0] =
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Local));
-aUcbInitSequence[1] =
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Office));
+aUcbInitSequence[0] = OUString(Local);
+aUcbInitSequence[1] = OUString(Office);
bool bInitUcb = ucbhelper::ContentBroker::initialize(m_xSFactory,
aUcbInitSequence);
CPPUNIT_ASSERT_MESSAGE(Should be able to initialize UCB, bInitUcb);
uno::Referenceucb::XContentProviderManager xUcb =
ucbhelper::ContentBroker::get()-getContentProviderManagerInterface();
-uno::Referenceucb::XContentProvider
xFileProvider(m_xSFactory-createInstance(
-
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.ucb.FileContentProvider))),
uno::UNO_QUERY);
-xUcb-registerContentProvider(xFileProvider,
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(file)), sal_True);
+uno::Referenceucb::XContentProvider
xFileProvider(m_xSFactory-createInstance(com.sun.star.ucb.FileContentProvider),
uno::UNO_QUERY);
+xUcb-registerContentProvider(xFileProvider, file, sal_True);
}
SvtSysLocaleOptions aLocalOptions;
-rtl::OUString aLangISO = MsLangId::convertLanguageToIsoString(
LANGUAGE_ENGLISH_US );
+OUString aLangISO = MsLangId::convertLanguageToIsoString(
LANGUAGE_ENGLISH_US );
aLocalOptions.SetLocaleConfigString( aLangISO );
aLocalOptions.SetUILocaleConfigString( aLangISO );
commit 881a08079cee9363abd9c1d8e6b86465a2868a30
Author: Miklos Vajna vmik...@suse.cz
Date: Wed Aug 1 21:03:58 2012 +0200
fdo#49892 testcase
Change-Id: I22cae445e5a75563e3c69ac890126292358b9749
diff --git a/sw/qa/extras/rtfimport/data/fdo49892.rtf
b/sw/qa/extras/rtfimport/data/fdo49892.rtf
new file mode 100644
index 000..29cd4f0
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo49892.rtf
@@ -0,0 +1,238 @@
+{\rtf1\ansi\ansicpg1251\deff0\deflang1033
+{\fonttbl
+{\f0\froman\fcharset204 Times New Roman;}
+}
+{\colortbl;\red0\green0\blue0;}
+\landscape\paperw16836\paperh11904\margl360\margr360\margt360\margb360\gutter0\windowctrl\ftnbj\viewkind1\viewscale100\sectd\linex0\sbknone
+{\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1024\langfe1024\noproof\insrsid14249094
+{\shp
+{\*\shpinst\shpleft1275\shptop-135\shpright3045\shpbottom720\shpfhdr0\shpbxcolumn\shpbxignore\shpbypara\shpbyignore\shpwr3\shpwrk0\shpfblwtxt0\shpz2\shplid1026
+{\sp{\sn wzDescription}{\sv blue}}
+{\sp
+{\sn shapeType}
+{\sv 1}
+}
+{\sp
+{\sn fFlipH}
+{\sv 0}
+}
+{\sp
+{\sn fFlipV}
+{\sv 0}
+}
+{\sp
+{\sn fillColor}
+{\sv 12419407}
+}
+{\sp
+{\sn lineColor}
+{\sv 15921906}
+}
+{\sp
+{\sn lineWidth}
+{\sv 38100}
+}
+{\sp
+{\sn shadowType}
+{\sv 2}
+}
+{\sp
+{\sn shadowColor}
+{\sv 6307620}
+}
+{\sp
+{\sn shadowOpacity}
+{\sv 32768}
+}
+{\sp
+{\sn shadowOffsetX}
+{\sv 12700}
+}
+{\sp
+{\sn shadowSecondOffsetX}
+{\sv -12700}
+}
+{\sp
+{\sn fShadow}
+{\sv 1}
+}
+{\sp
+{\sn dhgt}
Re: [GSOC] Template Dialog - Report
Hi David, BTW, I'm Rafael's mentor, so don't worry about him knowing CMIS ;) On Wed, 2012-08-01 at 16:55 +0300, David Nelson wrote: I'm not sure if you're aware of this, but there is a functioning Alfresco platform at http://alfresco.libreoffice.org running on an independent VPS. You'd be welcome to make use of it if you like... That won't help us ATM: he was mentioning setting up a simple test instance. Our real work will be to enable CMIS on the templates repository (based on plone). -- Cedric ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-6]: fdo#49892 implement RTF import of dhgt shape property
From Miklos Vajna vmik...@suse.cz: Miklos Vajna has uploaded a new change for review. Change subject: fdo#49892 implement RTF import of dhgt shape property .. fdo#49892 implement RTF import of dhgt shape property Change-Id: I36d574c5f7915d732c6c158fadb91b6032370a01 (cherry picked from commit ce701e94db740ea8c2bb9f6dcf55a2aeda4d71af) --- M writerfilter/source/rtftok/rtfsdrimport.cxx 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/58/358/1 -- To view, visit https://gerrit.libreoffice.org/358 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I36d574c5f7915d732c6c158fadb91b6032370a01 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-6]: fdo#49892 import RTF_SHPB{X, Y}PAGE
From Miklos Vajna vmik...@suse.cz:
Miklos Vajna has uploaded a new change for review.
Change subject: fdo#49892 import RTF_SHPB{X,Y}PAGE
..
fdo#49892 import RTF_SHPB{X,Y}PAGE
(cherry picked from commit 2111c6e6dc18f3ffd11de176791ecc04bab41afb)
Conflicts:
writerfilter/source/rtftok/rtfdocumentimpl.cxx
Change-Id: I8fe2b28f44ee61fc0f1438de3681fd86b16d29ae
---
M writerfilter/source/rtftok/rtfdocumentimpl.cxx
M writerfilter/source/rtftok/rtfdocumentimpl.hxx
M writerfilter/source/rtftok/rtfsdrimport.cxx
3 files changed, 23 insertions(+), 0 deletions(-)
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/57/357/1
--
To view, visit https://gerrit.libreoffice.org/357
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8fe2b28f44ee61fc0f1438de3681fd86b16d29ae
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Miklos Vajna vmik...@suse.cz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 3 commits - canvas/source cosv/Makefile cosv/Module_cosv.mk cosv/Package_inc.mk cosv/prj cosv/source cosv/StaticLibrary_cosv.mk cosv/util Repository.mk sfx2/source solenv/inc
Repository.mk |1
canvas/source/directx/dx_textlayout_drawhelper.cxx |2
cosv/Makefile |7 ++
cosv/Module_cosv.mk| 16 +
cosv/Package_inc.mk| 36
cosv/StaticLibrary_cosv.mk | 34 +++
cosv/prj/build.lst | 12
cosv/prj/d.lst |8 --
cosv/source/comphelp/makefile.mk | 46 ---
cosv/source/fullcpp.mk | 35 ---
cosv/source/inc/precomp.h | 36
cosv/source/service/makefile.mk| 49
cosv/source/storage/makefile.mk| 43 --
cosv/source/strings/makefile.mk| 49
cosv/source/unittest/makefile.mk | 63 -
cosv/util/makefile.mk | 49
sfx2/source/appl/appdde.cxx|8 +-
sfx2/source/appl/lnkbase2.cxx |4 -
solenv/inc/libs.mk |4 -
svl/inc/svl/svdde.hxx | 18 +++---
svl/source/svdde/ddecli.cxx|4 -
svl/source/svdde/ddedata.cxx |2
svl/source/svdde/ddeimp.hxx|7 +-
svl/source/svdde/ddestrg.cxx | 10 +--
svl/source/svdde/ddesvr.cxx| 34 +--
svl/unx/source/svdde/ddedummy.cxx | 14 ++--
svx/source/dialog/sendreportw32.cxx|2
sw/source/ui/envelp/envimg.cxx |2
tools/inc/tools/string.hxx |7 --
tools/source/string/strascii.cxx | 36
tools/source/string/strimp.cxx | 28 -
tools/source/string/tustring.cxx | 37
unusedcode.easy|4 -
vcl/win/source/gdi/salgdi3.cxx | 10 +--
vcl/win/source/gdi/salprn.cxx |8 +-
vcl/win/source/window/salframe.cxx |8 +-
36 files changed, 166 insertions(+), 567 deletions(-)
New commits:
commit d4b172b8196de05bb4efa39e19a2b324cf0b2778
Author: Caolán McNamara caol...@redhat.com
Date: Thu Aug 2 08:44:10 2012 +0100
strip down UniString some more
Change-Id: Ibd749a70a7bbe8c1023edf7bd144aa6547147a12
diff --git a/canvas/source/directx/dx_textlayout_drawhelper.cxx
b/canvas/source/directx/dx_textlayout_drawhelper.cxx
index f804a60..3dca360 100644
--- a/canvas/source/directx/dx_textlayout_drawhelper.cxx
+++ b/canvas/source/directx/dx_textlayout_drawhelper.cxx
@@ -201,7 +201,7 @@ namespace dxcanvas
const Point aEmptyPoint(0, 0);
// create the String
-const String aText(rText.Text.getStr());
+const rtl::OUString aText(rText.Text);
if( rLogicalAdvancements.getLength() )
{
diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx
index 280dbf3..94067d9 100644
--- a/sfx2/source/appl/appdde.cxx
+++ b/sfx2/source/appl/appdde.cxx
@@ -66,7 +66,7 @@ public:
ImplDdeService( const String rNm )
: DdeService( rNm )
{}
-virtual sal_Bool MakeTopic( const String );
+virtual sal_Bool MakeTopic( const rtl::OUString );
virtual String Topics();
@@ -110,7 +110,7 @@ namespace
}
}
-sal_Bool ImplDdeService::MakeTopic( const String rNm )
+sal_Bool ImplDdeService::MakeTopic( const rtl::OUString rNm )
{
// Workaround for Event after Main() under OS/2
// happens when exiting starts the App again
@@ -223,7 +223,7 @@ public:
virtual sal_Bool Put( const DdeData* );
virtual sal_Bool Execute( const String* );
virtual sal_Bool StartAdviseLoop();
-virtual sal_Bool MakeItem( const String rItem );
+virtual sal_Bool MakeItem( const rtl::OUString rItem );
};
@@ -664,7 +664,7 @@ sal_Bool SfxDdeDocTopic_Impl::Execute( const String* pStr )
return 0 != nRet;
}
-sal_Bool SfxDdeDocTopic_Impl::MakeItem( const String rItem )
+sal_Bool SfxDdeDocTopic_Impl::MakeItem( const rtl::OUString rItem )
{
AddItem( DdeItem( rItem ) );
return sal_True;
diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx
index a2b7410..755e6d6 100644
--- a/sfx2/source/appl/lnkbase2.cxx
+++ b/sfx2/source/appl/lnkbase2.cxx
@@ -603,7 +603,7 @@ static DdeTopic* FindTopic( const String rLinkName,
sal_uInt16* pItemStt )
String sNm( rLinkName );
sal_uInt16 nTokenPos = 0;
-String sService( sNm.GetToken( 0, cTokenSeperator, nTokenPos ) );
+rtl::OUString sService( sNm.GetToken( 0, cTokenSeperator, nTokenPos ) );
[PATCH] Change in core[libreoffice-3-5]: fdo#49892 import RTF_SHPB{X, Y}PAGE
From Miklos Vajna vmik...@suse.cz:
Miklos Vajna has uploaded a new change for review.
Change subject: fdo#49892 import RTF_SHPB{X,Y}PAGE
..
fdo#49892 import RTF_SHPB{X,Y}PAGE
(cherry picked from commit 2111c6e6dc18f3ffd11de176791ecc04bab41afb)
Conflicts:
writerfilter/source/rtftok/rtfdocumentimpl.cxx
Change-Id: I8fe2b28f44ee61fc0f1438de3681fd86b16d29ae
---
M writerfilter/source/rtftok/rtfdocumentimpl.cxx
M writerfilter/source/rtftok/rtfdocumentimpl.hxx
M writerfilter/source/rtftok/rtfsdrimport.cxx
3 files changed, 23 insertions(+), 0 deletions(-)
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/59/359/1
--
To view, visit https://gerrit.libreoffice.org/359
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8fe2b28f44ee61fc0f1438de3681fd86b16d29ae
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-5
Gerrit-Owner: Miklos Vajna vmik...@suse.cz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: svtools/source unusedcode.easy
svtools/source/misc/itemdel.cxx | 18 -- unusedcode.easy |1 - 2 files changed, 19 deletions(-) New commits: commit 7480f766e95368fb1418dcfd9470f73b5ef3440e Author: Caolán McNamara caol...@redhat.com Date: Thu Aug 2 09:07:47 2012 +0100 remove now pointless pItemDesruptList This pItemDesruptList is pointless now. We're registering the delete-when-idle items in their ctor's and deregistering in their dtor's which get called from the idle callback. The idea of pItemDesruptList appears to be for use in deleting any items at exit time whose idle callback didn't get called already. Which was done by DeleteOnIdleItems which itself was removed a while ago because nothing was calling it (for years). Some experiments in making it a simple singleton and/or one that hooks off default component dispose or XDesktop dispose shows that its crash city, so lets just remove the unused stuff outright rather than trying to fight to get some 12+ year unused appendix used. Change-Id: Ie0256d6987cf89a2a12db297065af09674547b3e diff --git a/svtools/source/misc/itemdel.cxx b/svtools/source/misc/itemdel.cxx index 5d4daca..f620a7e 100644 --- a/svtools/source/misc/itemdel.cxx +++ b/svtools/source/misc/itemdel.cxx @@ -55,10 +55,6 @@ public: ~SfxItemDesruptor_Impl(); }; -typedef std::vectorSfxItemDesruptor_Impl* SfxItemDesruptorList_Impl; - -static SfxItemDesruptorList_Impl *pItemDesruptList = NULL; - // SfxItemDesruptor_Impl::SfxItemDesruptor_Impl( SfxPoolItem *pItemToDesrupt ): pItem(pItemToDesrupt), @@ -71,13 +67,6 @@ SfxItemDesruptor_Impl::SfxItemDesruptor_Impl( SfxPoolItem *pItemToDesrupt ): // im Idle abarbeiten GetpApp()-InsertIdleHdl( aLink, 1 ); - -// und in Liste eintragen (damit geflusht werden kann) -SfxItemDesruptorList_Impl* rpList = pItemDesruptList; -if ( !rpList ) -rpList = new SfxItemDesruptorList_Impl; -SfxItemDesruptor_Impl *pThis = this; -rpList-push_back( pThis ); } // @@ -88,13 +77,6 @@ SfxItemDesruptor_Impl::~SfxItemDesruptor_Impl() // aus Idle-Handler austragen GetpApp()-RemoveIdleHdl( aLink ); -// und aus Liste austragen -SfxItemDesruptorList_Impl* rpList = pItemDesruptList; -DBG_ASSERT( rpList, no DesruptorList ); -const SfxItemDesruptor_Impl *pThis = this; -if ( rpList ) HACK(warum?) -rpList-erase( std::find( rpList-begin(), rpList-end(), pThis ) ); - // reset RefCount (was set to SFX_ITEMS_SPECIAL before!) pItem-SetRefCount( 0 ); //DBG_CHKOBJ( pItem, SfxPoolItem, 0 ); diff --git a/unusedcode.easy b/unusedcode.easy index 25f2c4d..74d4aa0 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -139,5 +139,4 @@ sd::LeftImpressPaneShell::RegisterInterface(SfxModule*) sd::ToolPanelPaneShell::RegisterInterface(SfxModule*) sd::ViewShellBase::RegisterFactory(unsigned short) std::__cxx1998::vectorSfxFilter*, std::allocatorSfxFilter* ::~vector() -std::__cxx1998::vectorSfxItemDesruptor_Impl*, std::allocatorSfxItemDesruptor_Impl* ::~vector() std::__cxx1998::vectorstd::pairstd::basic_stringchar, std::char_traitschar, std::allocatorchar , std::basic_stringchar, std::char_traitschar, std::allocatorchar , std::allocatorstd::pairstd::basic_stringchar, std::char_traitschar, std::allocatorchar , std::basic_stringchar, std::char_traitschar, std::allocatorchar::~vector() ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/aqua
vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c87e4eb383975b7c16bd696e27750bc711555ae5 Author: Caolán McNamara caol...@redhat.com Date: Thu Aug 2 09:17:06 2012 +0100 mac-only UniString from sal_Unicode* Change-Id: If6432543c194668075b5b0a821e4bad8d7dd4839 diff --git a/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx b/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx index 346fd6b..ba75744 100644 --- a/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx +++ b/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx @@ -307,7 +307,7 @@ static bool GetDevFontAttributes( ATSUFontID nFontID, ImplDevFontAttributes rDF // convert to unicode name UniString aUtf16Name; if( eEncoding == RTL_TEXTENCODING_UNICODE ) // we are just interested in UTF16 encoded names -aUtf16Name = UniString( (const sal_Unicode*)aNameBuffer[0], nNameLength/2 ); +aUtf16Name = rtl::OUString( (const sal_Unicode*)aNameBuffer[0], nNameLength/2 ); else if( eEncoding == RTL_TEXTENCODING_UCS4 ) aUtf16Name = UniString(); // TODO else // assume the non-unicode encoded names are byte encoded ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: comphelper/inc
comphelper/inc/comphelper/newarray.hxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit cf2bdd65945d2a02af44db535cf1964d4d09ae20
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Thu Aug 2 10:16:40 2012 +0200
Fix windows build where min and max are macros
Change-Id: I59186db4003564b0b9c202456b7fdf91eaa67751
diff --git a/comphelper/inc/comphelper/newarray.hxx
b/comphelper/inc/comphelper/newarray.hxx
index d7ce756..b64095a 100644
--- a/comphelper/inc/comphelper/newarray.hxx
+++ b/comphelper/inc/comphelper/newarray.hxx
@@ -29,7 +29,7 @@ namespace comphelper {
templatetypename T T *
newArray_null(size_t const n) throw()
{
-if ((::std::numeric_limitssize_t::max() / sizeof(T)) = n) {
+if (((::std::numeric_limitssize_t::max)() / sizeof(T)) = n) {
return 0;
}
return new (::std::nothrow) T[n];
@@ -38,7 +38,7 @@ newArray_null(size_t const n) throw()
templatetypename T T *
newArray_ex(size_t const n)
{
-if ((::std::numeric_limitssize_t::max() / sizeof(T)) = n) {
+if (((::std::numeric_limitssize_t::max)() / sizeof(T)) = n) {
throw ::std::bad_alloc();
}
return new T[n];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/filter/ww8/docxattributeoutput.cxx | 25 ++---
sw/source/filter/ww8/docxattributeoutput.hxx |2 +-
2 files changed, 15 insertions(+), 12 deletions(-)
New commits:
commit 0e4846ec20c1aefc554037e8f08255019c08da47
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Thu Aug 2 10:20:59 2012 +0200
fdo#52610: Fixed several docx export bugs
+ hyperlink starting before a field and ending in its results isn't
valid.
+ when footnotes have hyperlinks we need to add the proper XML
namespace and output the relations to a different file.
Change-Id: I1c6cb8acba21c35e10bb0497eeaf96bbd73730d1
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index f9df2d1..3cb9d85 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -534,14 +534,6 @@ void DocxAttributeOutput::EndRun()
m_pSerializer-endElementNS( XML_w, XML_hyperlink );
m_closeHyperlinkInPreviousRun = false;
}
-// prepend the actual run start
-if ( m_pHyperlinkAttrList )
-{
-XFastAttributeListRef xAttrList ( m_pHyperlinkAttrList );
-
-m_pSerializer-startElementNS( XML_w, XML_hyperlink, xAttrList );
-m_pHyperlinkAttrList = NULL;
-}
// Write the hyperlink and toc fields starts
for ( std::vectorFieldInfos::iterator pIt = m_Fields.begin(); pIt !=
m_Fields.end(); )
@@ -560,6 +552,15 @@ void DocxAttributeOutput::EndRun()
++pIt;
}
+// Start the hyperlink after the fields separators or we would generate
invalid file
+if ( m_pHyperlinkAttrList )
+{
+XFastAttributeListRef xAttrList ( m_pHyperlinkAttrList );
+
+m_pSerializer-startElementNS( XML_w, XML_hyperlink, xAttrList );
+m_pHyperlinkAttrList = NULL;
+}
+
DoWriteBookmarks( );
WriteCommentRanges();
@@ -1216,9 +1217,10 @@ bool DocxAttributeOutput::StartURL( const String rUrl,
const String rTarget )
{
OUString osUrl( sUrl );
-::rtl::OString sId = m_rExport.AddRelation(
-S(
http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink;
),
-osUrl );
+OString sId = rtl::OUStringToOString(
GetExport().GetFilter().addRelation( m_pSerializer-getOutputStream(),
+S(
http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink;
),
+osUrl, true ), RTL_TEXTENCODING_UTF8 );
+
m_pHyperlinkAttrList-add( FSNS( XML_r, XML_id), sId.getStr());
}
else
@@ -3508,6 +3510,7 @@ void DocxAttributeOutput::FootnotesEndnotes( bool
bFootnotes )
m_pSerializer-startElementNS( XML_w, nBody,
FSNS( XML_xmlns, XML_w ),
http://schemas.openxmlformats.org/wordprocessingml/2006/main;,
+FSNS( XML_xmlns, XML_r ),
http://schemas.openxmlformats.org/officeDocument/2006/relationships;,
FSEND );
sal_Int32 nIndex = 0;
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx
b/sw/source/filter/ww8/docxattributeoutput.hxx
index ca863ae..1761009 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -613,7 +613,7 @@ public:
virtual DocxExport GetExport();
const DocxExport GetExport() const { return const_cast
DocxAttributeOutput* ( this )-GetExport(); }
-/// For eg. the output of the styles, we need to switch the serializer to
enother one.
+/// For eg. the output of the styles, we need to switch the serializer to
an other one.
void SetSerializer( ::sax_fastparser::FSHelperPtr pSerializer ) {
m_pSerializer = pSerializer; }
/// Occasionnaly need to use this serializer from the outside
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sw/source
sw/source/filter/ww8/docxattributeoutput.cxx | 25 ++---
sw/source/filter/ww8/docxattributeoutput.hxx |2 +-
2 files changed, 15 insertions(+), 12 deletions(-)
New commits:
commit 11cfa8bd5fb734ce3d2ee3b9370745fc8ad5c7f9
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Thu Aug 2 10:20:59 2012 +0200
fdo#52610: Fixed several docx export bugs
+ hyperlink starting before a field and ending in its results isn't
valid.
+ when footnotes have hyperlinks we need to add the proper XML
namespace and output the relations to a different file.
Change-Id: I1c6cb8acba21c35e10bb0497eeaf96bbd73730d1
(cherry picked from commit 0e4846ec20c1aefc554037e8f08255019c08da47)
Signed-off-by: Miklos Vajna vmik...@suse.cz
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 4737501..71d39af 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -548,14 +548,6 @@ void DocxAttributeOutput::EndRun()
m_pSerializer-endElementNS( XML_w, XML_hyperlink );
m_closeHyperlinkInPreviousRun = false;
}
-// prepend the actual run start
-if ( m_pHyperlinkAttrList )
-{
-XFastAttributeListRef xAttrList ( m_pHyperlinkAttrList );
-
-m_pSerializer-startElementNS( XML_w, XML_hyperlink, xAttrList );
-m_pHyperlinkAttrList = NULL;
-}
// Write the hyperlink and toc fields starts
for ( std::vectorFieldInfos::iterator pIt = m_Fields.begin(); pIt !=
m_Fields.end(); )
@@ -574,6 +566,15 @@ void DocxAttributeOutput::EndRun()
++pIt;
}
+// Start the hyperlink after the fields separators or we would generate
invalid file
+if ( m_pHyperlinkAttrList )
+{
+XFastAttributeListRef xAttrList ( m_pHyperlinkAttrList );
+
+m_pSerializer-startElementNS( XML_w, XML_hyperlink, xAttrList );
+m_pHyperlinkAttrList = NULL;
+}
+
DoWriteBookmarks( );
m_pSerializer-startElementNS( XML_w, XML_r, FSEND );
@@ -1213,9 +1214,10 @@ bool DocxAttributeOutput::StartURL( const String rUrl,
const String rTarget )
{
OUString osUrl( sUrl );
-::rtl::OString sId = m_rExport.AddRelation(
-S(
http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink;
),
-osUrl );
+OString sId = rtl::OUStringToOString(
GetExport().GetFilter().addRelation( m_pSerializer-getOutputStream(),
+S(
http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink;
),
+osUrl, true ), RTL_TEXTENCODING_UTF8 );
+
m_pHyperlinkAttrList-add( FSNS( XML_r, XML_id), sId.getStr());
}
else
@@ -3543,6 +3545,7 @@ void DocxAttributeOutput::FootnotesEndnotes( bool
bFootnotes )
m_pSerializer-startElementNS( XML_w, nBody,
FSNS( XML_xmlns, XML_w ),
http://schemas.openxmlformats.org/wordprocessingml/2006/main;,
+FSNS( XML_xmlns, XML_r ),
http://schemas.openxmlformats.org/officeDocument/2006/relationships;,
FSEND );
sal_Int32 nIndex = 0;
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx
b/sw/source/filter/ww8/docxattributeoutput.hxx
index 3c855cf..788905f 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -612,7 +612,7 @@ public:
virtual DocxExport GetExport();
const DocxExport GetExport() const { return const_cast
DocxAttributeOutput* ( this )-GetExport(); }
-/// For eg. the output of the styles, we need to switch the serializer to
enother one.
+/// For eg. the output of the styles, we need to switch the serializer to
an other one.
void SetSerializer( ::sax_fastparser::FSHelperPtr pSerializer ) {
m_pSerializer = pSerializer; }
/// Occasionnaly need to use this serializer from the outside
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/fdo51034.odt|binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |9 +
writerfilter/source/dmapper/DomainMapper_Impl.cxx |2 +-
3 files changed, 10 insertions(+), 1 deletion(-)
New commits:
commit 6ff70708b4a39011a61aa0f53541eb7eec09c813
Author: Miklos Vajna vmik...@suse.cz
Date: Thu Aug 2 10:57:07 2012 +0200
fdo#51034 testcase
Change-Id: I9a7a4e596ffb14cdcb211ff0d905c66831d30708
diff --git a/sw/qa/extras/ooxmlexport/data/fdo51034.odt
b/sw/qa/extras/ooxmlexport/data/fdo51034.odt
new file mode 100644
index 000..9720cfb
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo51034.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 02f66a2..020bffd 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -42,6 +42,7 @@ public:
void defaultTabStopNotInStyles();
void testFdo38244();
void testMathEscape();
+void testFdo51034();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -52,6 +53,7 @@ public:
#if !(__GNUC__ == 4 __GNUC_MINOR__ == 4)
CPPUNIT_TEST(testMathEscape);
#endif
+CPPUNIT_TEST(testFdo51034);
#endif
CPPUNIT_TEST_SUITE_END();
@@ -170,6 +172,13 @@ void Test::testMathEscape()
CPPUNIT_ASSERT_EQUAL(OUString(\\{ left [ right ] left ( right ) \\}),
getFormula(getRun(getParagraph(1), 1)));
}
+void Test::testFdo51034()
+{
+// The problem was that the 'l' param of the HYPERLINK field was parsed
with = #, not += #.
+roundtrip(fdo51034.odt);
+CPPUNIT_ASSERT_EQUAL(OUString(http://Www.google.com/#a;),
getPropertyOUString(getRun(getParagraph(1), 1), HyperLinkURL));
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
commit 9c53a7f94f3bdcb694498db335a01af25257853a
Author: Miklos Vajna vmik...@suse.cz
Date: Thu Aug 2 10:49:02 2012 +0200
fdo#51034 fix docx import of HYPERLINK field, l param
Change-Id: Ic6896f7c795d7d303bf7589a74afb937d4a8e8b5
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index ebee085..164a2d4 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -2871,7 +2871,7 @@ void DomainMapper_Impl::CloseFieldCommand()
if (aPartIt == aItEnd)
break;
-sURL = OUString('#');
+sURL += OUString('#');
sURL += *aPartIt;
}
else if ( *aPartIt == \\m || *aPartIt == \\n )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Bug 6 depends on bug 51252, which changed state. Bug 51252 Summary: LO cannot start (reports runtime error with Visual C++ Runtime Library) https://bugs.freedesktop.org/show_bug.cgi?id=51252 What|Old Value |New Value Resolution||FIXED Status|ASSIGNED|RESOLVED -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- 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
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Bug 6 depends on bug 52999, which changed state. Bug 52999 Summary: FILESAVE: Comments disappear when save as XLSX https://bugs.freedesktop.org/show_bug.cgi?id=52999 What|Old Value |New Value Resolution||DUPLICATE Status|NEW |RESOLVED -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- 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
Re: [ACTION NEEDED] Declare what you want to make incompatible [was Re: Changes needed for LibreOffice 4]
On 2012-07-26 at 17:50 +0200, Jan Holesovsky wrote: Please, everyone who wants to do an incompatible change, and will work on it, move it in the 'LibreOffice4' wiki page to the following section, together with your name: https://wiki.documentfoundation.org/Development/LibreOffice4#Stuff_that_people_actually_will_do That will make it possible at the next ESC meeting to discuss point by point, and agree if we can do it, and how to do it with the least impact. Just a reminder - deadline for this is today, the ESC call is in 4 1/2 hours from now ;-) Regards, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-5]: fdo#51034 fix docx import of HYPERLINK field, l param
From Miklos Vajna vmik...@suse.cz: Miklos Vajna has uploaded a new change for review. Change subject: fdo#51034 fix docx import of HYPERLINK field, l param .. fdo#51034 fix docx import of HYPERLINK field, l param Change-Id: Ic6896f7c795d7d303bf7589a74afb937d4a8e8b5 (cherry picked from commit 68cb050f0fcd37a6b1e78c147402a521d24c25c1) --- M writerfilter/source/dmapper/DomainMapper_Impl.cxx 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/61/361/1 -- To view, visit https://gerrit.libreoffice.org/361 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic6896f7c795d7d303bf7589a74afb937d4a8e8b5 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-5 Gerrit-Owner: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-6]: fdo#51034 fix docx import of HYPERLINK field, l param
From Miklos Vajna vmik...@suse.cz: Miklos Vajna has uploaded a new change for review. Change subject: fdo#51034 fix docx import of HYPERLINK field, l param .. fdo#51034 fix docx import of HYPERLINK field, l param Change-Id: Ic6896f7c795d7d303bf7589a74afb937d4a8e8b5 (cherry picked from commit 68cb050f0fcd37a6b1e78c147402a521d24c25c1) --- M writerfilter/source/dmapper/DomainMapper_Impl.cxx 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/60/360/1 -- To view, visit https://gerrit.libreoffice.org/360 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic6896f7c795d7d303bf7589a74afb937d4a8e8b5 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/gbuild_ure' - 2 commits - clucene/prj solenv/gbuild
clucene/prj/build.lst |2 +- solenv/gbuild/platform/WNT_INTEL_GCC.mk | 10 +- 2 files changed, 6 insertions(+), 6 deletions(-) New commits: commit 978ad4e6478f4dba2a9f3fffdcd41462e20c Author: David Tardon dtar...@redhat.com Date: Thu Aug 2 11:32:42 2012 +0200 fix Library/LinkTarget build on mingw Parallel MinGW build broke in clucene every now and then because the link target tried to put map file directly into $(OUTDIR)/bin, which did not exist yet (and actually nothing in Library depends on it, so I guess it was just luckily created in time by delivery of soltools in the cases where the build succeeded). The map file is now created in $(WORKDIR) (as it should be) and then delivered through AUXTARGETS. Change-Id: I62373f0b71a6c4f3b59fa779f9ec48154485a174 diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index 976df76..ec8f02b 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -163,7 +163,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(if $(LINKED_STATIC_LIBS),-Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group) \ $(patsubst lib%.a,-l%,$(patsubst lib%.dll.a,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_implibname,$(lib) \ $(LIBS) \ - -Wl$(COMMA)-Map$(COMMA)$(basename $(DLLTARGET)).map \ + -Wl$(COMMA)-Map$(COMMA)$(dir $(1))$(notdir $(basename $(DLLTARGET)).map) \ -Wl$(COMMA)--out-implib$(COMMA)$(1) \ -o $(dir $(1))/$(notdir $(DLLTARGET endef @@ -298,16 +298,16 @@ gb_Library_IARCEXT := .a gb_Library_ILIBEXT := .lib define gb_Library_Library_platform -$(call gb_LinkTarget_set_dlltarget,$(2),$(OUTDIR)/bin/$(notdir $(3))) +$(call gb_LinkTarget_set_dlltarget,$(2),$(3)) $(call gb_LinkTarget_add_auxtargets,$(2),\ $(patsubst %.dll,%.map,$(3)) \ ) -$(call gb_Library_get_target,$(1)) \ -$(call gb_Library_get_clean_target,$(1)) : AUXTARGETS := $(OUTDIR)/bin/$(notdir $(3)) +$(call gb_Library_get_target,$(1)) :| $(OUTDIR)/bin/.dir -$(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(3)),$(3),$(1)) +$(call gb_Library_get_target,$(1)) \ +$(call gb_Library_get_clean_target,$(1)) : AUXTARGETS := $(OUTDIR)/bin/$(notdir $(3)) $(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.map,$(3))) $(call gb_Library_add_default_nativeres,$(1),$(1)/default) commit bee8f3a37b7ce1851635fb5247b6ff19fc1ce0a6 Author: David Tardon dtar...@redhat.com Date: Thu Aug 2 11:31:46 2012 +0200 clucene build needs solenv Change-Id: I5e41370b54a6054b9a488ae523a9d83b47f20415 diff --git a/clucene/prj/build.lst b/clucene/prj/build.lst index c33dcb2..9e008cf 100644 --- a/clucene/prj/build.lst +++ b/clucene/prj/build.lst @@ -1,3 +1,3 @@ -cl clucene : ZLIB:zlib BOOST:boost NULL +cl clucene : ZLIB:zlib BOOST:boost solenv NULL cl clucene usr1- all cl_mkout NULL cl clucene\prj nmake - all cl_prj NULL ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
feature/gbuild_ure needs testing
Hi all, now that 3.6.0 is sucessfully out, I have started pushing gbuild conversion forward again. The latest result of my effort is on branch feature/gbuild_ure and you really do want to test that it works on your platform :-) What is there: 1/ Module bridges has been converted to gbuild. This module is _crucial_ for UNO. Have I already said that you want to test the branch? The absolute minimum to check that C++ bridge still works is to run make testtools.all 2/ Module cli_ure has been converted to gbuild. Actually I have created some machinery for building CLI stuff in gbuild, because it seemed to make more sense than copy-pasting (nearly) the same code several times. This only builds on windows. I do expect some problems, because I only smoketested the code (replacing all commands by touch $@). 3/ 21 modules have been added to tail_build. I hope that I have found and fixed all incomplete dependencies, but it is possible that some additional ones arise on different platforms/configurations. If you find a problem, yell at me or fix it :-) D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-6]: nPos is 1-based, so allowed to be equal to row count
From Lionel Elie Mamane lio...@mamane.lu: Lionel Elie Mamane has uploaded a new change for review. Change subject: nPos is 1-based, so allowed to be equal to row count .. nPos is 1-based, so allowed to be equal to row count Change-Id: Idb37cd23a58816bd16c725fda49a2f9875450e79 --- M dbaccess/source/core/api/RowSetCache.cxx 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/62/362/1 -- To view, visit https://gerrit.libreoffice.org/362 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idb37cd23a58816bd16c725fda49a2f9875450e79 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Lionel Elie Mamane lio...@mamane.lu ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-6]: handle no schema case
From Lionel Elie Mamane lio...@mamane.lu: Lionel Elie Mamane has uploaded a new change for review. Change subject: handle no schema case .. handle no schema case This is especially the case when the source is a (saved) query. Fixes: Report Builder wizard Finish button does nothing - cannot create report through wizard Change-Id: I266772035435a7c623beb0c0f66fc88e6316be8e --- M wizards/com/sun/star/wizards/db/CommandName.java 1 file changed, 9 insertions(+), 2 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/63/363/1 -- To view, visit https://gerrit.libreoffice.org/363 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I266772035435a7c623beb0c0f66fc88e6316be8e Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Lionel Elie Mamane lio...@mamane.lu ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - dbaccess/source wizards/com
dbaccess/source/core/api/RowSetCache.cxx |2 +-
wizards/com/sun/star/wizards/db/CommandName.java | 11 +--
2 files changed, 10 insertions(+), 3 deletions(-)
New commits:
commit 94809ee4bf9b98769751aed4d1390ad12bcedc0a
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Thu Aug 2 11:58:24 2012 +0200
handle no schema case
This is especially the case when the source is a (saved) query.
Fixes: Report Builder wizard Finish button does nothing - cannot create
report through wizard
Change-Id: I266772035435a7c623beb0c0f66fc88e6316be8e
diff --git a/wizards/com/sun/star/wizards/db/CommandName.java
b/wizards/com/sun/star/wizards/db/CommandName.java
index 91b25e3..2621b96 100644
--- a/wizards/com/sun/star/wizards/db/CommandName.java
+++ b/wizards/com/sun/star/wizards/db/CommandName.java
@@ -108,8 +108,15 @@ public class CommandName
String[] NameList;
NameList = new String[0];
NameList = JavaTools.ArrayoutofString(_DisplayName, .);
-SchemaName = NameList[0];
-TableName = NameList[1]; // TODO Was ist mit diesem Fall:
CatalogSep = . und CatalogName = PropertyNames.EMPTY_STRING
+if (NameList.length 1)
+{
+SchemaName = NameList[0];
+TableName = NameList[1];
+}
+else
+{
+TableName = _DisplayName;
+}
}
else
{
commit 5b85f6c1ef24b7189a78b64ebafd1679f090fd2b
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Thu Aug 2 11:58:55 2012 +0200
nPos is 1-based, so allowed to be equal to row count
Change-Id: Idb37cd23a58816bd16c725fda49a2f9875450e79
diff --git a/dbaccess/source/core/api/RowSetCache.cxx
b/dbaccess/source/core/api/RowSetCache.cxx
index 549b00d..f72f4ff 100644
--- a/dbaccess/source/core/api/RowSetCache.cxx
+++ b/dbaccess/source/core/api/RowSetCache.cxx
@@ -1042,7 +1042,7 @@ sal_Bool ORowSetCache::moveWindow()
else if(!m_bRowCountFinal)
m_nRowCount = std::max(nPos+1, m_nRowCount); //+1 because
we successfully moved to row after nPos
else
-OSL_ENSURE(m_nRowCount nPos, Final m_nRowCount is
smaller than row I moved to!);
+OSL_ENSURE(m_nRowCount = nPos, Final m_nRowCount is
smaller than row I moved to!);
}
else
{ // the end was reached before or at end() so we can set the
start before or at nNewStartPos
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - Repository.mk udm/Makefile udm/Module_udm.mk udm/Package_inc.mk udm/prj udm/source udm/StaticLibrary_udm.mk udm/util unusedcode.easy xmloff/source
Repository.mk|1
udm/Makefile |7
udm/Module_udm.mk| 16 +
udm/Package_inc.mk | 14 +
udm/StaticLibrary_udm.mk | 23 ++
udm/prj/build.lst| 10 -
udm/prj/d.lst|9
udm/source/html/makefile.mk | 47 -
udm/source/mkinc/fullcpp.mk | 38
udm/source/xml/makefile.mk | 47 -
udm/util/makefile.mk | 45
unusedcode.easy |2
xmloff/source/style/impastp1.cxx | 22 --
xmloff/source/style/impastp2.cxx | 17 +
xmloff/source/style/impastp3.cxx | 16 -
xmloff/source/style/impastp4.cxx | 359 +--
xmloff/source/style/impastpl.hxx | 13 -
17 files changed, 250 insertions(+), 436 deletions(-)
New commits:
commit 5cd8770cbe39f124c69cbceaf745453b7fd63839
Author: Caolán McNamara caol...@redhat.com
Date: Thu Aug 2 11:00:20 2012 +0100
convert XMLFamilyDataList_Impl to boost::ptr_set
Change-Id: I2a23787091828415cf814eb7091f3fa926b5876c
diff --git a/unusedcode.easy b/unusedcode.easy
index 74d4aa0..c3b1905 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -51,8 +51,6 @@ VirtualDevice::SetOutputSizePixelScaleOffsetAndBuffer(Size
const, Fraction cons
Window::PostUserEvent(unsigned long, unsigned long, void*)
X11SalGraphics::SetMask(int, int, unsigned int, unsigned int, int, int,
unsigned long)
X509Certificate_NssImpl::getImplementation(com::sun::star::uno::Referencecom::sun::star::uno::XInterface)
-XMLFamilyDataList_Impl::GetPos(XMLFamilyData_Impl const*) const
-XMLFamilyDataList_Impl::Remove(XMLFamilyData_Impl*)
XMLFontAutoStylePool_Impl::GetPos(XMLFontAutoStylePoolEntry_Impl const*) const
XMLFontAutoStylePool_Impl::Remove(XMLFontAutoStylePoolEntry_Impl*)
XMLTextListAutoStylePool_Impl::GetPos(XMLTextListAutoStylePoolEntry_Impl
const*) const
diff --git a/xmloff/source/style/impastp1.cxx b/xmloff/source/style/impastp1.cxx
index 4eeffef..b1a0bd6 100644
--- a/xmloff/source/style/impastp1.cxx
+++ b/xmloff/source/style/impastp1.cxx
@@ -82,26 +82,4 @@ void XMLFamilyData_Impl::ClearEntries()
}
}
-///
-//
-// friendfunction of class XMLFamilyData_Impl for sorting listelements
-//
-
-int XMLFamilyDataSort_Impl( const XMLFamilyData_Impl r1, const
XMLFamilyData_Impl r2 )
-{
-int nRet = 0;
-
-if( r1.mnFamily != r2.mnFamily )
-nRet = ( r1.mnFamily r2.mnFamily ? 1 : -1 );
-
-return nRet;
-}
-
-///
-//
-// Implementation of sorted list of XMLFamilyData_Impl - elements
-//
-
-IMPL_CONTAINER_SORT( XMLFamilyDataList_Impl, XMLFamilyData_Impl,
XMLFamilyDataSort_Impl )
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/impastp2.cxx b/xmloff/source/style/impastp2.cxx
index b5d3c94..6de03bd 100644
--- a/xmloff/source/style/impastp2.cxx
+++ b/xmloff/source/style/impastp2.cxx
@@ -44,21 +44,26 @@ using ::rtl::OUStringBuffer;
// ctor class SvXMLAutoStylePoolProperties_Impl
//
-SvXMLAutoStylePoolPropertiesP_Impl::SvXMLAutoStylePoolPropertiesP_Impl(
XMLFamilyData_Impl* pFamilyData, const vector XMLPropertyState rProperties )
+SvXMLAutoStylePoolPropertiesP_Impl::SvXMLAutoStylePoolPropertiesP_Impl(
XMLFamilyData_Impl rFamilyData, const vector XMLPropertyState rProperties )
: maProperties( rProperties ),
- mnPos ( pFamilyData-mnCount )
+ mnPos ( rFamilyData.mnCount )
{
// create a name that hasn't been used before. The created name has not
// to be added to the array, because it will never tried again
OUStringBuffer sBuffer( 7 );
do
{
-pFamilyData-mnName++;
-sBuffer.append( pFamilyData-maStrPrefix );
-sBuffer.append( OUString::valueOf( (sal_Int32)pFamilyData-mnName ) );
+rFamilyData.mnName++;
+sBuffer.append( rFamilyData.maStrPrefix );
+sBuffer.append( OUString::valueOf( (sal_Int32)rFamilyData.mnName ) );
msName = sBuffer.makeStringAndClear();
}
-while( pFamilyData-mpNameList-find(msName) !=
pFamilyData-mpNameList-end() );
+while( rFamilyData.mpNameList-find(msName) !=
rFamilyData.mpNameList-end() );
+}
+
+bool operator( const XMLFamilyData_Impl r1, const XMLFamilyData_Impl r2)
+{
+return r1.mnFamily r2.mnFamily;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/impastp3.cxx b/xmloff/source/style/impastp3.cxx
index 20b1cf0..eceed9e 100644
--- a/xmloff/source/style/impastp3.cxx
+++ b/xmloff/source/style/impastp3.cxx
@@ -56,7 +56,7 @@
SvXMLAutoStylePoolParentP_Impl::~SvXMLAutoStylePoolParentP_Impl()
// if not added, yet.
//
-sal_Bool SvXMLAutoStylePoolParentP_Impl::Add( XMLFamilyData_Impl* pFamilyData,
const vector XMLPropertyState rProperties, OUString rName, bool bDontSeek )
+sal_Bool
[PATCH]fdo#53002:Turkish Default Currency to be changed YTL to TL
Did my email filtered or mail list doesn't send mail back to it's owner? Regards. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 59 -
1 file changed, 19 insertions(+), 40 deletions(-)
New commits:
commit b6e6ea341d1bd1577f5219ef08403fad58887715
Author: Miklos Vajna vmik...@suse.cz
Date: Thu Aug 2 11:57:25 2012 +0200
RTFDocumentImpl::popState: drop unnecessary state copies
First only parts of the parser state was copied, then later the whole
state, but code not using the full copy was still there. Remove it now.
Change-Id: I2c5507e74a24b8dac74552c61d69ba0be7257d6b
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 1e67616..530554b 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3230,15 +3230,6 @@ int RTFDocumentImpl::popState()
// , dest state:
m_aStates.top().nDestinationState);
checkUnicode();
-RTFSprms aSprms;
-RTFSprms aAttributes;
-OUStringBuffer aDestinationText;
-RTFShape aShape;
-RTFPicture aPicture;
-bool bPopShapeProperties = false;
-bool bPopPictureProperties = false;
-bool bFaltEnd = false;
-bool bPopFrame = false;
RTFParserState aState(m_aStates.top());
sal_Int32 nMathToken = 0;
@@ -3328,14 +3319,10 @@ int RTFDocumentImpl::popState()
case DESTINATION_SHAPEPROPERTYVALUE:
case DESTINATION_SHAPEPROPERTY:
{
-aShape = m_aStates.top().aShape;
-aPicture = m_aStates.top().aPicture;
-aAttributes = m_aStates.top().aCharacterAttributes;
if (m_aStates.top().nDestinationState == DESTINATION_SHAPEPROPERTYNAME)
-
aShape.aProperties.push_back(make_pair(m_aStates.top().aDestinationText.makeStringAndClear(),
OUString()));
-else if (m_aStates.top().nDestinationState ==
DESTINATION_SHAPEPROPERTYVALUE aShape.aProperties.size())
-aShape.aProperties.back().second =
m_aStates.top().aDestinationText.makeStringAndClear();
-bPopShapeProperties = true;
+
aState.aShape.aProperties.push_back(make_pair(m_aStates.top().aDestinationText.makeStringAndClear(),
OUString()));
+else if (m_aStates.top().nDestinationState ==
DESTINATION_SHAPEPROPERTYVALUE aState.aShape.aProperties.size())
+aState.aShape.aProperties.back().second =
m_aStates.top().aDestinationText.makeStringAndClear();
}
break;
case DESTINATION_PICPROP:
@@ -3357,11 +3344,6 @@ int RTFDocumentImpl::popState()
case DESTINATION_PICT:
resolvePict(true);
break;
-case DESTINATION_SHAPEPROPERTYVALUEPICT:
-bPopPictureProperties = true;
-aPicture = m_aStates.top().aPicture;
-aDestinationText = m_aStates.top().aDestinationText;
-break;
case DESTINATION_SHAPETEXT:
m_pCurrentBuffer = 0; // Just disable buffering, don't empty it yet.
break;
@@ -3567,15 +3549,9 @@ int RTFDocumentImpl::popState()
{
OUString aStr(m_aStates.top().aDestinationText.makeStringAndClear());
RTFValue::Pointer_t pValue(new RTFValue(aStr));
-m_aStates.top().aTableSprms.set(NS_ooxml::LN_CT_Font_altName, pValue);
-aSprms = m_aStates.top().aTableSprms;
-bFaltEnd = true;
+aState.aTableSprms.set(NS_ooxml::LN_CT_Font_altName, pValue);
}
break;
-case DESTINATION_FLYMAINCONTENT:
-case DESTINATION_SHPPICT:
-bPopFrame = true;
-break;
case DESTINATION_DRAWINGOBJECT:
if (m_aStates.top().aDrawingObject.xShape.is())
{
@@ -3826,23 +3802,26 @@ int RTFDocumentImpl::popState()
if (aState.nFieldStatus == FIELD_INSTRUCTION)
singleChar(0x15);
}
+else if (aState.nDestinationState == DESTINATION_SHAPEPROPERTYVALUEPICT)
+{
+m_aStates.top().aPicture = aState.aPicture;
+m_aStates.top().aDestinationText = aState.aDestinationText;
+}
+else if (aState.nDestinationState == DESTINATION_FALT)
+m_aStates.top().aTableSprms = aState.aTableSprms;
else if (m_aStates.size() m_aStates.top().nDestinationState ==
DESTINATION_PICT)
m_aStates.top().aPicture = aState.aPicture;
-else if (bPopShapeProperties)
+else if (aState.nDestinationState == DESTINATION_SHAPEPROPERTYNAME ||
+aState.nDestinationState == DESTINATION_SHAPEPROPERTYVALUE ||
+aState.nDestinationState == DESTINATION_SHAPEPROPERTY)
{
-m_aStates.top().aShape = aShape;
-m_aStates.top().aPicture = aPicture;
-m_aStates.top().aCharacterAttributes = aAttributes;
+m_aStates.top().aShape = aState.aShape;
+m_aStates.top().aPicture = aState.aPicture;
+m_aStates.top().aCharacterAttributes = aState.aCharacterAttributes;
}
-else if (bFaltEnd)
-m_aStates.top().aTableSprms = aSprms;
-else if (bPopFrame)
+else if (aState.nDestinationState == DESTINATION_FLYMAINCONTENT ||
+aState.nDestinationState ==
[Libreoffice-commits] .: sc/source
sc/source/filter/excel/xetable.cxx |7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) New commits: commit 6068f2f7cf5d66c68241b3831851b413b2e0b3ba Author: Noel Power noel.po...@novell.com Date: Thu Aug 2 11:49:57 2012 +0100 fix fdo#52998 xls(x) comment export problems Change-Id: Ie290199d3b03f6599429d56275eb54661af4a51c diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx index d611077..20bff22 100644 --- a/sc/source/filter/excel/xetable.cxx +++ b/sc/source/filter/excel/xetable.cxx @@ -41,6 +41,7 @@ #include xehelper.hxx #include xecontent.hxx #include xeescher.hxx +#include postit.hxx using namespace ::oox; @@ -2355,8 +2356,10 @@ XclExpCellTable::XclExpCellTable( const XclExpRoot rRoot ) : if( xCell ) maRowBfr.AppendCell( xCell, bIsMergedBase ); -if ( aAddNoteText.Len() ) -mxNoteList-AppendNewRecord( new XclExpNote( GetRoot(), aScPos, NULL, aAddNoteText ) ); +ScNotes* pNotes = rDoc.GetNotes( nScTab ); +const ScPostIt* pScNote = pNotes ? pNotes-findByAddress( aScPos ) : NULL; +if ( aAddNoteText.Len() || pScNote ) +mxNoteList-AppendNewRecord( new XclExpNote( GetRoot(), aScPos, pScNote, aAddNoteText ) ); // other sheet contents if( pPattern ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in
configure.in |9 - 1 file changed, 9 deletions(-) New commits: commit a2730c957ae64380443f98a3ad5768123ab8f5e0 Author: Tor Lillqvist t...@iki.fi Date: Tue Jul 31 19:32:13 2012 +0300 Using NDK r8b seems to work now so drop warning comments Change-Id: Ia789a228918ded1283433289f4fd9ab80bd78ae9 diff --git a/configure.in b/configure.in index d687ccf..0e06eff 100644 --- a/configure.in +++ b/configure.in @@ -131,15 +131,6 @@ if test -n $with_android_ndk; then ANDROID_NDK_HOME=$with_android_ndk # Set up a lot of pre-canned defaults -# What if the NDK at some point starts including several toolchains for different -# gcc versions (like some 3rd-party improved NDK builds already do)? -# Then the use of a wildcard below will break. - -# That indeed happened with NDK r8b, which has both gcc 4.4.3 and 4.6 -# -based toolchains. The latter has interesting new features, like the -# possiblity to use the gold linker, which should bring a nice speedup to -# linking especially our libmerged. Work to support that in progress. Until -# that is done, please use no newer NDK than r8. if test $host_cpu = arm; then android_cpu=arm ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - wizards/com
wizards/com/sun/star/wizards/db/CommandName.java | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
New commits:
commit 36f8fb4b4b716577142b8855cece13b699d0559a
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Thu Aug 2 11:58:24 2012 +0200
handle no schema case
This is especially the case when the source is a (saved) query.
Fixes: Report Builder wizard Finish button does nothing - cannot create
report through wizard
Change-Id: I266772035435a7c623beb0c0f66fc88e6316be8e
diff --git a/wizards/com/sun/star/wizards/db/CommandName.java
b/wizards/com/sun/star/wizards/db/CommandName.java
index 09b4eec..f2a4b6b 100644
--- a/wizards/com/sun/star/wizards/db/CommandName.java
+++ b/wizards/com/sun/star/wizards/db/CommandName.java
@@ -117,8 +117,15 @@ public class CommandName
String[] NameList;
NameList = new String[0];
NameList = JavaTools.ArrayoutofString(_DisplayName, .);
-SchemaName = NameList[0];
-TableName = NameList[1]; // TODO Was ist mit diesem Fall:
CatalogSep = . und CatalogName = PropertyNames.EMPTY_STRING
+if (NameList.length 1)
+{
+SchemaName = NameList[0];
+TableName = NameList[1];
+}
+else
+{
+TableName = _DisplayName;
+}
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - dbaccess/source
dbaccess/source/core/api/RowSetCache.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c7b0f9fa41789b3b514b81bae32cf5c39aa6fa34
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Thu Aug 2 11:58:55 2012 +0200
nPos is 1-based, so allowed to be equal to row count
Change-Id: Idb37cd23a58816bd16c725fda49a2f9875450e79
diff --git a/dbaccess/source/core/api/RowSetCache.cxx
b/dbaccess/source/core/api/RowSetCache.cxx
index 05a88d0..fd2fe1f 100644
--- a/dbaccess/source/core/api/RowSetCache.cxx
+++ b/dbaccess/source/core/api/RowSetCache.cxx
@@ -1051,7 +1051,7 @@ sal_Bool ORowSetCache::moveWindow()
else if(!m_bRowCountFinal)
m_nRowCount = std::max(nPos+1, m_nRowCount); //+1 because
we successfully moved to row after nPos
else
-OSL_ENSURE(m_nRowCount nPos, Final m_nRowCount is
smaller than row I moved to!);
+OSL_ENSURE(m_nRowCount = nPos, Final m_nRowCount is
smaller than row I moved to!);
}
else
{ // the end was reached before or at end() so we can set the
start before or at nNewStartPos
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Change in core[libreoffice-3-6]: handle no schema case
From Noel Power noel.po...@suse.com: Noel Power has submitted this change and it was merged. Change subject: handle no schema case .. handle no schema case This is especially the case when the source is a (saved) query. Fixes: Report Builder wizard Finish button does nothing - cannot create report through wizard Change-Id: I266772035435a7c623beb0c0f66fc88e6316be8e --- M wizards/com/sun/star/wizards/db/CommandName.java 1 file changed, 9 insertions(+), 2 deletions(-) Approvals: Noel Power: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/363 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I266772035435a7c623beb0c0f66fc88e6316be8e Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Lionel Elie Mamane lio...@mamane.lu Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-3-6]: nPos is 1-based, so allowed to be equal to row count
From Noel Power noel.po...@suse.com: Noel Power has submitted this change and it was merged. Change subject: nPos is 1-based, so allowed to be equal to row count .. nPos is 1-based, so allowed to be equal to row count Change-Id: Idb37cd23a58816bd16c725fda49a2f9875450e79 --- M dbaccess/source/core/api/RowSetCache.cxx 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Noel Power: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/362 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idb37cd23a58816bd16c725fda49a2f9875450e79 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Lionel Elie Mamane lio...@mamane.lu Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 3 commits - setup_native/source solenv/bin
setup_native/source/win32/wintools/msidb/msidb.c | 20 +---
solenv/bin/make_installer.pl |4 ++--
solenv/bin/modules/installer/windows/msiglobal.pm |5 -
solenv/bin/modules/installer/windows/msp.pm |3 +++
solenv/bin/modules/installer/windows/update.pm|3 +++
5 files changed, 25 insertions(+), 10 deletions(-)
New commits:
commit 73ec8371d797b5be564381d8982977696444ffa6
Author: Eilidh McAdam eil...@lanedo.com
Date: Thu Aug 2 12:05:42 2012 +0100
Installer logic changed call msi functions on request
Change-Id: Ic73825cab20bd9e56be69531cba6452fe0202b72
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index ea77d9f..38b4793 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -604,7 +604,7 @@ for ( my $n = 0; $n =
$#installer::globals::languageproducts; $n++ )
my $allupdatelastsequences = ;
my $allupdatediskids = ;
-if ( $installer::globals::iswindowsbuild )
+if ( $installer::globals::iswindowsbuild ||
$installer::globals::packageformat eq 'msi' )
{
if ( $allvariableshashref-{'UPDATE_DATABASE'} )
{
@@ -625,7 +625,7 @@ for ( my $n = 0; $n =
$#installer::globals::languageproducts; $n++ )
if (!($installer::globals::is_copy_only_project))
{
-if (( $installer::globals::iswindowsbuild ) (
$installer::globals::packageformat ne archive ) (
$installer::globals::packageformat ne installed ))
+if ((( $installer::globals::iswindowsbuild ) (
$installer::globals::packageformat ne archive ) (
$installer::globals::packageformat ne installed ) ) ||
$insaller::globals::packageformat eq 'msi' )
{
installer::windows::msiglobal::set_global_code_variables($languagesarrayref,
$languagestringref, $allvariableshashref, $alloldproperties);
}
commit 013d1e01c33ad41d16427470ac151192ea52adec
Author: Eilidh McAdam eil...@lanedo.com
Date: Thu Aug 2 12:01:05 2012 +0100
Ensure correct import of msi tables using wildcard character
Change-Id: I3e1800d73250a8a630dd37329189b13cfae311e9
diff --git a/setup_native/source/win32/wintools/msidb/msidb.c
b/setup_native/source/win32/wintools/msidb/msidb.c
index 6916423..c492ba2 100644
--- a/setup_native/source/win32/wintools/msidb/msidb.c
+++ b/setup_native/source/win32/wintools/msidb/msidb.c
@@ -279,15 +279,15 @@ static BOOL msidbExportStream(LPCWSTR dbfile, LPCWSTR
wdir, LPCWSTR streamName)
/***
* msidbImportTables
*
- * Takes a list of tables or '*' (for all) to export to text archive
+ * Takes a list of tables or '*' (for all) to import from text archive
* files in specified folder
*
- * For each table, a file called tablename.idt is exported containing
+ * For each table, a file called tablename.idt is imported containing
* tab separated ASCII.
*
* Examples (note wildcard escape for *nix/bash):
- * msidb -d pathtomsi.msi -f workdir -e \*
- * msidb -d pathtomsi.msi -f workdir -e File Directory Binary
+ * msidb -d pathtomsi.msi -f workdir -i \*
+ * msidb -d pathtomsi.msi -f workdir -i File Directory Binary
**/
static BOOL msidbImportTables(LPCWSTR dbfile, LPCWSTR wdir, LPWSTR tables[],
BOOL create)
{
@@ -323,13 +323,17 @@ static BOOL msidbImportTables(LPCWSTR dbfile, LPCWSTR
wdir, LPWSTR tables[], BOO
{
while ((ent = readdir(dir)) != NULL)
{
+if (ent-d_type != DT_REG) continue;
fileName = ent-d_name;
+if (strcmp(fileName+strlen(fileName)-4*sizeof(fileName[0]),
.idt) != 0) continue;
if (strcmp(fileName, .) == 0 || strcmp(fileName, ..) == 0)
continue;
tableFile = strdupAtoW(CP_ACP, fileName);
r = MsiDatabaseImportW(dbhandle, wdir, tableFile);
free(tableFile);
}
}
+else
+return FALSE;
closedir(dir);
free(dirNameA);
}
@@ -343,7 +347,6 @@ static BOOL msidbImportTables(LPCWSTR dbfile, LPCWSTR wdir,
LPWSTR tables[], BOO
lstrcpyW(tableFile, tables[i]);
lstrcatW(tableFile, ext);
-
r = MsiDatabaseImportW(dbhandle, wdir, tableFile);
free(tableFile);
@@ -353,6 +356,7 @@ static BOOL msidbImportTables(LPCWSTR dbfile, LPCWSTR wdir,
LPWSTR tables[], BOO
}
}
}
+
MsiDatabaseCommit(dbhandle);
MsiCloseHandle(dbhandle);
return TRUE;
@@ -476,10 +480,9 @@ int wmain(int argc, WCHAR *argv[])
i = 0;
while (argv[2] argv[2][0] != '-' i 10)
{
-argv++; argc--; i++;
iTables[i] = argv[2];
+argv++; argc--; i++;
}
-
break;
case 'e': /* Export tables */
[Libreoffice-commits] .: 2 commits - autodoc/Executable_autodoc.mk autodoc/Makefile autodoc/Module_autodoc.mk autodoc/prj Repository.mk RepositoryModule_ooo.mk solenv/inc sw/source
Repository.mk |1 RepositoryModule_ooo.mk |1 autodoc/Executable_autodoc.mk | 172 ++ autodoc/Makefile |7 + autodoc/Module_autodoc.mk | 15 +++ autodoc/prj/build.lst | 18 autodoc/prj/d.lst |2 solenv/inc/libs.mk|4 sw/source/ui/inc/glshell.hxx | 24 - 9 files changed, 200 insertions(+), 44 deletions(-) New commits: commit d1a66813a0a4f28af34728efa48a97e4a48a9bf8 Author: Caolán McNamara caol...@redhat.com Date: Thu Aug 2 12:06:58 2012 +0100 strange header guard Change-Id: I981e2e9f18b6ebde4d129746fdc30f360956848b diff --git a/sw/source/ui/inc/glshell.hxx b/sw/source/ui/inc/glshell.hxx index f9143d3..c37939c 100644 --- a/sw/source/ui/inc/glshell.hxx +++ b/sw/source/ui/inc/glshell.hxx @@ -16,8 +16,8 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _AUTODOC_HXX -#define _AUTODOC_HXX +#ifndef _GLSHELL_HXX +#define _GLSHELL_HXX #include wdocsh.hxx class SwGlosDocShell : public SwDocShell @@ -84,24 +84,4 @@ public: #endif - - - - - - - - - - - - - - - - - - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ commit 6a9baa8bffa5203565730e1f3f298ec6965ec694 Author: Caolán McNamara caol...@redhat.com Date: Thu Aug 2 11:50:29 2012 +0100 gbuildify autodoc Change-Id: I587be109e33b91ba08eb5d2b51c265e39ce797e0 diff --git a/Repository.mk b/Repository.mk index 4f41824..9b1c8e0 100644 --- a/Repository.mk +++ b/Repository.mk @@ -73,6 +73,7 @@ $(eval $(call gb_Helper_register_executables,SDK, \ ifneq ($(OS),IOS) $(eval $(call gb_Helper_register_executables,SDK, \ +autodoc \ javamaker \ cppumaker \ regcompare \ diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk index f8ce7f5..d46e387 100644 --- a/RepositoryModule_ooo.mk +++ b/RepositoryModule_ooo.mk @@ -31,6 +31,7 @@ $(eval $(call gb_Module_Module,ooo)) $(eval $(call gb_Module_add_moduledirs,ooo,\ accessibility \ animations \ +autodoc \ apple_remote \ avmedia \ basctl \ diff --git a/autodoc/Executable_autodoc.mk b/autodoc/Executable_autodoc.mk new file mode 100644 index 000..e35b427 --- /dev/null +++ b/autodoc/Executable_autodoc.mk @@ -0,0 +1,172 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +$(eval $(call gb_Executable_Executable,autodoc)) + +$(eval $(call gb_Executable_set_include,autodoc,\ +-I$(SRCDIR)/autodoc/inc \ +-I$(SRCDIR)/autodoc/source/inc \ +-I$(SRCDIR)/autodoc/source/parser/inc \ +-I$(SRCDIR)/autodoc/source/display/inc \ +-I$(SRCDIR)/autodoc/source/parser_i/inc \ +-I$(SRCDIR)/autodoc/source/ary/inc \ +$$(INCLUDE) \ +)) + +$(eval $(call gb_Executable_use_static_libraries,autodoc,\ +cosv \ +udm \ +)) + +$(eval $(call gb_Executable_add_exception_objects,autodoc,\ +autodoc/source/exes/adc_uni/adc_cl \ +autodoc/source/exes/adc_uni/adc_cmds \ +autodoc/source/exes/adc_uni/cmd_sincedata \ +autodoc/source/exes/adc_uni/adc_cmd_parse \ +autodoc/source/exes/adc_uni/main \ +autodoc/source/exes/adc_uni/adc_msg \ +autodoc/source/exes/adc_uni/cmd_run \ +autodoc/source/parser/tokens/tkp \ +autodoc/source/parser/tokens/tokdeal \ +autodoc/source/parser/tokens/stmstate \ +autodoc/source/parser/tokens/tkpcontx \ +autodoc/source/parser/kernel/x_parse \ +autodoc/source/parser/kernel/parsefct \ +autodoc/source/parser/kernel/x_docu \ +autodoc/source/display/kernel/displfct \ +autodoc/source/display/idl/hi_main \ +autodoc/source/display/idl/hfi_property \ +autodoc/source/display/idl/hfi_xrefpage \ +autodoc/source/display/idl/hfi_struct \ +autodoc/source/display/idl/hfi_interface \ +autodoc/source/display/idl/hfi_method \ +autodoc/source/display/idl/hfi_typetext \ +autodoc/source/display/idl/hfi_module \ +autodoc/source/display/idl/hfi_enum \ +autodoc/source/display/idl/hfi_navibar \ +autodoc/source/display/idl/hi_display \ +autodoc/source/display/idl/hfi_service \ +autodoc/source/display/idl/hfi_globalindex \ +autodoc/source/display/idl/hfi_singleton \ +autodoc/source/display/idl/hi_factory \ +autodoc/source/display/idl/hi_ary \ +autodoc/source/display/idl/hi_env \ +autodoc/source/display/idl/hfi_siservice \ +autodoc/source/display/idl/hfi_typedef \ +autodoc/source/display/idl/hfi_constgroup \ +autodoc/source/display/idl/hi_linkhelper \ +autodoc/source/display/idl/hfi_tag \ +autodoc/source/display/idl/hfi_hierarchy \ +
[Libreoffice-commits] .: Branch 'feature/remote' - 4 commits - sd/Library_sd.mk sd/source
sd/Library_sd.mk|1
sd/source/ui/remotecontrol/DiscoveryService.cxx | 89
sd/source/ui/remotecontrol/DiscoveryService.hxx | 52 +++
sd/source/ui/remotecontrol/ImagePreparer.cxx| 175 +---
sd/source/ui/remotecontrol/Server.cxx |2
5 files changed, 275 insertions(+), 44 deletions(-)
New commits:
commit 96fa4ace05c7c324227b0d4d152c466e0ef3c522
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date: Thu Aug 2 12:27:19 2012 +0200
Discovery service implemented server side.
Change-Id: I26c26ae96680c6264d7b927cb9206073239f2ef4
diff --git a/sd/source/ui/remotecontrol/DiscoveryService.cxx
b/sd/source/ui/remotecontrol/DiscoveryService.cxx
index f92b9ee..1ded965 100644
--- a/sd/source/ui/remotecontrol/DiscoveryService.cxx
+++ b/sd/source/ui/remotecontrol/DiscoveryService.cxx
@@ -11,10 +11,14 @@
#include vector
#include comphelper/processfactory.hxx
+#include rtl/strbuf.hxx
#include DiscoveryService.hxx
+using namespace osl;
+using namespace rtl;
using namespace sd;
+using namespace std;
DiscoveryService::DiscoveryService()
:
@@ -28,10 +32,47 @@ DiscoveryService::~DiscoveryService()
}
+void DiscoveryService::replyTo( SocketAddr rAddr )
+{
+SocketAddr aLocalAddr;
+mSocket.getLocalAddr( aLocalAddr );
+OString aAddrString = OUStringToOString( aLocalAddr.getHostname(),
+ RTL_TEXTENCODING_UTF8 );
+OStringBuffer aBuffer( LOREMOTE_ADVERTISE\n );
+aBuffer.append( aAddrString ).append( \n );
+mSocket.sendTo( rAddr, aBuffer.getStr(), aBuffer.getLength() );
+}
void DiscoveryService::execute()
{
+sal_uInt64 aRet, aRead;
+vectorchar aBuffer;
+aRead = 0;
+SocketAddr aAddr;
+while ( true )
+{
+aBuffer.resize( aRead + 100 );
+aRet = mSocket.recvFrom( aBuffer[aRead], 100 );
+if ( aRet == 0 )
+{
+fprintf( stderr, Socket returned 0\n );
+// break; // I.e. transmission finished.
+}
+aRead += aRet;
+vectorchar::iterator aIt;
+while ( (aIt = find( aBuffer.begin(), aBuffer.end(), '\n' ))
+!= aBuffer.end() )
+{
+sal_uInt64 aLocation = aIt - aBuffer.begin();
+OString aString( (*aBuffer.begin()), aLocation );
+if ( aString.compareTo( LOREMOTE_SEARCH ) == 0 ) {
+replyTo( aAddr );
+}
+aBuffer.erase( aBuffer.begin(), aIt + 1 ); // Also delete the
newline
+aRead -= (aLocation + 1);
+}
+}
}
DiscoveryService *sd::DiscoveryService::spService = NULL;
diff --git a/sd/source/ui/remotecontrol/DiscoveryService.hxx
b/sd/source/ui/remotecontrol/DiscoveryService.hxx
index 863ebb5..aa4b349 100644
--- a/sd/source/ui/remotecontrol/DiscoveryService.hxx
+++ b/sd/source/ui/remotecontrol/DiscoveryService.hxx
@@ -38,11 +38,13 @@ namespace sd
private:
DiscoveryService();
~DiscoveryService();
+
static DiscoveryService *spService;
+void execute();
osl::DatagramSocket mSocket;
+void replyTo( osl::SocketAddr rAddr );
-void execute();
};
}
commit d17346b830bbb00ce1a5dc5c829b1f4e3d621672
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date: Thu Aug 2 11:28:38 2012 +0200
Basic structure for Disovery Service.
Change-Id: Idaae84c46fa96b128ab32451853922c9eb11c6cc
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 4847abf..43e42d7 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -320,6 +320,7 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/ui/presenter/PresenterPreviewCache \
sd/source/ui/presenter/PresenterTextView \
sd/source/ui/presenter/SlideRenderer \
+sd/source/ui/remotecontrol/DiscoveryService \
sd/source/ui/remotecontrol/ImagePreparer \
sd/source/ui/remotecontrol/Server \
sd/source/ui/remotecontrol/Receiver \
diff --git a/sd/source/ui/remotecontrol/DiscoveryService.cxx
b/sd/source/ui/remotecontrol/DiscoveryService.cxx
new file mode 100644
index 000..f92b9ee
--- /dev/null
+++ b/sd/source/ui/remotecontrol/DiscoveryService.cxx
@@ -0,0 +1,48 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+#include stdlib.h
+#include algorithm
+#include vector
+
+#include comphelper/processfactory.hxx
+
+#include DiscoveryService.hxx
+
+using namespace sd;
+
+DiscoveryService::DiscoveryService()
+:
+Thread( sd::DiscoveryService ),
+mSocket()
+{
+}
+
+DiscoveryService::~DiscoveryService()
+{
+}
+
+
+
+void DiscoveryService::execute()
+{
+
+}
+
[Libreoffice-commits] Changes to 'feature/gstreamer-1.0'
New branch 'feature/gstreamer-1.0' available with the following commits: commit bcfc399b27a8d2273be0a61686f91ce7993faa52 Author: Michael Meeks michael.me...@suse.com Date: Mon Jul 30 15:15:58 2012 +0200 gstreamer: first attempt at adding gstreamer 1.0 and 0.10 dual compile Change-Id: I91f65d05391cb2d7e02f9cff18f96178a1287051 commit 64a5751a000e5cff8e21e2a7ae06c7322654a36f Author: Tim-Philipp Müller tim.mul...@collabora.co.uk Date: Sun Jul 29 19:14:05 2012 +0200 tentative initial attempt at re-work for new playbin Change-Id: I257bdda8469be624d0cbeab21cff2c2e1c94cc6f ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 92e00f2e536ce0458961d329a3c676acc86249e6
Author: Ivan Timofeev timofeev@gmail.com
Date: Thu Aug 2 16:06:33 2012 +0400
cairo uses pre-multiplied alpha
Change-Id: I6cf04b10bfdd6c7b16761b2aa2f31c1392c49546
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 5e0972f..4298493 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -972,9 +972,9 @@ void GtkSalGraphics::renderAreaToPix( cairo_t *cr,
for (int x = 0; x awidth y aheight; ++x)
{
double alpha = ((float)cairo_data[x*4 + 3])/255.0;
-src[x*3 + 0] = src[x*3 + 0] * (1.0 - alpha) + cairo_data[x*4+0] *
alpha;
-src[x*3 + 1] = src[x*3 + 1] * (1.0 - alpha) + cairo_data[x*4+1] *
alpha;
-src[x*3 + 2] = src[x*3 + 2] * (1.0 - alpha) + cairo_data[x*4+2] *
alpha;
+src[x*3 + 0] = src[x*3 + 0] * (1.0 - alpha) + cairo_data[x*4+0];
+src[x*3 + 1] = src[x*3 + 1] * (1.0 - alpha) + cairo_data[x*4+1];
+src[x*3 + 2] = src[x*3 + 2] * (1.0 - alpha) + cairo_data[x*4+2];
}
src += nStride;
cairo_data += cairo_stride;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: double rendering of borders ...
Hi Michael, On 02.08.2012 00:25, Michael Meeks wrote: On Wed, 2012-08-01 at 22:18 +0400, Ivan Timofeev wrote: We use CAIRO_FORMAT_ARGB32 and the cairo manual says[1]: Pre-multiplied alpha is used. (That is, 50% transparent red is 0x8080, not 0x80ff.) So you're right, and I'm wrong then :-) good. by pure chance... :) so cairo_data elements already multiplied by alpha. Lets get your patch to fix this in the - hopefully that makes everything prettier. Pushed to master. All the best, Ivan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: make OUString::copy() clip
Hi Michael, On Wednesday, 2012-08-01 22:02:50 +0200, Michael Stahl wrote: On 01/08/12 19:05, Eike Rathke wrote: On Wednesday, 2012-08-01 18:17:12 +0200, Stephan Bergmann wrote: make rtl::OUString::copy(beginIndex, count) clip to [0..length)? yeah, why not (then again, -1's sentinel nature, cf. indexOf, might mean that silent clipping of beginIndex=-1 to beginIndex=0 is unfortunate) We may step into more of these traps in transitions from String to OUString, so clipping IMHO is good. I think beginIndex0 or count=0 should always return an empty string and output a SAL_WARN, maybe also SAL_WARN if clipping occurred as that may indicate a logic error. no, it should assert(). passing in invalid indexes is clearly a bug that must be fixed. Well, yes, but the assert() hits only with debug, in non-debug build the copy() happily (probably depending on memory layout) may copy excess characters on Linux while it may crash on Windows or Mac. So for many developers it may still go unnoticed. My suggestion then: keep the assert() for debug/dbgutil heroes but clip thereafter for when the assert() is not active. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgp8xd4Hs0WT2.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: make OUString::copy() clip
On 08/02/2012 02:16 PM, Eike Rathke wrote:
On Wednesday, 2012-08-01 22:02:50 +0200, Michael Stahl wrote:
On 01/08/12 19:05, Eike Rathke wrote:
On Wednesday, 2012-08-01 18:17:12 +0200, Stephan Bergmann wrote:
make rtl::OUString::copy(beginIndex, count) clip to [0..length)?
yeah, why not (then again, -1's sentinel nature, cf. indexOf, might
mean that silent clipping of beginIndex=-1 to beginIndex=0 is
unfortunate)
We may step into more of these traps in transitions from String to
OUString, so clipping IMHO is good.
I think beginIndex0 or count=0 should always return an empty string
and output a SAL_WARN, maybe also SAL_WARN if clipping occurred as that
may indicate a logic error.
no, it should assert(). passing in invalid indexes is clearly a bug
that must be fixed.
Well, yes, but the assert() hits only with debug, in non-debug build the
copy() happily (probably depending on memory layout) may copy excess
characters on Linux while it may crash on Windows or Mac. So for many
developers it may still go unnoticed.
...which puts the blame on those developers...
My suggestion then: keep the assert() for debug/dbgutil heroes but clip
thereafter for when the assert() is not active.
No defensive programming, please. If we consider a given (beginIndex,
count) arguments a violation of copy's precondition, then fail on it, as
fast as possible (via assert - abort in a non-NDEBUG build, via
undefined behavior (- hopefully crash soon) otherwise).
Which leaves the question of how to specify copy's precondition. Today,
[it] is an error for either beginIndex or count to be negative, or for
beginIndex + count to be greater than the length of this string.
It has rightfully been observed that it might be helpful for client code
if the case of beginIndex + count length were accepted by copy, and
handled by clipping the arguments to (beginIndex', count'), where
beginIndex' = min {beginIndex, length} and count' = min {count, length -
beginIndex'}.
Whether it would also be helpful to accept other currently invalid
(beginIndex, count) arguments (that would involve beginIndex and/or
count being negative) is open to debate.
Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: make OUString::copy() clip
On 2012-08-02 14:35, Stephan Bergmann wrote: No defensive programming, please. If we consider a given (beginIndex, count) arguments a violation of copy's precondition, then fail on it, as fast as possible (via assert - abort in a non-NDEBUG build, via undefined behavior (- hopefully crash soon) otherwise). Rather crash earlier than later. *NULL = 0xdeadbeef; can't be all that expensive. Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: make OUString::copy() clip
On 08/02/2012 02:39 PM, Noel Grandin wrote: On 2012-08-02 14:35, Stephan Bergmann wrote: No defensive programming, please. If we consider a given (beginIndex, count) arguments a violation of copy's precondition, then fail on it, as fast as possible (via assert - abort in a non-NDEBUG build, via undefined behavior (- hopefully crash soon) otherwise). Rather crash earlier than later. *NULL = 0xdeadbeef; can't be all that expensive. Then rather -UNDEBUG. Can't be all that expensive, either. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/source
sw/source/core/text/inftxt.cxx |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 57c8c34fcdc2d594d2da3593eb9d86d0daf4e18c
Author: Miklos Vajna vmik...@suse.cz
Date: Thu Aug 2 15:11:16 2012 +0200
SwTxtPaintInfo::_DrawBackBrush: draw dark border around comment highlight
Change-Id: I71870301db74e4d0c1376c45eb8aadb3912c7ba0
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index e3f0835..a02ab3b 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -1126,12 +1126,15 @@ void SwTxtPaintInfo::_DrawBackBrush( const
SwLinePortion rPor ) const
const rtl::OUString rAuthor =
rPostItField.GetFld()-GetPar1();
sal_uInt16 nIndex =
pNd-GetDoc()-InsertRedlineAuthor(rAuthor);
pOutDev-SetFillColor(
SwPostItMgr::GetColorLight(nIndex) );
+pOutDev-SetLineColor(
SwPostItMgr::GetColorAnchor(nIndex) );
bFilled = true;
}
}
if (!bFilled)
+{
pOutDev-SetFillColor(
SwViewOption::GetFieldShadingsColor() );
-pOutDev-SetLineColor( );
+pOutDev-SetLineColor( );
+}
pOutDev-DrawRect( aIntersect.SVRect() );
pOutDev-Pop();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[REVIEW-3-6][REVIEW-3-6-x]fdo#52998 fdo#52999 MAB
please review master:6068f2f7cf5d66c68241b3831851b413b2e0b3ba ( sorry don't have the cgit url as cgit is dead ) Noel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-ux-advise] [PATCH] fix bug 51231, but...
Hi Astron, many thanks for the detailed reply. On 02.08.2012 03:34, Stefan Knorr wrote: Hi there, On 29 July 2012 13:20, Ivan Timofeev timofeev@gmail.com wrote: But (don't cast stones at me) could we revert this feature? No casting stones at you (I won't, at least). I agree with you. So can I use your sign-off for reverting http://cgit.freedesktop.org/libreoffice/core/commit/?id=4866b20ec6205b04cd21077fd00d68c4d4bb2c1b on the libreoffice-3-6 branch? As a makeshift fix, would it be possible to make the overlay appear half/a quarter of a second later? Sure, the corresponding constant is Theme_ButtonFadeInDelay in sd/source/ui/slidesorter/inc/view/SlsTheme.hxx Feel free to push patches. :) So, you read until here, possible solutions that we could explore: [...] Of all those, I slightly favour #1, but really not by much. #3 is good too IMHO, especially due to fdo#37654. Best regards, Ivan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Convert usages of DECLARE_CONTAINER (5)
Hi These patches convert usage of DECLARE_CONTAINER (i.e. svl/cntnrsrt.hxx). They pass a full make check. After these patches are applied, it should be OK to delete svl/cntnrsrt.hxx Regards, Noel Grandin Disclaimer: http://www.peralex.com/disclaimer.html 0001-STL-ify-DECLARE_CONTAINER_SORT-SwXMLTableColumnsSort.patch Description: application/mbox 0002-STL-ify-DECLARE_CONTAINER_SORT-XMLFamilyDataList_Imp.patch Description: application/mbox 0003-STL-ify-DECLARE_CONTAINER_SORT_DEL-SvXMLAutoStylePoo.patch Description: application/mbox 0004-STL-ify-DECLARE_CONTAINER_SORT_DEL-XMLFontAutoStyleP.patch Description: application/mbox 0005-STL-ify-DECLARE_CONTAINER_SORT-XMLTextListAutoStyleP.patch Description: application/mbox ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/gsoc_test_improvements3' - 2 commits - sc/qa
sc/qa/unit/subsequent_filters-test.cxx | 79 +
1 file changed, 60 insertions(+), 19 deletions(-)
New commits:
commit af1ec680e3710576245f85ce0fb80c1cd677bce4
Author: Artur Dorda artur.dorda+l...@gmail.com
Date: Thu Aug 2 16:32:53 2012 +0200
Border test in Calc now checks also style in all borders
Change-Id: Idfb9f035b9940a0e52706bde7d7f4e19c9c9fd6d
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index 050017d..f21babb 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -672,34 +672,39 @@ struct Border
sal_uInt16 bOutWidth;
sal_uInt16 bInWidth;
sal_uInt16 bDistance;
+sal_Int32 lStyle;
+sal_Int32 tStyle;
+sal_Int32 rStyle;
+sal_Int32 bStyle;
// that's a monstrum
Border(sal_Int16 col, sal_Int32 r, sal_Int32 lW, sal_Int32 tW, sal_Int32
rW, sal_Int32 bW, sal_uInt16 lOutW, sal_uInt16 lInW,
sal_uInt16 lDist, sal_uInt16 tOutW, sal_uInt16 tInW, sal_uInt16 tDist,
sal_uInt16 rOutW, sal_uInt16 rInW, sal_uInt16 rDist,
-sal_uInt16 bOutW, sal_uInt16 bInW, sal_uInt16 bDist):
+sal_uInt16 bOutW, sal_uInt16 bInW, sal_uInt16 bDist, sal_Int32 lSt,
sal_Int32 tSt, sal_Int32 rSt, sal_Int32 bSt):
column(col), row(r), leftWidth(lW), topWidth(tW), rightWidth(rW),
bottomWidth(bW), lOutWidth(lOutW), lInWidth(lInW), lDistance(lDist),
-tOutWidth(tOutW), tInWidth(tInW), tDistance(tDist), rOutWidth(rOutW),
rInWidth(rInW), rDistance(rDist), bOutWidth(bOutW), bInWidth(bInW),
bDistance(bDist) {};
+tOutWidth(tOutW), tInWidth(tInW), tDistance(tDist), rOutWidth(rOutW),
rInWidth(rInW), rDistance(rDist), bOutWidth(bOutW), bInWidth(bInW),
+bDistance(bDist), lStyle(lSt), tStyle(tSt), rStyle(rSt), bStyle(bSt) {};
};
void ScFiltersTest::testBordersOoo33()
{
std::vectorBorder borders;
-borders.push_back(Border(1, 1, 22, 22, 22, 22, 1, 1, 20, 1, 1, 20, 1, 1,
20, 1, 1, 20));
-borders.push_back(Border(1, 3, 52, 52, 52, 52, 1, 1, 50, 1, 1, 50, 1, 1,
50, 1, 1, 50));
-borders.push_back(Border(1, 5, 60, 60, 60, 60, 20, 20, 20, 20, 20, 20, 20,
20, 20, 20, 20, 20));
-borders.push_back(Border(1, 7, 150, 150, 150, 150, 50, 50, 50, 50, 50, 50,
50, 50, 50, 50, 50, 50));
-borders.push_back(Border(1, 9, 71, 71, 71, 71, 20, 1, 50, 20, 1, 50, 20,
1, 50, 20, 1, 50));
-borders.push_back(Border(1, 11, 101, 101, 101, 101, 50, 1, 50, 50, 1, 50,
50, 1, 50, 50, 1, 50));
-borders.push_back(Border(1, 13, 131, 131, 131, 131, 80, 1, 50, 80, 1, 50,
80, 1, 50, 80, 1, 50));
-borders.push_back(Border(1, 15, 120, 120, 120, 120, 50, 20, 50, 50, 20,
50, 50, 20, 50, 50, 20, 50));
-borders.push_back(Border(1, 17, 90, 90, 90, 90, 20, 50, 20, 20, 50, 20,
20, 50, 20, 20, 50, 20));
-borders.push_back(Border(1, 19, 180, 180, 180, 180, 80, 50, 50, 80, 50,
50, 80, 50, 50, 80, 50, 50));
-borders.push_back(Border(1, 21, 180, 180, 180, 180, 50, 80, 50, 50, 80,
50, 50, 80, 50, 50, 80, 50));
-borders.push_back(Border(4, 1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1,
0, 0));
-borders.push_back(Border(4, 3, 10, 10, 10, 10, 10, 0, 0, 10, 0, 0, 10, 0,
0, 10, 0, 0));
-borders.push_back(Border(4, 5, 20, 20, 20, 20, 20, 0, 0, 20, 0, 0, 20, 0,
0, 20, 0, 0));
-borders.push_back(Border(4, 7, 50, 50, 50, 50, 50, 0, 0, 50, 0, 0, 50, 0,
0, 50, 0, 0));
-borders.push_back(Border(4, 9, 80, 80, 80, 80, 80, 0, 0, 80, 0, 0, 80, 0,
0, 80, 0, 0));
-borders.push_back(Border(4, 11, 100, 100, 100, 100, 100, 0, 0, 100, 0, 0,
100, 0, 0, 100, 0, 0));
+borders.push_back(Border(1, 1, 22, 22, 22, 22, 1, 1, 20, 1, 1, 20, 1, 1,
20, 1, 1, 20, 3, 3, 3, 3));
+borders.push_back(Border(1, 3, 52, 52, 52, 52, 1, 1, 50, 1, 1, 50, 1, 1,
50, 1, 1, 50, 3, 3, 3, 3));
+borders.push_back(Border(1, 5, 60, 60, 60, 60, 20, 20, 20, 20, 20, 20, 20,
20, 20, 20, 20, 20, 3, 3, 3, 3));
+borders.push_back(Border(1, 7, 150, 150, 150, 150, 50, 50, 50, 50, 50, 50,
50, 50, 50, 50, 50, 50, 3, 3, 3, 3));
+borders.push_back(Border(1, 9, 71, 71, 71, 71, 20, 1, 50, 20, 1, 50, 20,
1, 50, 20, 1, 50, 3, 3, 3, 3));
+borders.push_back(Border(1, 11, 101, 101, 101, 101, 50, 1, 50, 50, 1, 50,
50, 1, 50, 50, 1, 50, 3, 3, 3, 3));
+borders.push_back(Border(1, 13, 131, 131, 131, 131, 80, 1, 50, 80, 1, 50,
80, 1, 50, 80, 1, 50, 3, 3, 3, 3));
+borders.push_back(Border(1, 15, 120, 120, 120, 120, 50, 20, 50, 50, 20,
50, 50, 20, 50, 50, 20, 50, 3, 3, 3, 3));
+borders.push_back(Border(1, 17, 90, 90, 90, 90, 20, 50, 20, 20, 50, 20,
20, 50, 20, 20, 50, 20, 3, 3, 3, 3));
+borders.push_back(Border(1, 19, 180, 180, 180, 180, 80, 50, 50, 80, 50,
50, 80, 50, 50, 80, 50, 50, 3, 3, 3, 3));
+borders.push_back(Border(1, 21, 180, 180, 180, 180, 50, 80, 50, 50, 80,
50, 50, 80, 50, 50, 80, 50, 3, 3, 3, 3));
+borders.push_back(Border(4, 1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1,
0, 0, 0, 0, 0, 0));
+
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - editeng/source sw/source
editeng/source/rtf/svxrtf.cxx |6 +-
sw/source/core/doc/docnum.cxx |8
sw/source/filter/rtf/rtffld.cxx | 19 ++-
sw/source/filter/rtf/rtffly.cxx |8 +++-
sw/source/filter/rtf/rtftbl.cxx | 24 ++--
sw/source/filter/rtf/swparrtf.cxx |7 ---
sw/source/filter/rtf/swparrtf.hxx |1 -
7 files changed, 48 insertions(+), 25 deletions(-)
New commits:
commit 151ed37ea46e718ada412f37e7e540131effa0e5
Author: Michael Stahl m...@openoffice.org
Date: Thu Aug 2 15:54:46 2012 +0200
some tweaks in RTF filter
Signed-off-by: Petr Mladek pmla...@suse.cz
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 240fccd..0c0f156 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -29,6 +29,7 @@
#include ctype.h
#include tools/datetime.hxx
+#include tools/diagnose_ex.h
#include rtl/tencinfo.h
#include svl/itemiter.hxx
#include svl/whiter.hxx
@@ -801,12 +802,14 @@ void SvxRTFParser::ClearFontTbl()
{
for( sal_uInt32 nCnt = aFontTbl.Count(); nCnt; )
delete aFontTbl.GetObject( --nCnt );
+aFontTbl.Clear();
}
void SvxRTFParser::ClearStyleTbl()
{
for( sal_uInt32 nCnt = aStyleTbl.Count(); nCnt; )
delete aStyleTbl.GetObject( --nCnt );
+aStyleTbl.Clear();
}
void SvxRTFParser::ClearAttrStack()
@@ -1263,7 +1266,8 @@ bool SvxRTFParser::UncompressableStackEntry(const
SvxRTFItemStackType ) const
void SvxRTFItemStackType::Compress( const SvxRTFParser rParser )
{
-DBG_ASSERT( pChildList, There is no child list );
+ENSURE_OR_RETURN_VOID(pChildList, Compress: no ChildList );
+ENSURE_OR_RETURN_VOID(pChildList-Count(), Compress: ChildList empty);
sal_uInt16 n;
SvxRTFItemStackType* pTmp = (*pChildList)[0];
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index d5a609a..9970743 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -89,6 +89,9 @@ namespace {
}
}
+#include stdlib.h
+
+
inline sal_uInt8 GetUpperLvlChg( sal_uInt8 nCurLvl, sal_uInt8 nLevel,
sal_uInt16 nMask )
{
if( 1 nLevel )
@@ -2169,6 +2172,11 @@ SwNumRule* SwDoc::FindNumRulePtr( const String rName )
const
void SwDoc::AddNumRule(SwNumRule * pRule)
{
+if ((SAL_MAX_UINT16 - 1) = pNumRuleTbl-Count())
+{
+OSL_ENSURE(false, SwDoc::AddNumRule: table full.);
+abort(); // this should never happen on real documents
+}
pNumRuleTbl-Insert(pRule, pNumRuleTbl-Count());
maNumRuleMap[pRule-GetName()] = pRule;
pRule-SetNumRuleMap(maNumRuleMap);
diff --git a/sw/source/filter/rtf/rtffld.cxx b/sw/source/filter/rtf/rtffld.cxx
index 51741e1..c42a6a5 100644
--- a/sw/source/filter/rtf/rtffld.cxx
+++ b/sw/source/filter/rtf/rtffld.cxx
@@ -156,7 +156,10 @@ static RTF_FLD_TYPES _WhichFld( String rName, String
rNext )
{
rName = rName.Copy( nFndPos, static_cast xub_StrLen (nLen) );
nFndPos += nTokenStt + static_cast xub_StrLen (nLen);
-while( rNext.GetChar( nFndPos ) == ' ' )++nFndPos;
+while ((nFndPos rNext.Len()) (rNext.GetChar(nFndPos) == ' '))
+{
+++nFndPos;
+}
rNext.Erase( 0, nFndPos );
rNext = comphelper::string::stripEnd(rNext, ' ');
return aFldNmArr[n].eFldType;
@@ -388,8 +391,10 @@ int SwRTFParser::MakeFieldInst( String rFieldStr )
{
xub_StrLen nStartDel = nPos;
nPos += 2;
-while (aSaveStr.GetChar(nPos) == ' ')
+while ((nPos aSaveStr.Len()) (aSaveStr.GetChar(nPos) == ' '))
+{
++nPos;
+}
if (aSaveStr.EqualsIgnoreCaseAscii(MERGEFORMAT, nPos, 11))
{
xub_StrLen nNoDel = (nPos + 11 ) - nStartDel;
@@ -431,7 +436,9 @@ int SwRTFParser::MakeFieldInst( String rFieldStr )
if( STRING_NOTFOUND != ( nPos = aSaveStr.SearchAscii( \\* )) )
{
nPos += 2;
-while( aSaveStr.GetChar(nPos) == ' ' ) nPos++;
+while ((nPos aSaveStr.Len())
+ (aSaveStr.GetChar(nPos) == ' '))
+{ nPos++; }
aSaveStr.Erase( 0, nPos );
// steht jetzt geanu auf dem Format-Namen
@@ -450,7 +457,9 @@ int SwRTFParser::MakeFieldInst( String rFieldStr )
if( STRING_NOTFOUND != ( nPos = aSaveStr.SearchAscii( \\* )) )
{
nPos += 2;
-while( aSaveStr.GetChar(nPos) == ' ' ) nPos++;
+while ((nPos aSaveStr.Len())
+ (aSaveStr.GetChar(nPos) == ' '))
+{ nPos++; }
aSaveStr.Erase( 0, nPos );
// steht jetzt geanu auf dem Format-Namen
@@ -530,7 +539,7 @@ int SwRTFParser::MakeFieldInst( String rFieldStr )
// werden:
// \\data - Datenbank-Name als Field
[PUSHED] Bring background image in About box back more
From Noel Power noel.po...@suse.com: Noel Power has submitted this change and it was merged. Change subject: Bring background image in About box back more .. Bring background image in About box back more + revert background image removal + useful fallback logo text in case rsvg doesn't work on the platform + better calculation of dialog size + somewhat better high-contrast support + slightly modified background image Change-Id: I1cd77dd7b47eec6bf8709b225ecf0d070f9bb869 --- M cui/source/dialogs/about.cxx M cui/source/dialogs/about.hrc M cui/source/dialogs/about.src M cui/source/inc/about.hxx M icon-themes/galaxy/brand/shell/about.svg 5 files changed, 293 insertions(+), 1,536 deletions(-) Approvals: Noel Power: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/344 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1cd77dd7b47eec6bf8709b225ecf0d070f9bb869 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Stefan Knorr heinzless...@gmail.com Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - writerfilter/source
writerfilter/source/rtftok/rtfsdrimport.cxx | 10 ++
1 file changed, 10 insertions(+)
New commits:
commit 78b0de49c342402648b71ba59e91b03a7e7cc38e
Author: Miklos Vajna vmik...@suse.cz
Date: Wed Aug 1 15:37:45 2012 +0200
fdo#49892 implement RTF import of dhgt shape property
Change-Id: I36d574c5f7915d732c6c158fadb91b6032370a01
(cherry picked from commit ce701e94db740ea8c2bb9f6dcf55a2aeda4d71af)
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx
b/writerfilter/source/rtftok/rtfsdrimport.cxx
index dba4545..f12e44c 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -37,6 +37,8 @@
#include filter/msfilter/escherex.hxx
#include filter/msfilter/util.hxx
+#include dmapper/DomainMapper.hxx
+#include ../dmapper/GraphicHelpers.hxx
#include rtfsdrimport.hxx
using rtl::OString;
@@ -258,6 +260,14 @@ void RTFSdrImport::resolve(RTFShape rShape)
aViewBox.Width = i-second.toInt32();
else if ( i-first == geoBottom )
aViewBox.Height = i-second.toInt32();
+else if ( i-first == dhgt )
+{
+writerfilter::dmapper::DomainMapper rMapper =
(writerfilter::dmapper::DomainMapper)m_rImport.Mapper();
+writerfilter::dmapper::GraphicZOrderHelper* pHelper =
rMapper.graphicZOrderHelper();
+sal_Int32 nZOrder = i-second.toInt32();
+xPropertySet-setPropertyValue(ZOrder,
uno::makeAny(pHelper-findZOrder(nZOrder)));
+pHelper-addItem(xPropertySet, nZOrder);
+}
else
SAL_INFO(writerfilter, OSL_THIS_FUNC : TODO handle shape
property '
OUStringToOString( i-first, RTL_TEXTENCODING_UTF8
).getStr() ':'
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/remote' - 3 commits - android/sdremote sd/source
android/sdremote/src/org/libreoffice/impressremote/TestClient.java
|3
android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
|2
android/sdremote/src/org/libreoffice/impressremote/communication/ServerFinder.java
| 105 ++
sd/source/ui/remotecontrol/DiscoveryService.cxx
| 68 --
sd/source/ui/remotecontrol/DiscoveryService.hxx
|9
sd/source/ui/remotecontrol/ImagePreparer.cxx
|2
6 files changed, 168 insertions(+), 21 deletions(-)
New commits:
commit 95f27663a7428018e09a13df4ab811ffb6d8363b
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date: Thu Aug 2 16:52:53 2012 +0200
Server discovery functional.
Change-Id: I8642e0ea95a8d6691b76cc4d2dc1ddfbbf2b03e2
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/communication/ServerFinder.java
b/android/sdremote/src/org/libreoffice/impressremote/communication/ServerFinder.java
index d787e34..b78a9a4 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/communication/ServerFinder.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/communication/ServerFinder.java
@@ -40,16 +40,17 @@ public class ServerFinder {
if (i == aBuffer.length ||
!aCommand.equals(LOREMOTE_ADVERTISE)) {
return;
}
-
- for (int j = i + 1; j aBuffer.length; j++) {
- if (aPacket.getData()[j] == '\n') {
- aAddress = new
String(aPacket.getData(), i + 1, j, CHARSET);
- }
- }
-
- if (aAddress != null) {
- System.out.println(Address is : + aAddress +
\n);
- }
+ System.out.println(SF: +
aPacket.getAddress().toString());
+
+ // for (int j = i + 1; j
aBuffer.length; j++) {
+ // if
(aPacket.getData()[j] == '\n') {
+ // aAddress = new
String(aPacket.getData(), i + 1, j, CHARSET);
+ // }
+ // }
+ //
+ // if (aAddress != null) {
+ //
System.out.println(Address is : + aAddress + \n);
+ // }
} catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();
diff --git a/sd/source/ui/remotecontrol/DiscoveryService.cxx
b/sd/source/ui/remotecontrol/DiscoveryService.cxx
index 612332f..bc514d7 100644
--- a/sd/source/ui/remotecontrol/DiscoveryService.cxx
+++ b/sd/source/ui/remotecontrol/DiscoveryService.cxx
@@ -67,6 +67,8 @@ void DiscoveryService::replyTo( sockaddr_in rAddr )
// OStringBuffer aBuffer( LOREMOTE_ADVERTISE\n );
// aBuffer.append( aAddrString ).append( \n );
// mSocket.sendTo( rAddr, aBuffer.getStr(), aBuffer.getLength() );
+OString aMessage(LOREMOTE_ADVERTISE\n);
+sendto( mSocket, aMessage.getStr(), aMessage.getLength(), 0, (sockaddr*)
rAddr, sizeof(rAddr) );
}
void DiscoveryService::execute()
commit 3d68126411374261b904b3b8bfce552fd6d796b7
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date: Thu Aug 2 16:40:31 2012 +0200
Multicast listening now working.
Change-Id: Icae91b26f1142d7f25d6e38af4f951be26d9b22a
diff --git a/sd/source/ui/remotecontrol/DiscoveryService.cxx
b/sd/source/ui/remotecontrol/DiscoveryService.cxx
index 2d2b367..612332f 100644
--- a/sd/source/ui/remotecontrol/DiscoveryService.cxx
+++ b/sd/source/ui/remotecontrol/DiscoveryService.cxx
@@ -15,6 +15,16 @@
#include DiscoveryService.hxx
+#ifdef WIN32
+ #include winsock.h
+ typedef int socklen_t;
+#else
+ #include sys/types.h
+ #include sys/socket.h
+ #include netinet/in.h
+ #include arpa/inet.h
+#endif
+
using namespace osl;
using namespace rtl;
using namespace sd;
@@ -22,9 +32,25 @@ using namespace std;
DiscoveryService::DiscoveryService()
:
-Thread( sd::DiscoveryService ),
-mSocket()
+Thread( sd::DiscoveryService )
+// mSocket()
{
+mSocket = socket( AF_INET, SOCK_DGRAM, IPPROTO_UDP );
+
+sockaddr_in aAddr;
+aAddr.sin_family = AF_INET;
+aAddr.sin_addr.s_addr = htonl(INADDR_ANY);
+aAddr.sin_port = htons( PORT_DISCOVERY );
+
+bind( mSocket, (sockaddr*) aAddr, sizeof(sockaddr_in) );
+
+struct ip_mreq multicastRequest;
+
+multicastRequest.imr_multiaddr.s_addr = inet_addr( 239.0.0.1 );
+multicastRequest.imr_interface.s_addr =
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 16
writerfilter/source/rtftok/rtfdocumentimpl.hxx |3 +++
writerfilter/source/rtftok/rtfsdrimport.cxx|4
3 files changed, 23 insertions(+)
New commits:
commit 5ea5a0ff387d22e10b7565eec7f0f4abc685dda7
Author: Miklos Vajna vmik...@suse.cz
Date: Wed Aug 1 20:30:40 2012 +0200
fdo#49892 import RTF_SHPB{X,Y}PAGE
(cherry picked from commit 2111c6e6dc18f3ffd11de176791ecc04bab41afb)
Conflicts:
writerfilter/source/rtftok/rtfdocumentimpl.cxx
Change-Id: I8fe2b28f44ee61fc0f1438de3681fd86b16d29ae
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index a59c06d..2074d69 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2207,6 +2207,12 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
case RTF_LANDSCAPE:
lcl_putNestedAttribute(m_aStates.top().aSectionSprms,
NS_ooxml::LN_EG_SectPrContents_pgSz, NS_ooxml::LN_CT_PageSz_orient,
RTFValue::Pointer_t(new RTFValue(1)));
break;
+case RTF_SHPBXPAGE:
+m_aStates.top().aShape.nHoriOrientRelation =
text::RelOrientation::PAGE_FRAME;
+break;
+case RTF_SHPBYPAGE:
+m_aStates.top().aShape.nVertOrientRelation =
text::RelOrientation::PAGE_FRAME;
+break;
default:
SAL_INFO(writerfilter, OSL_THIS_FUNC : TODO handle flag '
lcl_RtfToString(nKeyword) ');
aSkip.setParsed(false);
@@ -3734,6 +3740,16 @@ RTFPicture::RTFPicture()
{
}
+RTFShape::RTFShape()
+: nLeft(0),
+nTop(0),
+nRight(0),
+nBottom(0),
+nHoriOrientRelation(0),
+nVertOrientRelation(0)
+{
+}
+
RTFDrawingObject::RTFDrawingObject()
: nLineColorR(0),
nLineColorG(0),
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 9778ce7..c43ca29 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -190,11 +190,14 @@ namespace writerfilter {
class RTFShape
{
public:
+RTFShape();
std::vector std::pairrtl::OUString, rtl::OUString
aProperties;
int nLeft;
int nTop;
int nRight;
int nBottom;
+sal_Int16 nHoriOrientRelation;
+sal_Int16 nVertOrientRelation;
};
/// Stores the properties of a drawing object.
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx
b/writerfilter/source/rtftok/rtfsdrimport.cxx
index f12e44c..701780d 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -321,6 +321,10 @@ void RTFSdrImport::resolve(RTFShape rShape)
{
xShape-setPosition(awt::Point(rShape.nLeft, rShape.nTop));
xShape-setSize(awt::Size(rShape.nRight - rShape.nLeft, rShape.nBottom
- rShape.nTop));
+if (rShape.nHoriOrientRelation != 0)
+xPropertySet-setPropertyValue(HoriOrientRelation,
uno::makeAny(rShape.nHoriOrientRelation));
+if (rShape.nVertOrientRelation != 0)
+xPropertySet-setPropertyValue(VertOrientRelation,
uno::makeAny(rShape.nVertOrientRelation));
}
// Send it to dmapper
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Change in core[libreoffice-3-6]: fdo#49892 implement RTF import of dhgt shape property
From Noel Power noel.po...@suse.com: Noel Power has submitted this change and it was merged. Change subject: fdo#49892 implement RTF import of dhgt shape property .. fdo#49892 implement RTF import of dhgt shape property Change-Id: I36d574c5f7915d732c6c158fadb91b6032370a01 (cherry picked from commit ce701e94db740ea8c2bb9f6dcf55a2aeda4d71af) --- M writerfilter/source/rtftok/rtfsdrimport.cxx 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: Noel Power: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/358 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I36d574c5f7915d732c6c158fadb91b6032370a01 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Miklos Vajna vmik...@suse.cz Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 16
writerfilter/source/rtftok/rtfdocumentimpl.hxx |3 +++
writerfilter/source/rtftok/rtfsdrimport.cxx|4
3 files changed, 23 insertions(+)
New commits:
commit def0f0c580df3155e98a54422efe5fb7578be485
Author: Miklos Vajna vmik...@suse.cz
Date: Wed Aug 1 20:30:40 2012 +0200
fdo#49892 import RTF_SHPB{X,Y}PAGE
(cherry picked from commit 2111c6e6dc18f3ffd11de176791ecc04bab41afb)
Conflicts:
writerfilter/source/rtftok/rtfdocumentimpl.cxx
Change-Id: I8fe2b28f44ee61fc0f1438de3681fd86b16d29ae
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index af2d592..8e34ad3 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -,6 +,12 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
m_aStates.top().aTableSprms-push_back(make_pair(NS_rtf::LN_NFC,
RTFValue::Pointer_t(new RTFValue(23; // bullets, same as \levelnfc23
}
break;
+case RTF_SHPBXPAGE:
+m_aStates.top().aShape.nHoriOrientRelation =
text::RelOrientation::PAGE_FRAME;
+break;
+case RTF_SHPBYPAGE:
+m_aStates.top().aShape.nVertOrientRelation =
text::RelOrientation::PAGE_FRAME;
+break;
default:
#if OSL_DEBUG_LEVEL 1
OSL_TRACE(%s: TODO handle flag '%s', OSL_THIS_FUNC,
lcl_RtfToString(nKeyword));
@@ -3756,6 +3762,16 @@ RTFPicture::RTFPicture()
{
}
+RTFShape::RTFShape()
+: nLeft(0),
+nTop(0),
+nRight(0),
+nBottom(0),
+nHoriOrientRelation(0),
+nVertOrientRelation(0)
+{
+}
+
RTFFrame::RTFFrame(RTFParserState* pParserState)
: m_pParserState(pParserState),
nX(0),
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index d42a401..4efea1d 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -191,11 +191,14 @@ namespace writerfilter {
class RTFShape
{
public:
+RTFShape();
std::vector std::pairrtl::OUString, rtl::OUString
aProperties;
int nLeft;
int nTop;
int nRight;
int nBottom;
+sal_Int16 nHoriOrientRelation;
+sal_Int16 nVertOrientRelation;
};
/// Stores the properties of a drawing object.
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx
b/writerfilter/source/rtftok/rtfsdrimport.cxx
index e89a8c7..1c2921c 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -321,6 +321,10 @@ void RTFSdrImport::resolve(RTFShape rShape)
{
xShape-setPosition(awt::Point(rShape.nLeft, rShape.nTop));
xShape-setSize(awt::Size(rShape.nRight - rShape.nLeft, rShape.nBottom
- rShape.nTop));
+if (rShape.nHoriOrientRelation != 0)
+
xPropertySet-setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(HoriOrientRelation)),
uno::makeAny(rShape.nHoriOrientRelation));
+if (rShape.nVertOrientRelation != 0)
+
xPropertySet-setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(VertOrientRelation)),
uno::makeAny(rShape.nVertOrientRelation));
}
// Send it to dmapper
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Change in core[libreoffice-3-6]: fdo#49892 import RTF_SHPB{X, Y}PAGE
From Noel Power noel.po...@suse.com:
Noel Power has submitted this change and it was merged.
Change subject: fdo#49892 import RTF_SHPB{X,Y}PAGE
..
fdo#49892 import RTF_SHPB{X,Y}PAGE
(cherry picked from commit 2111c6e6dc18f3ffd11de176791ecc04bab41afb)
Conflicts:
writerfilter/source/rtftok/rtfdocumentimpl.cxx
Change-Id: I8fe2b28f44ee61fc0f1438de3681fd86b16d29ae
---
M writerfilter/source/rtftok/rtfdocumentimpl.cxx
M writerfilter/source/rtftok/rtfdocumentimpl.hxx
M writerfilter/source/rtftok/rtfsdrimport.cxx
3 files changed, 23 insertions(+), 0 deletions(-)
Approvals:
Noel Power: Verified; Looks good to me, approved
--
To view, visit https://gerrit.libreoffice.org/357
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8fe2b28f44ee61fc0f1438de3681fd86b16d29ae
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Miklos Vajna vmik...@suse.cz
Gerrit-Reviewer: Noel Power noel.po...@suse.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-3-5]: fdo#49892 import RTF_SHPB{X, Y}PAGE
From Noel Power noel.po...@suse.com:
Noel Power has submitted this change and it was merged.
Change subject: fdo#49892 import RTF_SHPB{X,Y}PAGE
..
fdo#49892 import RTF_SHPB{X,Y}PAGE
(cherry picked from commit 2111c6e6dc18f3ffd11de176791ecc04bab41afb)
Conflicts:
writerfilter/source/rtftok/rtfdocumentimpl.cxx
Change-Id: I8fe2b28f44ee61fc0f1438de3681fd86b16d29ae
---
M writerfilter/source/rtftok/rtfdocumentimpl.cxx
M writerfilter/source/rtftok/rtfdocumentimpl.hxx
M writerfilter/source/rtftok/rtfsdrimport.cxx
3 files changed, 23 insertions(+), 0 deletions(-)
Approvals:
Noel Power: Verified; Looks good to me, approved
--
To view, visit https://gerrit.libreoffice.org/359
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8fe2b28f44ee61fc0f1438de3681fd86b16d29ae
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-5
Gerrit-Owner: Miklos Vajna vmik...@suse.cz
Gerrit-Reviewer: Noel Power noel.po...@suse.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/qa sw/source
sw/qa/extras/ww8export/data/fdo46020.odt |binary
sw/qa/extras/ww8export/ww8export.cxx | 11 +++
sw/source/filter/ww8/wrtw8nds.cxx|4 +++-
3 files changed, 14 insertions(+), 1 deletion(-)
New commits:
commit e3aca9772f4e1f9fcabecbe5bf22123259b3143a
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Thu Aug 2 14:11:50 2012 +0200
fdo#46020: fixed missing footnote docx/doc/rtf export
Don't skip a next position when parsing a paragraph into runs to export.
Change-Id: If7e887ea84ad24256b37aa96187bc30ea154632b
diff --git a/sw/qa/extras/ww8export/data/fdo46020.odt
b/sw/qa/extras/ww8export/data/fdo46020.odt
new file mode 100644
index 000..478c931
Binary files /dev/null and b/sw/qa/extras/ww8export/data/fdo46020.odt differ
diff --git a/sw/qa/extras/ww8export/ww8export.cxx
b/sw/qa/extras/ww8export/ww8export.cxx
index 58692a6..f8fbba9 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -42,11 +42,13 @@ class Test : public SwModelTestBase
public:
void testN325936();
void testFdo45724();
+void testFdo46020();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
CPPUNIT_TEST(testN325936);
CPPUNIT_TEST(testFdo45724);
+CPPUNIT_TEST(testFdo46020);
#endif
CPPUNIT_TEST_SUITE_END();
@@ -95,6 +97,15 @@ void Test::testFdo45724()
CPPUNIT_ASSERT_EQUAL(OUString(xxx),
xComponent-getCurrentValue().getOUString());
}
+void Test::testFdo46020()
+{
+// The footnote in that document wasn't exported, check that it is
actually exported
+roundtrip(fdo46020.odt);
+uno::Referencetext::XFootnotesSupplier xFootnotesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess
xFootnotes(xFootnotesSupplier-getFootnotes(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xFootnotes-getCount());
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx
b/sw/source/filter/ww8/wrtw8nds.cxx
index 09969f5..efb6e2a 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -1622,8 +1622,10 @@ void MSWordExportBase::UpdatePosition( SwWW8AttrIter*
aAttrIter, xub_StrLen nAkt
xub_StrLen nNextPos;
// go to next attribute if no bookmark is found or if the bookmark is
behind the next attribute position
+// It may happend that the WhereNext() wasn't used in the previous
increment because there was a
+// bookmark before it. Use that position before trying to find another one.
bool bNextBookmark = NearestBookmark( nNextPos, nAktPos, true );
-if( !bNextBookmark || nNextPos aAttrIter-WhereNext() )
+if( nAktPos == aAttrIter-WhereNext() ( !bNextBookmark || nNextPos
aAttrIter-WhereNext() ) )
aAttrIter-NextPos();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3cc7c9d758f5777684a0605d90d9cdd6d2a3da4b
Author: Miklos Vajna vmik...@suse.cz
Date: Thu Aug 2 10:49:02 2012 +0200
fdo#51034 fix docx import of HYPERLINK field, l param
Change-Id: Ic6896f7c795d7d303bf7589a74afb937d4a8e8b5
(cherry picked from commit 68cb050f0fcd37a6b1e78c147402a521d24c25c1)
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 6aaa144..0c05276 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -2806,7 +2806,7 @@ void DomainMapper_Impl::CloseFieldCommand()
if (aPartIt == aItEnd)
break;
-sURL = OUString('#');
+sURL += OUString('#');
sURL += *aPartIt;
}
else if
(aPartIt-equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(\\m)) ||
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit cadbe56429244c300d01b0abad8f66077cf40e7c
Author: Miklos Vajna vmik...@suse.cz
Date: Thu Aug 2 10:49:02 2012 +0200
fdo#51034 fix docx import of HYPERLINK field, l param
Change-Id: Ic6896f7c795d7d303bf7589a74afb937d4a8e8b5
(cherry picked from commit 68cb050f0fcd37a6b1e78c147402a521d24c25c1)
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 270bb12..ee6e291 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -2832,7 +2832,7 @@ void DomainMapper_Impl::CloseFieldCommand()
if (aPartIt == aItEnd)
break;
-sURL = OUString('#');
+sURL += OUString('#');
sURL += *aPartIt;
}
else if ( *aPartIt == \\m || *aPartIt == \\n )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PATCH]fdo#52636:VIEWING: unintuitive Heading for 'Enable experimental Features
Perfect idea! I'm going to go ahead and work on that. I will take out limited (I have no clue what it means either, I figured someone else must have known when they added it ;)). I have a quick question though. What's the best way to modify a patch? The only way I know how is to go back to dismiss my changes and start from scratch. I'm sure there is a better way that I don't know of. Is it to directly modify the patch file in an editor or is there a way for me to edit the cxx/hxx/etc...files and then add/modify the patch using some git command? Thanks for the input Joel On Thu, Aug 2, 2012 at 12:45 AM, Stefan Knorr heinzless...@gmail.comwrote: Hi Joel, On Wed, 2012-08-01 at 13:53 -0700, Joel Madero wrote: I'll fix both. I'll leave limited since it fits, I actually noticed that right after I sent out the email. What does that limited mean, can I ask? I can't really make that out. I'll be moving a lot of stuff around when I move the measurement unit to the general tree, maybe a good solution is moving the experimental stuff to its own tab. Well, the Java panel is quite empty (or at least its space isn't used very well). Renaming that to Advanced and putting the experiments section there might be viable. Astron. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-3-6]: fdo#51034 fix docx import of HYPERLINK field, l param
From Noel Power noel.po...@suse.com: Noel Power has submitted this change and it was merged. Change subject: fdo#51034 fix docx import of HYPERLINK field, l param .. fdo#51034 fix docx import of HYPERLINK field, l param Change-Id: Ic6896f7c795d7d303bf7589a74afb937d4a8e8b5 (cherry picked from commit 68cb050f0fcd37a6b1e78c147402a521d24c25c1) --- M writerfilter/source/dmapper/DomainMapper_Impl.cxx 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Noel Power: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/360 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic6896f7c795d7d303bf7589a74afb937d4a8e8b5 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Miklos Vajna vmik...@suse.cz Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-3-5]: fdo#51034 fix docx import of HYPERLINK field, l param
From Noel Power noel.po...@suse.com: Noel Power has submitted this change and it was merged. Change subject: fdo#51034 fix docx import of HYPERLINK field, l param .. fdo#51034 fix docx import of HYPERLINK field, l param Change-Id: Ic6896f7c795d7d303bf7589a74afb937d4a8e8b5 (cherry picked from commit 68cb050f0fcd37a6b1e78c147402a521d24c25c1) --- M writerfilter/source/dmapper/DomainMapper_Impl.cxx 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Noel Power: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/361 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic6896f7c795d7d303bf7589a74afb937d4a8e8b5 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-5 Gerrit-Owner: Miklos Vajna vmik...@suse.cz Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - i18npool/source
i18npool/source/localedata/data/tr_TR.xml | 11 +-- 1 file changed, 9 insertions(+), 2 deletions(-) New commits: commit cb7c34f3bcd4df7a67f1a9d31b3bf849af4f79e4 Author: Eike Rathke er...@redhat.com Date: Thu Aug 2 17:09:43 2012 +0200 changes to fdo#53002 Fix for default currency settings. There can be only one usedInCompatibleFormatCodes=true and because of the new symbol with identical ISO 4217 TRY we need also legacOnly=true on the old entry. Additionally, as the TL symbol was already used with TRL also that one needed legacyOnly=true to not end up with a list of duplicated TL formats in the number formatter. Change-Id: I8e3ec2f75828b8f7c6a2077ef2fd30fc5e7a5642 diff --git a/i18npool/source/localedata/data/tr_TR.xml b/i18npool/source/localedata/data/tr_TR.xml index 5fa3dbc..e303518 100644 --- a/i18npool/source/localedata/data/tr_TR.xml +++ b/i18npool/source/localedata/data/tr_TR.xml @@ -325,21 +325,21 @@ /Calendar /LC_CALENDAR LC_CURRENCY -Currency default=true usedInCompatibleFormatCodes=false +Currency default=true usedInCompatibleFormatCodes=true CurrencyIDTRY/CurrencyID CurrencySymbolTL/CurrencySymbol BankSymbolTRY/BankSymbol CurrencyNameTürk Lirası/CurrencyName DecimalPlaces2/DecimalPlaces /Currency -Currency default=false usedInCompatibleFormatCodes=true +Currency default=false usedInCompatibleFormatCodes=false legacyOnly=true CurrencyIDTRY/CurrencyID CurrencySymbolYTL/CurrencySymbol BankSymbolTRY/BankSymbol CurrencyNameYeni Türk Lirası/CurrencyName DecimalPlaces2/DecimalPlaces /Currency -Currency default=false usedInCompatibleFormatCodes=true +Currency default=false usedInCompatibleFormatCodes=false legacyOnly=true CurrencyIDTRL/CurrencyID CurrencySymbolTL/CurrencySymbol BankSymbolTRL/BankSymbol commit d09b4e30d7e87f181fa3913e81c6d38c04a8f5f8 Author: Efe Gürkan YALAMAN efeyala...@gmail.com Date: Wed Aug 1 23:55:25 2012 +0300 fdo#53002 Fix for default currency settings. Turkish currency New Turkish Lira was replaced with Turkish Lira on 01.01.2009. TRY TL added for default. TRY YTL is not default anymore. Change-Id: I08f5f70bf46d2f655c11ddaff77f68ba1e398225 diff --git a/i18npool/source/localedata/data/tr_TR.xml b/i18npool/source/localedata/data/tr_TR.xml index 94e5c2a..5fa3dbc 100644 --- a/i18npool/source/localedata/data/tr_TR.xml +++ b/i18npool/source/localedata/data/tr_TR.xml @@ -327,6 +327,13 @@ LC_CURRENCY Currency default=true usedInCompatibleFormatCodes=false CurrencyIDTRY/CurrencyID + CurrencySymbolTL/CurrencySymbol + BankSymbolTRY/BankSymbol + CurrencyNameTürk Lirası/CurrencyName + DecimalPlaces2/DecimalPlaces +/Currency +Currency default=false usedInCompatibleFormatCodes=true + CurrencyIDTRY/CurrencyID CurrencySymbolYTL/CurrencySymbol BankSymbolTRY/BankSymbol CurrencyNameYeni Türk Lirası/CurrencyName ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED]fdo#53002:Turkish Default Currency to be changed YTL to TL
Hi Efe, On Thursday, 2012-08-02 00:05:29 +0300, Efe Gürkan YALAMAN wrote: The currency for Turkish was TRL TL since 2005. After that the currency was TRY YTL since 2009. Current currency is TRY TL. I changed default currency to TRY TL for Turkish. There is two patches because I could not decide whether to delete TRY YTL. Thanks for the patches. The first where you added another currency entry goes into the right direction, but there's an error Error: CurrencySymbol YTL flagged as usedInCompatibleFormatCodes doesn't match TL determined from format codes. Error: Currency: more than one currency flagged as usedInCompatibleFormatCodes. The entry used in the format codes usually stays the same, the number formatter exchanges symbols in the format codes, but since the older symbol is now reused it would duplicate the list of formats. I fixed that, and since the ISO 4217 code TRY actually stays the same and only the currency symbol changes another attribute legacyOnly=true is needed to correctly load documents using the old currency symbol and not offer it in the dialog otherwise. Using legacyOnly=true on the old TL entry and makeing the new one default prevents duplication of the currency formats. Much of weird stuff happens if some organizations decide to reuse symbols ;-) There is also a new currency sign for Turkish Lira. The sign can be implemented later. I would had preferred if we could had added it now, as we're on it anyway and for changing the symbol again later we would have to introduce yet another entry and declare the current as legacy, but the new Unicode code point U+20BA assigned to the symbol isn't in yet and won't be displayed properly by systems (it is some generic ₺ currency symbol now) so we'll have to do that later, see also https://en.wikipedia.org/wiki/Turkish_lira_sign I commited your patch as d09b4e30d7e87f181fa3913e81c6d38c04a8f5f8 and my follow-up changes cb7c34f3bcd4df7a67f1a9d31b3bf849af4f79e4 (sorry, the fdo machine where cgit runs on is currently down, otherwise I'd give you browsable URLs) Btw, please configure your git to use a correct email address, in the patch I changed efe@efe-HP-Ubuntu.(none) to efeyala...@gmail.com git config --global user.email efeyala...@gmail.com As a convention, if a patch fixes a bug we also mention fdo#... in the commit summary to have a patch assigned to a bug, in this case fdo#53002, I added that in the commit. Last but not least, apparently we don't have your license statement on file, https://wiki.documentfoundation.org/Development/Developers Could you please send a mail to the mailing list with a blanket statement that you contribute this and further patches under LGPLv3+ and MPL 1.1 licenses? Thanks Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgpUw6QVzR92J.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH]fdo#53002:Turkish Default Currency to be changed YTL to TL
Hi Efe, On Thursday, 2012-08-02 13:35:54 +0300, Efe Gürkan YALAMAN wrote: Did my email filtered Either that and maybe had to be moderated through ... or mail list doesn't send mail back to it's owner? ... also that is possible, depends on how you setup your mailing list subscription in mailman where you can specify whether you want your own mails been sent back to you or not. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgptcJ5cntOBy.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - desktop/source editeng/source
desktop/source/deployment/registry/component/dp_component.cxx | 97 +-
editeng/source/misc/svxacorr.cxx | 26 +-
2 files changed, 30 insertions(+), 93 deletions(-)
New commits:
commit 566bcf64ad9092ba6e55ba3de514226ae6b10c10
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Aug 2 17:30:09 2012 +0200
Related fdo#53006 Make CApitals correction work without dictionary
In a language for which there is no dictionary available (no ABC check in
front of the current item in Writer's Format - Character... - Font -
Language
list), Correct TWo INitial CApitals (from Writer's Tools - AutoCorrect
Options... - Options) did not work (i.e., typing FOo followed by a space
would not change it to Foo). That was apparently a regression introduced
with
51efaa592d4f54133c74e38cf294526bc78dffcd Double-capital autocor takes
spellcheck in account. (I verified that with this fix words like MPs in
English (UK) are still left as MPs.) Thanks to Caolán for help.
Change-Id: Ia76286e4ca73138ce3571145b9c40b031a4553ba
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 5d6a045..47cc1d4 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -371,25 +371,27 @@ sal_Bool SvxAutoCorrect::FnCptlSttWrd( SvxAutoCorrDoc
rDoc, const String rTxt,
String sWord( rTxt.Copy( nSttPos - 1, nEndPos - nSttPos + 1 ));
if( !FindInWrdSttExceptList(eLang, sWord) )
{
+// Check that word isn't correctly spelled before correcting:
::com::sun::star::uno::Reference
::com::sun::star::linguistic2::XSpellChecker1 xSpeller =
SvxGetSpellChecker();
-Sequence ::com::sun::star::beans::PropertyValue aEmptySeq;
-// Check that word isn't correctly spelled before correcting
-::com::sun::star::uno::Reference
::com::sun::star::linguistic2::XSpellAlternatives xSpellAlt
-= xSpeller-spell(sWord, eLang, aEmptySeq);
-if(xSpellAlt.is())
+if( xSpeller-hasLanguage(eLang) )
{
-sal_Unicode cSave = rTxt.GetChar( nSttPos );
-rtl::OUString sChar( cSave );
-sChar = rCC.lowercase( sChar );
-if( sChar[0] != cSave rDoc.ReplaceRange( nSttPos, 1, sChar
))
+Sequence ::com::sun::star::beans::PropertyValue aEmptySeq;
+if (!xSpeller-spell(sWord, eLang, aEmptySeq).is())
{
-if( SaveWordWrdSttLst nFlags )
-rDoc.SaveCpltSttWord( CptlSttWrd, nSttPos, sWord,
cSave );
-bRet = sal_True;
+return false;
}
}
+sal_Unicode cSave = rTxt.GetChar( nSttPos );
+rtl::OUString sChar( cSave );
+sChar = rCC.lowercase( sChar );
+if( sChar[0] != cSave rDoc.ReplaceRange( nSttPos, 1, sChar ))
+{
+if( SaveWordWrdSttLst nFlags )
+rDoc.SaveCpltSttWord( CptlSttWrd, nSttPos, sWord, cSave );
+bRet = sal_True;
+}
}
}
return bRet;
commit 96f28626f0ac540fd0d0e129d00f3942bd64235b
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Aug 2 15:08:52 2012 +0200
Check for ComponentPackageImpl::isRegistered_ in the current rdb
...not the old one that does not contain the changes from the current
session.
Otherwise, actively registered components in bundled extensions would not
necessarily be re-registered upon start up. Any old instance would be
removed,
but the new instance would not be registered as isRegistered_ would still
return true.
To me it looks like 7a400caaa6946399ea31614d056d435350f42dc1 jl145:
#i99257#
Extension Manager prevents running of multiple instances which acces the
same
shared data erroneously introduced a call to getRDB_RO instead of getRDB
into
isRegistered_. That (only) call of getRDB_RO gone allowed some clean up,
incl.
renaming remaining variables from ..._RO to ..._orig.
Change-Id: I7eccac699e6fa5799f77b038b15d62e0a9c1ad17
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx
b/desktop/source/deployment/registry/component/dp_component.cxx
index fa871d5..0714842 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -155,10 +155,6 @@ class BackendImpl : public
::dp_registry::backend::PackageRegistryBackend
const Referenceregistry::XSimpleRegistry getRDB() const;
-//Provides the read-only registry (e.g. not the one based on the
duplicated
-//rdb files
-const Referenceregistry::XSimpleRegistry getRDB_RO() const;
-
public:
ComponentPackageImpl(
[REVIEW 3-6] Related fdo#53006 Make CApitals correction work without dictionary
Even though the underlying fix for https://bugs.freedesktop.org/show_bug.cgi?id=53006 Autocorrection TWo INitial CApitals does not work because of bundled extensions problem lies elsewhere, http://cgit.freedesktop.org/libreoffice/core/commit/?id=566bcf64ad9092ba6e55ba3de514226ae6b10c10 Related fdo#53006 Make CApitals correction work without dictionary fixes an annoyance that is probably worth backporting to libreoffice-3-6 in its own right. Thanks, Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - 2 commits - sc/source
sc/source/filter/excel/tokstack.cxx |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) New commits: commit 4d306525ebc362c6937862fbce871eb5dab8df6c Author: Michael Stahl mst...@redhat.com Date: Fri Jul 27 18:10:33 2012 +0200 warning: statement has no effect Change-Id: I06a26ebd1703e1d753e35daeed610671fc451a8f (cherry picked from commit 114ccd28e09f0fd13c8ff4e61e82e3f13198febf) Signed-off-by: Eike Rathke er...@redhat.com diff --git a/sc/source/filter/excel/tokstack.cxx b/sc/source/filter/excel/tokstack.cxx index 7bce9de..61a0a16 100644 --- a/sc/source/filter/excel/tokstack.cxx +++ b/sc/source/filter/excel/tokstack.cxx @@ -524,7 +524,7 @@ bool TokenPool::GetElement( const sal_uInt16 nId ) pScToken-AddExternalSingleReference(r.mnFileId, r.maTabName, r.maRef); } else -bRet - false; +bRet = false; } break; case T_ExtRefA: @@ -536,7 +536,7 @@ bool TokenPool::GetElement( const sal_uInt16 nId ) pScToken-AddExternalDoubleReference(r.mnFileId, r.maTabName, r.maRef); } else -bRet - false; +bRet = false; } break; default: commit 20b30ff65c51709cfa6bd3e754351c10a0bede34 Author: Eike Rathke er...@redhat.com Date: Fri Jul 27 19:20:50 2012 +0200 added back a missing else c75e2ed27d5da71891ed7a148ff9603c58eaa58e (merge of OOo filter rework) omitted an else of a condition. Change-Id: I6f342a48938aaf4090fc738afc6cf551a083b4fc (cherry picked from commit b06d679eb3d8190a470f7640740571f388106605) Signed-off-by: Michael Stahl mst...@redhat.com diff --git a/sc/source/filter/excel/tokstack.cxx b/sc/source/filter/excel/tokstack.cxx index 8d3e762..7bce9de 100644 --- a/sc/source/filter/excel/tokstack.cxx +++ b/sc/source/filter/excel/tokstack.cxx @@ -477,7 +477,8 @@ bool TokenPool::GetElement( const sal_uInt16 nId ) else pScToken-AddExternal( p-aText, p-eId ); } -bRet = false; +else +bRet = false; } break; case T_Nlf: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: basctl/source
basctl/source/basicide/baside2b.cxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit 8ba8aca1ac4744a23eefb7bb5892e2a697d9d987
Author: Noel Power noel.po...@novell.com
Date: Thu Aug 2 16:56:36 2012 +0100
fix for fdo#47907
Change-Id: Ia5e4e7429db122db505d59289b1106814ea7c378
diff --git a/basctl/source/basicide/baside2b.cxx
b/basctl/source/basicide/baside2b.cxx
index a5702c1..c3223c6 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -682,7 +682,6 @@ void EditorWindow::Notify( SfxBroadcaster /*rBC*/, const
SfxHint rHint )
( 0, pModulWindow-GetBreakPointWindow().GetCurYOffset() -
pEditView-GetStartDocPos().Y() );
pModulWindow-GetLineNumberWindow().DoScroll
( 0, pModulWindow-GetLineNumberWindow().GetCurYOffset() -
pEditView-GetStartDocPos().Y() );
-pModulWindow-Invalidate();
}
else if( rTextHint.GetId() == TEXT_HINT_TEXTHEIGHTCHANGED )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - sc/AllLangResTarget_sc.mk sc/CppunitTest_sc_ucalc.mk sc/Library_sc.mk scp2/inc scp2/macros scp2/source sc/source tubes/AllLangResTarget_tubes.mk tubes/CppunitTest_
sc/AllLangResTarget_sc.mk|1 sc/CppunitTest_sc_ucalc.mk | 10 - sc/Library_sc.mk | 12 - sc/source/ui/collab/contacts.cxx | 290 --- sc/source/ui/collab/contacts.hrc | 11 - sc/source/ui/collab/contacts.hxx | 35 --- sc/source/ui/collab/contacts.src | 61 -- sc/source/ui/collab/sccollaboration.cxx | 62 ++ sc/source/ui/collab/sendfunc.cxx |7 sc/source/ui/inc/sccollaboration.hxx | 31 +++ sc/source/ui/view/cellsh3.cxx|7 scp2/inc/macros.inc |1 scp2/macros/macro.pl | 11 - scp2/source/ooo/file_resource_ooo.scp|3 scp2/source/ooo/module_lang_template.scp |1 tubes/AllLangResTarget_tubes.mk | 19 ++ tubes/CppunitTest_tubes_test.mk |4 tubes/Library_tubes.mk |8 tubes/Module_tubes.mk|1 tubes/Package_inc.mk |2 tubes/inc/tubes/collaboration.hxx| 34 +++ tubes/inc/tubes/conference.hxx |8 tubes/inc/tubes/contacts.hxx | 38 tubes/source/conference.cxx | 29 ++- tubes/source/contacts.cxx| 280 + tubes/source/contacts.hrc| 11 + tubes/source/contacts.src| 60 ++ tubes/source/manager.cxx |2 28 files changed, 592 insertions(+), 447 deletions(-) New commits: commit bc21b49a464ae153341ee8d836993ca89b1a6919 Author: Matúš Kukan matus.ku...@gmail.com Date: Mon Jul 30 11:49:10 2012 +0200 tubes: move sc/source/ui/collab/contacts.* to tubes - sc no longer directly links against telepathy - there is new class ScCollaboration derived from abstract Collaboration describing collaboration functionality for apps used in tubes/ - also added resource manager into tubes/ Change-Id: Ic89ae955f5b47490f4f4b8781bcee5dea5336bae diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk index 90ff378..2d3c64c 100644 --- a/sc/AllLangResTarget_sc.mk +++ b/sc/AllLangResTarget_sc.mk @@ -83,7 +83,6 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\ sc/source/ui/src/condformatdlg.src \ sc/source/ui/src/condformatmgr.src \ sc/source/ui/cctrl/checklistmenu.src \ - sc/source/ui/collab/contacts.src \ sc/source/ui/navipi/navipi.src \ sc/source/ui/docshell/tpstat.src \ sc/source/ui/optdlg/calcoptionsdlg.src \ diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk index 8301416..2796242 100644 --- a/sc/CppunitTest_sc_ucalc.mk +++ b/sc/CppunitTest_sc_ucalc.mk @@ -44,15 +44,7 @@ $(call gb_CxxObject_get_target,sc/qa/unit/ucalc): \ $(WORKDIR)/AllLangRes/sc \ ifeq ($(ENABLE_TELEPATHY),TRUE) - -$(eval $(call gb_CppunitTest_use_libraries,sc_ucalc,\ - tubes \ -)) - -$(eval $(call gb_CppunitTest_use_externals,sc_ucalc,\ - telepathy \ -)) - +$(eval $(call gb_CppunitTest_use_libraries,sc_ucalc,tubes)) endif $(eval $(call gb_CppunitTest_use_libraries,sc_ucalc, \ diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk index 998ca60..1a68be6 100644 --- a/sc/Library_sc.mk +++ b/sc/Library_sc.mk @@ -43,24 +43,16 @@ $(eval $(call gb_Library_add_defs,sc,\ $(eval $(call gb_Library_use_sdk_api,sc)) ifeq ($(ENABLE_TELEPATHY),TRUE) - -$(eval $(call gb_Library_use_libraries,sc,\ - tubes \ -)) +$(eval $(call gb_Library_use_libraries,sc,tubes)) $(eval $(call gb_Library_add_defs,sc,\ -DENABLE_TELEPATHY \ )) -$(eval $(call gb_Library_use_externals,sc,\ - telepathy \ -)) - $(eval $(call gb_Library_add_exception_objects,sc,\ - sc/source/ui/collab/contacts \ + sc/source/ui/collab/sccollaboration \ sc/source/ui/collab/sendfunc \ )) - endif $(eval $(call gb_Library_use_libraries,sc,\ diff --git a/sc/source/ui/collab/contacts.cxx b/sc/source/ui/collab/contacts.cxx deleted file mode 100644 index e6e2239..000 --- a/sc/source/ui/collab/contacts.cxx +++ /dev/null @@ -1,290 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * Version: MPL 1.1 / GPLv3+ / LGPLv3+ - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the License); you may not use this file except in compliance with - * the License or as specified alternatively below. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an AS IS basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * Major Contributor(s): - * Copyright (C) 2012 Michael Meeks michael.me...@suse.com (initial developer) - * - * All Rights Reserved. - * - * For minor contributions see the git repository. - * -
Re: fdo#47907: fix flickering scrolling in Basic IDE
On 02/08/12 15:31, Noel Power wrote:
Hi János,
On 31/07/12 12:34, János Uray wrote:
Again? Oh, yes.
Now here it is.
On Tue, Jul 31, 2012 at 11:10 AM, Noel Power nopo...@suse.com
mailto:nopo...@suse.com wrote:
Hi János
you forgot to attach the patch :-)
On 30/07/12 19:04, János Uray wrote:
This patch solves this bug:
https://bugs.freedesktop.org/show_bug.cgi?id=47907
The text was flickering because Window::Invalidate() clears the
client area by default. To prevent this, I've added an
INVALIDATE_NOERASE parameter to Invalidate() calls.
On the other hand, the background still needed to be erased
outside the text: the indentation space and the rest of the line.
seems to work better :-), imho still is not as smooth as 3.4, I would
love to know *why* we get this behaviour now in =3.5, is something
triggering Resize() more often now ( and why indeed is Resize even
called when scrolling ). Additionally I am a but nervous about changes
to the TextEngine ( a piece of code I have no familiarity with at all
). Saying that the change you made seems quite small ( despite the
confusing diff due to the whitespace changes ) I suppose it is the
last part of the patch that is really necessary. But still it just
feels wrong that we need to tweak the TextEngine and I wonder are we
correcting a side affect rather than fixing the root cause
well it seems that
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -682,7 +682,6 @@ void EditorWindow::Notify( SfxBroadcaster /*rBC*/,
const SfxHint rHint )
( 0,
pModulWindow-GetBreakPointWindow().GetCurYOffset() -
pEditView-GetStartDocPos().Y() );
pModulWindow-GetLineNumberWindow().DoScroll
( 0,
pModulWindow-GetLineNumberWindow().GetCurYOffset() -
pEditView-GetStartDocPos().Y() );
-pModulWindow-Invalidate();
}
else if( rTextHint.GetId() == TEXT_HINT_TEXTHEIGHTCHANGED )
{
solves the problem, I see no side affects, however since you have proved
you are quite adept and talented at handling complicated drawing bits,
notice if you scroll the window ( by dragging the scroll bar ) if you
have the linenumbers enabled they flash and flicker and even disappear
while scrolling, it would be great to get than nice and smooth
Noel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - editeng/source
editeng/source/misc/svxacorr.cxx | 26 ++
1 file changed, 14 insertions(+), 12 deletions(-)
New commits:
commit c247613d2f19b01702520d837e55529fd3c0b021
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Aug 2 17:30:09 2012 +0200
Related fdo#53006 Make CApitals correction work without dictionary
In a language for which there is no dictionary available (no ABC check in
front of the current item in Writer's Format - Character... - Font -
Language
list), Correct TWo INitial CApitals (from Writer's Tools - AutoCorrect
Options... - Options) did not work (i.e., typing FOo followed by a space
would not change it to Foo). That was apparently a regression introduced
with
51efaa592d4f54133c74e38cf294526bc78dffcd Double-capital autocor takes
spellcheck in account. (I verified that with this fix words like MPs in
English (UK) are still left as MPs.) Thanks to Caolán for help.
Change-Id: Ia76286e4ca73138ce3571145b9c40b031a4553ba
(cherry picked from commit 566bcf64ad9092ba6e55ba3de514226ae6b10c10)
Signed-off-by: Michael Stahl mst...@redhat.com
Conflicts:
editeng/source/misc/svxacorr.cxx
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index fa9c7af..6d2440b 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -427,25 +427,27 @@ sal_Bool SvxAutoCorrect::FnCptlSttWrd( SvxAutoCorrDoc
rDoc, const String rTxt,
String sWord( rTxt.Copy( nSttPos - 1, nEndPos - nSttPos + 1 ));
if( !FindInWrdSttExceptList(eLang, sWord) )
{
+// Check that word isn't correctly spelled before correcting:
::com::sun::star::uno::Reference
::com::sun::star::linguistic2::XSpellChecker1 xSpeller =
SvxGetSpellChecker();
-Sequence ::com::sun::star::beans::PropertyValue aEmptySeq;
-// Check that word isn't correctly spelled before correcting
-::com::sun::star::uno::Reference
::com::sun::star::linguistic2::XSpellAlternatives xSpellAlt
-= xSpeller-spell(sWord, eLang, aEmptySeq);
-if(xSpellAlt.is())
+if( xSpeller-hasLanguage(eLang) )
{
-sal_Unicode cSave = rTxt.GetChar( nSttPos );
-String sChar( cSave );
-sChar = rCC.lowercase( sChar );
-if( sChar.GetChar(0) != cSave rDoc.ReplaceRange( nSttPos,
1, sChar ))
+Sequence ::com::sun::star::beans::PropertyValue aEmptySeq;
+if (!xSpeller-spell(sWord, eLang, aEmptySeq).is())
{
-if( SaveWordWrdSttLst nFlags )
-rDoc.SaveCpltSttWord( CptlSttWrd, nSttPos, sWord,
cSave );
-bRet = sal_True;
+return false;
}
}
+sal_Unicode cSave = rTxt.GetChar( nSttPos );
+String sChar( cSave );
+sChar = rCC.lowercase( sChar );
+if( sChar.GetChar(0) != cSave rDoc.ReplaceRange( nSttPos, 1,
sChar ))
+{
+if( SaveWordWrdSttLst nFlags )
+rDoc.SaveCpltSttWord( CptlSttWrd, nSttPos, sWord, cSave );
+bRet = sal_True;
+}
}
}
return bRet;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - cosv/StaticLibrary_cosv.mk cross_toolset/prj Module_cross_tail_build.mk Module_tail_build.mk udm/StaticLibrary_udm.mk
Module_cross_tail_build.mk |3 +++ Module_tail_build.mk|3 +++ cosv/StaticLibrary_cosv.mk |5 ++--- cross_toolset/prj/build.lst |2 +- udm/StaticLibrary_udm.mk|5 - 5 files changed, 13 insertions(+), 5 deletions(-) New commits: commit 8ee8300ca9f7e3355a671bd4cfae59e0fddbec41 Author: David Tardon dtar...@redhat.com Date: Thu Aug 2 17:58:12 2012 +0200 add autodoc and its deps to cross_tail_build Change-Id: I39c7f026576f1815ed7f683f0f039b2d074840cf diff --git a/Module_cross_tail_build.mk b/Module_cross_tail_build.mk index dba4eec..f0e5ca0 100644 --- a/Module_cross_tail_build.mk +++ b/Module_cross_tail_build.mk @@ -28,8 +28,10 @@ $(eval $(call gb_Module_Module,cross_tail_build)) $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\ + autodoc \ basegfx \ binaryurp \ + cosv \ i18npool \ i18nutil \ idl \ @@ -49,6 +51,7 @@ $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\ sax \ shell \ tools \ + udm \ unoil \ unotest \ unotools \ diff --git a/cross_toolset/prj/build.lst b/cross_toolset/prj/build.lst index 2883e64..e720231 100644 --- a/cross_toolset/prj/build.lst +++ b/cross_toolset/prj/build.lst @@ -1 +1 @@ -crscross_toolset :: autodoc setup_native cross_tail_build NULL +crscross_toolset :: setup_native cross_tail_build NULL commit bcd0b2a9ff3f96be9a54f75a916d53d2dc66954d Author: David Tardon dtar...@redhat.com Date: Thu Aug 2 17:57:23 2012 +0200 add autodoc and its deps to tail_build Change-Id: I4a5e960c13b5f17235dc50f8ee6754a029c70840 diff --git a/Module_tail_build.mk b/Module_tail_build.mk index bdd7ef1..cbc0462 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -28,6 +28,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ accessibility \ animations \ apple_remote \ + autodoc \ avmedia \ basctl \ basebmp \ @@ -39,6 +40,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ chart2 \ configmgr \ connectivity \ + cosv \ cppcanvas \ cpputools \ cui \ @@ -119,6 +121,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ tubes \ twain \ ucb \ + udm \ unixODBC \ UnoControls \ unodevtools \ commit 75c3e803316f307d02569485e6e00aa04ec6dc09 Author: David Tardon dtar...@redhat.com Date: Thu Aug 2 18:03:22 2012 +0200 make sure headers are in place when the libs are used Change-Id: I18c21d46153ef6be728dc3d8335e9c06cc7f3ad3 diff --git a/cosv/StaticLibrary_cosv.mk b/cosv/StaticLibrary_cosv.mk index 32b9a05..d6f3229 100644 --- a/cosv/StaticLibrary_cosv.mk +++ b/cosv/StaticLibrary_cosv.mk @@ -9,9 +9,8 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,cosv)) -$(eval $(call gb_StaticLibrary_set_include,cosv,\ --I$(SRCDIR)/cosv/inc \ -$$(INCLUDE) \ +$(eval $(call gb_StaticLibrary_use_packages,cosv,\ + cosv_inc \ )) $(eval $(call gb_StaticLibrary_add_exception_objects,cosv,\ diff --git a/udm/StaticLibrary_udm.mk b/udm/StaticLibrary_udm.mk index 6077a47..01fe7ee 100644 --- a/udm/StaticLibrary_udm.mk +++ b/udm/StaticLibrary_udm.mk @@ -9,8 +9,11 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,udm)) +$(eval $(call gb_StaticLibrary_use_packages,udm,\ + udm_inc \ +)) + $(eval $(call gb_StaticLibrary_set_include,udm,\ --I$(SRCDIR)/udm/inc \ -I$(SRCDIR)/udm/source/inc \ $$(INCLUDE) \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED][3-6] Re: [REVIEW 3-6] Related fdo#53006 Make CApitals correction work without dictionary
On 02/08/12 17:55, Stephan Bergmann wrote: Even though the underlying fix for https://bugs.freedesktop.org/show_bug.cgi?id=53006 Autocorrection TWo INitial CApitals does not work because of bundled extensions problem lies elsewhere, http://cgit.freedesktop.org/libreoffice/core/commit/?id=566bcf64ad9092ba6e55ba3de514226ae6b10c10 Related fdo#53006 Make CApitals correction work without dictionary fixes an annoyance that is probably worth backporting to libreoffice-3-6 in its own right. pushed to libreoffice-3-6 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW-3-6][REVIEW-3-6-x]fdo#52998 fdo#52999 MAB
Hi Noel, On Thursday, 2012-08-02 14:32:16 +0100, Noel Power wrote: master:6068f2f7cf5d66c68241b3831851b413b2e0b3ba ( sorry don't have the cgit url as cgit is dead ) git show 6068f2f7cf5d66c68241b3831851b413b2e0b3ba | vim - works fine ;-) However, that is supposed to fix that comments disappear when saving to .xls, correct (as bz is down as well ...) ? It doesn't for me in 3-6, reloading the .xls the comment is gone. The patch itself looks correct, but apparently there's more to it. Placing a breakpoint there revealed that a XclExpNote record is never added.. some seconds later: this if a note is on a cell without content ... notes are saved only for cells with content. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgpxDIW6uQVNR.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 6 commits - basebmp/test basegfx/test binaryurp/qa cppuhelper/qa i18npool/qa i18npool/source Module_tail_build.mk sax/qa tools/qa vcl/ios
Module_tail_build.mk |4
basebmp/test/basebmp_cppunittester_all.cxx | 126 -
basebmp/test/basictest.cxx |4
basegfx/test/basegfx1d.cxx |4
basegfx/test/basegfx_cppunittester_all.cxx | 135 --
binaryurp/qa/binaryurp_cppunittester_all.cxx | 136 --
binaryurp/qa/test-cache.cxx |4
binaryurp/qa/test-unmarshal.cxx |4
cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx |4
cppuhelper/qa/static/cppuhelper_cppunittester_all.cxx| 137 --
cppuhelper/qa/static/cppuhelper_cppunittester_subsequent.cxx | 136 --
cppuhelper/qa/static/makefile.mk | 73 -
i18npool/qa/cppunit/i18npool_cppunittester_all.cxx | 145 ---
i18npool/qa/cppunit/test_breakiterator.cxx |4
i18npool/source/indexentry/indexentrysupplier_asian.cxx |3
i18npool/source/textconversion/textconversion_ko.cxx |8
sax/qa/cppunit/sax_cppunittester_all.cxx | 128 -
tools/qa/cppunit/test_reversemap.cxx |4
tools/qa/cppunit/tools_cppunittester_all.cxx | 126 -
vcl/ios/source/app/salinst.cxx | 14 -
20 files changed, 13 insertions(+), 1186 deletions(-)
New commits:
commit 85a8a72067c4e13f3bddbe11e0899702202f4c4f
Author: Tor Lillqvist t...@iki.fi
Date: Thu Aug 2 15:27:06 2012 +0300
Bin unused function for now
Change-Id: Ib08bf14eebf366aa4bd3e82806a91dd12033c417
diff --git a/vcl/ios/source/app/salinst.cxx b/vcl/ios/source/app/salinst.cxx
index 5536538..a9a9f91 100644
--- a/vcl/ios/source/app/salinst.cxx
+++ b/vcl/ios/source/app/salinst.cxx
@@ -857,18 +857,4 @@ CGImageRef CreateCGImage( const Image rImage )
return xImage;
}
-UIImage* CreateNSImage( const Image rImage )
-{
-CGImageRef xImage = CreateCGImage( rImage );
-
-if( ! xImage )
-return nil;
-
-Size aSize( rImage.GetSizePixel() );
-UIImage* pImage = [[UIImage alloc] initWithCGImage: xImage];
-CGImageRelease( xImage );
-
-return pImage;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 60cfa64345b41a7a95045133d775616253643b4a
Author: Tor Lillqvist t...@iki.fi
Date: Thu Aug 2 15:06:36 2012 +0300
Bin no longer used iOS cppunit stuff that even breaks the build
Change-Id: I459f7fd097a81ef5977974f52b0cc2c2f155a810
diff --git a/basebmp/test/basebmp_cppunittester_all.cxx
b/basebmp/test/basebmp_cppunittester_all.cxx
deleted file mode 100644
index 2e0497d..000
--- a/basebmp/test/basebmp_cppunittester_all.cxx
+++ /dev/null
@@ -1,126 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you 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 .
- */
-
-#include cstdlib
-#include iostream
-#include limits
-#include string
-#include protectorfactory.hxx
-#include osl/module.h
-#include osl/module.hxx
-#include osl/thread.h
-#include rtl/process.h
-#include rtl/string.h
-#include rtl/string.hxx
-#include rtl/textcvt.h
-#include rtl/ustring.hxx
-#include sal/main.h
-#include sal/types.h
-
-#include cppunit/CompilerOutputter.h
-#include cppunit/TestResult.h
-#include cppunit/TestResultCollector.h
-#include cppunit/TestRunner.h
-#include cppunit/plugin/TestPlugIn.h
-#include cppunit/plugin/PlugInParameters.h
-#include cppunit/extensions/TestFactoryRegistry.h
-#include cppunit/portability/Stream.h
-
-#include boost/noncopyable.hpp
-
-namespace {
-
-void usageFailure() {
-std::cerr
- (Usage: cppunittester (--protector shared-library-path
- function-symbol)* shared-library-path)
- std::endl;
-std::exit(EXIT_FAILURE);
-}
-
-rtl::OUString getArgument(sal_Int32 index) {
-rtl::OUString arg;
-rtl_getAppCommandArg(index, arg.pData);
-return arg;
-}
-
-std::string convertLazy(rtl::OUString const s16) {
-rtl::OString s8(rtl::OUStringToOString(s16, osl_getThreadTextEncoding()));
-
[Libreoffice-commits] .: desktop/source offapi/com
desktop/source/deployment/manager/dp_extensionmanager.cxx |7 ++-
desktop/source/deployment/manager/dp_extensionmanager.hxx |1
desktop/source/deployment/manager/dp_manager.cxx | 26 --
desktop/source/deployment/manager/dp_manager.h|2 +
desktop/source/deployment/misc/dp_misc.cxx|2 -
offapi/com/sun/star/deployment/XExtensionManager.idl |8
offapi/com/sun/star/deployment/XPackageManager.idl|8 +++-
7 files changed, 39 insertions(+), 15 deletions(-)
New commits:
commit 81fd6b084b0f3c0eb5a97c77592f5ceb21d2dfb1
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Aug 2 18:10:03 2012 +0200
fdo#53006 Force reinstall of all bundled extensions on upgrade
...as the per-user data about bundled extensions can otherwise contain stale
$BUNDLED_EXTENSIONS_PREREG references if the old installation used
share/prereg/bundled/, the new one does not (cf. the fixing for fdo#51252
LO
cannot start (reports runtime error with Visual C++ Runtime Library)), and
a
bundled extension did not change version.
It is safe to tie this behavior to the existing force parameter of
dp_misc::syncRepositories, as the only place that calls it with force=true
is
the call to Desktop::SynchronizeExtensionRepositories(newInst) in
Desktop::Main,
where newInst=true is the relevant condition for this behavior, too.
As stated in XExtensionManager.idl, this [...] can go again once no
exisiting
UserInstallation's user/extensions/bundled/ data can contain any
$BUNDLED_EXTENSIONS_PREREG references any longer.
Change-Id: I630dec8f2d20282ee47c65ac61ed2c9b062448e1
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx
b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index e5a16b7..290df13 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -1278,7 +1278,7 @@ void ExtensionManager::synchronizeBundledPrereg(
Referencedeploy::XPackageManager xMgr =
xPackageManagerFactory-getPackageManager(OUSTR(bundled_prereg));
-xMgr-synchronize(xAbortChannel, xCmdEnv);
+xMgr-synchronize(false, xAbortChannel, xCmdEnv);
progressBundled.update(OUSTR(\n\n));
uno::SequenceReferencedeploy::XPackage extensions =
xMgr-getDeployedPackages(
@@ -1317,6 +1317,7 @@ void ExtensionManager::synchronizeBundledPrereg(
}
sal_Bool ExtensionManager::synchronize(
+sal_Bool forceBundled,
Referencetask::XAbortChannel const xAbortChannel,
Referenceucb::XCommandEnvironment const xCmdEnv )
throw (deploy::DeploymentException,
@@ -1333,13 +1334,13 @@ sal_Bool ExtensionManager::synchronize(
String sSynchronizingShared(StrSyncRepository::get());
sSynchronizingShared.SearchAndReplaceAllAscii( %NAME,
OUSTR(shared));
dp_misc::ProgressLevel progressShared(xCmdEnv, sSynchronizingShared);
-bModified = getSharedRepository()-synchronize(xAbortChannel, xCmdEnv);
+bModified = getSharedRepository()-synchronize(false, xAbortChannel,
xCmdEnv);
progressShared.update(OUSTR(\n\n));
String sSynchronizingBundled(StrSyncRepository::get());
sSynchronizingBundled.SearchAndReplaceAllAscii( %NAME,
OUSTR(bundled));
dp_misc::ProgressLevel progressBundled(xCmdEnv, sSynchronizingBundled);
-bModified |= getBundledRepository()-synchronize(xAbortChannel,
xCmdEnv);
+bModified |= getBundledRepository()-synchronize(forceBundled,
xAbortChannel, xCmdEnv);
progressBundled.update(OUSTR(\n\n));
//Always determine the active extension. This is necessary for the
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.hxx
b/desktop/source/deployment/manager/dp_extensionmanager.hxx
index 800d91f..05fcde8 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.hxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.hxx
@@ -193,6 +193,7 @@ public:
css::uno::RuntimeException);
virtual sal_Bool SAL_CALL synchronize(
+sal_Bool forceBundled,
css::uno::Referencecss::task::XAbortChannel const xAbortChannel,
css::uno::Referencecss::ucb::XCommandEnvironment const xCmdEnv )
throw (css::deployment::DeploymentException,
diff --git a/desktop/source/deployment/manager/dp_manager.cxx
b/desktop/source/deployment/manager/dp_manager.cxx
index 2ddee4a..d7c8a2a 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -1248,6 +1248,7 @@ void PackageManagerImpl::reinstallDeployedPackages(
return m_readOnly;
}
bool PackageManagerImpl::synchronizeRemovedExtensions(
+bool force,
Referencetask::XAbortChannel const xAbortChannel,
Referencecss::ucb::XCommandEnvironment const xCmdEnv)
{
@@ -1271,15 +1272,19
Re: [PATCH]fdo#52636:VIEWING: unintuitive Heading for 'Enable experimental Features
Hello there, On Thu, 2012-08-02 at 08:14 -0700, Joel Madero wrote: Perfect idea! I'm going to go ahead and work on that. I will take out limited (I have no clue what it means either, I figured someone else must have known when they added it ;)). Well, hopefully, I didn't sound overly assertive here. I have a quick question though. What's the best way to modify a patch? The only way I know how is to go back to dismiss my changes and start from scratch. I'm sure there is a better way that I don't know of. So, I am by no means the git expert here (I still barely understand the basics of it) but ... you probably still have the original patch committed locally, (and if not, you can do $ git am path/to.patch ), so, do all the modifications you want to do, then do the usual $ git add . $ git commit At the end, you can just use $ git rebase -i HEAD~2 to either squash (merge the commits and edit the commit message) or fixup (just merge the commits) (assuming you had only your original commit and the new one = HEAD~2). Also: Note that you should only ever use rebase -i on local commits – modifying the global commit history is evil. (It won't do any harm to everyone else, if you don't have commit access, but still.) Modifying the patch in a text editor can easily go wrong, so that's not recommended. Astron. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW-3-6][REVIEW-3-6-x]fdo#52998 fdo#52999 MAB
On 02/08/12 17:15, Eike Rathke wrote: Hi Noel, On Thursday, 2012-08-02 14:32:16 +0100, Noel Power wrote: master:6068f2f7cf5d66c68241b3831851b413b2e0b3ba ( sorry don't have the cgit url as cgit is dead ) git show 6068f2f7cf5d66c68241b3831851b413b2e0b3ba | vim - works fine ;-) However, that is supposed to fix that comments disappear when saving to .xls, correct (as bz is down as well ...) ? It doesn't for me in 3-6, but works in master right, sigh yes I did test it in 3.6 but I mustn't have reloaded there reloading the .xls the comment is gone. The patch itself looks correct, but apparently there's more to it. yes, markus sent me a mail pointing to http://opengrok.libreoffice.org/xref/core/sc/source/filter/excel/excdoc.cxx#428 which should have done the trick ( but it's obvious the mxNoteList isn't used ) it seems there is some confusion because of the co-existence of the old and new code, I will fix it ( but right now gotta take kid to surf life/rescue training ) with any luck the fresh air and a walk on the beach will clear my head and make it easier, anyway thanks for noticiing Noel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
minutes of ESC call ...
* Present: + Norbert, Stephan, Rainer, Michael, Bjoern, Kohei, Caolan, Christian, Kendy, Petr, Cedric, Michael S, Astron * Completed Action Items + quest for kind volunteer to update the website (Michael) + thanks to Marc ! + another review for splash-screens (Michael) + 4.0 wiki page section split (Kendy) + check new templates are using auto-fitting functionality (PEtr) * Pending Action Items + [pending] notify all committers when we have a nice simple, minimal statement of what is required for gerrit written (Bjoern) + reviews done + make bytemark windows box do release builds (Fridrich) + maildrop for Gerrit (Bjoern) + 3/4 done, in progress idly. + 4.0 issues (Everyone) + everyone interested in cleanups - claim your work until next ESC! + http://wiki.documentfoundation.org/Development/LibreOffice4 + crediting: can we separate templates / artwork in the credits page (Spaetz?) * Release Engineering update (Petr) + 3.6.0 RC4 + annoying bug: comments lots during .xls / .xlsx export + not good, but probably not a blocker + autocorrection dictionaries internal / user-installation extensions not had their versions bumped = not working (Stephan) + actively registered / lightproof uno extensions also have some update issues - have a fix as well (Stephan) + grammar-checker impairment + workaround - manually remove bundled extensions directory + locating it on windows is a pain. + registering bundled extn's + slowest bit is help registration - hence version check. + decision: ship it now + release note it carefully + 3.6.1 RC1 is due in 2 weeks + all above issues fixed + 3.5.6 RC1 status + built except for Win32, start up-loading later today + RC2 deadline is on Monday - tripple review for -3-5-6 + Automatic update / suggesions policy + we can choose which versions update to what versions (Kendy) + perfectly possibly to recommend 3.5.0 - 3.6.0 but avoid 3.5.1+ - 3.6.0 + no user configuration for enthusiasm for updates ? (Norbert) + only enable / disable + re-visit update to 3.6.1 from 3.5.0 + perennial updating / first-start user-experience issues + re-thinking the complicated optimisations here sounds like a good plan. * GSOC update (Cedric) + ongoing work - pencils down / evaluations by August 20th * 4.0 - ongoing discussion (Kendy) + thanks to those who assigned themselves some tasks + should we start now or post-re-basing ? + http://wiki.documentfoundation.org/Development/LibreOffice4 + can we do the less incompatible changes first (Bjoern) + deadline - of next week for volunteers for tasks + proposal - call next version 4.0, pending wider input. + whole point of 4.0 - if incompatible (Michael S) + will keep people on last 3.x release for longer so need to support it for longer + always true even if we do 3.7 (Norbert) + concerns wrt. longer term support of re-based code + if we retain good back-compat / bridging much less of an issue (Michael) + start working, and testing breakage (Stephan) + start doing it see if it works or breaks + unclear proposal / need an updated release plan (Bjoern) + wide-spread code changed blocked anyway on re-basing (Lubos) + discussion ongoing with 3.6.x fixing + could we have a re-based 4.0 with no ABI break (Stephan) + announce intention to break things (Bjoern) + potential to incremental numbering eg. 4 - 5 - 6 for next releases (Stephan) + extend deadline until next week for task selection in wiki + please take ownership of tasks + and/or consider what can be done without breaking binary compatibility. * UI / design update (Astron) + ongoing vacations for Mirek + CTL discussion still under consideration * Call for Papers for talks @ LibreOffice conference + if your name includes non-ascii characters you can't register: Andreas in the process of fixing this. + http://conference.libreoffice.org/call-for-paper + please submit talks ASAP ... * QA update (Rainer) + producing a bibsect
Re: [REVIEW-3-6][REVIEW-3-6-x]fdo#52998 fdo#52999 MAB
Hello Noel 2012/8/2 Noel Power nopo...@suse.com: On 02/08/12 17:15, Eike Rathke wrote: Hi Noel, On Thursday, 2012-08-02 14:32:16 +0100, Noel Power wrote: master:6068f2f7cf5d66c68241b3831851b413b2e0b3ba ( sorry don't have the cgit url as cgit is dead ) git show 6068f2f7cf5d66c68241b3831851b413b2e0b3ba | vim - works fine ;-) However, that is supposed to fix that comments disappear when saving to .xls, correct (as bz is down as well ...) ? It doesn't for me in 3-6, but works in master right, sigh yes I did test it in 3.6 but I mustn't have reloaded there reloading the .xls the comment is gone. The patch itself looks correct, but apparently there's more to it. yes, markus sent me a mail pointing to http://opengrok.libreoffice.org/xref/core/sc/source/filter/excel/excdoc.cxx#428 which should have done the trick ( but it's obvious the mxNoteList isn't used ) it seems there is some confusion because of the co-existence of the old and new code, I will fix it ( but right now gotta take kid to surf life/rescue training ) with any luck the fresh air and a walk on the beach will clear my head and make it easier, anyway thanks for noticiing I think you made the same mistake I did when I wrote the patch. Opening a test file and resavinf it without changes will produce the right output. As soon as you create a new file or change anything it will not use the cached import values for the output. I can take care of this bug if it helps. I think I know what is broken in this case. Regards, Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-ux-advise] [PATCH] fix bug 51231, but...
Hi Ivan, Terribly sorry for the belated answer. On 2012-08-02 at 18:15 +0400, Ivan Timofeev wrote: So can I use your sign-off for reverting http://cgit.freedesktop.org/libreoffice/core/commit/?id=4866b20ec6205b04cd21077fd00d68c4d4bb2c1b on the libreoffice-3-6 branch? Yes, if Astron says it should go, you have my sign-off too :-) - I am not personally attached to that code. It was an attempt to fix the behavior when the button appears under the mouse just at the very moment you try to click the slide to select that that annoyed some people too. As a makeshift fix, would it be possible to make the overlay appear half/a quarter of a second later? Sure, the corresponding constant is Theme_ButtonFadeInDelay in sd/source/ui/slidesorter/inc/view/SlsTheme.hxx Feel free to push patches. :) Maybe a short-term solution would be not to increase the the timer, but actually decrease it? Ie. let the buttons appear immediately when you enter the slide in the slidesorter? That would let the user to position the mouse carefully to avoid clicking what she does not want to click. All the best, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - sd/source vcl/unx
sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx |6 --
sd/source/ui/slidesorter/inc/view/SlsButtonBar.hxx|5 --
sd/source/ui/slidesorter/view/SlideSorterView.cxx | 14 +
sd/source/ui/slidesorter/view/SlsButtonBar.cxx| 45 +++---
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx |4 +
5 files changed, 19 insertions(+), 55 deletions(-)
New commits:
commit e995824285cf6697a355d567abc8cd2df2b38b72
Author: Ivan Timofeev timofeev@gmail.com
Date: Thu Aug 2 21:53:58 2012 +0400
fdo#51231 Revert Slidesorter: Show the buttons on the opposite side...
This reverts commit 4866b20ec6205b04cd21077fd00d68c4d4bb2c1b.
diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
index db0cd65..30208ef 100644
--- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
@@ -225,15 +225,13 @@ public:
const bool bAnimate = true);
void SetPageUnderMouse (
const model::SharedPageDescriptor rpDescriptor,
-const bool bAnimate = true,
-const Point rMousePosition = Point());
+const bool bAnimate = true);
bool SetState (
const model::SharedPageDescriptor rpDescriptor,
const model::PageDescriptor::State eState,
const bool bStateValue,
-const bool bAnimate = true,
-const Point rMousePosition = Point());
+const bool bAnimate = true);
void UpdateOrientation (void);
diff --git a/sd/source/ui/slidesorter/inc/view/SlsButtonBar.hxx
b/sd/source/ui/slidesorter/inc/view/SlsButtonBar.hxx
index 6bb273f..c08c328 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsButtonBar.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsButtonBar.hxx
@@ -69,11 +69,6 @@ public:
const Point aMouseModelLocation,
const bool bIsMouseButtonDown);
-/// Decide whether the button should be drawn at the top, or the bottom.
-void UpdateButtonPosition(
-const model::SharedPageDescriptor rpDescriptor,
-const Point rMousePosition);
-
void ResetPage (void);
bool IsMouseOverBar (void) const;
diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx
b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
index 711a0f6..c403162 100644
--- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx
+++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
@@ -956,7 +956,7 @@ void SlideSorterView::UpdatePageUnderMouse (
const bool bAnimate)
{
// Update the page under the mouse.
-SetPageUnderMouse(rpDescriptor, bAnimate, rMousePosition);
+SetPageUnderMouse(rpDescriptor, bAnimate);
// Tell the button bar about the new mouse position.
SharedSdWindow pWindow (mrSlideSorter.GetContentWindow());
@@ -984,8 +984,7 @@ void SlideSorterView::UpdatePageUnderMouse (
void SlideSorterView::SetPageUnderMouse (
const model::SharedPageDescriptor rpDescriptor,
-const bool bAnimate,
-const Point rMousePosition)
+const bool bAnimate)
{
if (mpPageUnderMouse != rpDescriptor)
{
@@ -995,7 +994,7 @@ void SlideSorterView::SetPageUnderMouse (
mpPageUnderMouse = rpDescriptor;
if (mpPageUnderMouse)
-SetState(mpPageUnderMouse, PageDescriptor::ST_MouseOver, true,
bAnimate, rMousePosition);
+SetState(mpPageUnderMouse, PageDescriptor::ST_MouseOver, true,
bAnimate);
// Change the quick help text to display the name of the page under
// the mouse.
@@ -1010,8 +1009,7 @@ bool SlideSorterView::SetState (
const model::SharedPageDescriptor rpDescriptor,
const PageDescriptor::State eState,
const bool bStateValue,
-const bool bAnimate,
-const Point rMousePosition)
+const bool bAnimate)
{
model::SharedPageDescriptor pDescriptor (rpDescriptor);
if ( ! pDescriptor)
@@ -1039,11 +1037,7 @@ bool SlideSorterView::SetState (
if (eState == PageDescriptor::ST_MouseOver)
{
if (bStateValue)
-{
-if (bAnimate)
-GetButtonBar().UpdateButtonPosition(rpDescriptor,
rMousePosition);
GetButtonBar().RequestFadeIn(rpDescriptor, bAnimate);
-}
else
GetButtonBar().RequestFadeOut(rpDescriptor, bAnimate);
}
diff --git a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
index 3ed33d8..2e41520 100644
--- a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
+++ b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
@@ -70,25 +70,19 @@ namespace sd { namespace slidesorter { namespace view {
class ButtonBar::BackgroundTheme
{
public:
-enum ButtonPosition { TOP, BOTTOM };
-public:
BackgroundTheme(
const ::boost::shared_ptrTheme rpTheme,
const ::std::vectorSharedButton rButtons);
-~BackgroundTheme() { }
+virtual
Re: [PATCH]fdo#52636:VIEWING: unintuitive Heading for 'Enable experimental Features
Here is an updated patch. Also here is a link for everyone to see what we could make Java tab look like: https://lh5.googleusercontent.com/-lzTcvXoWhOw/UBq_VGFqL2I/ACc/TnxVpfV5WL0/s937/Advanced_Options.jpg Notes: 1. Changed name to Advanced 2. Shrunk Java dialog box 3. Added bottom section for experimental features This would clear up enough space in the general tab for me to move the measurement units over. I've cc'ed the ux team since this is now a visual thing also. Please respond to the dev mailing list as I'll be pushing out a few patches corresponding to these changes. Joel On Thu, Aug 2, 2012 at 11:29 AM, Stefan Knorr heinzless...@gmail.comwrote: Hello there, On Thu, 2012-08-02 at 08:14 -0700, Joel Madero wrote: Perfect idea! I'm going to go ahead and work on that. I will take out limited (I have no clue what it means either, I figured someone else must have known when they added it ;)). Well, hopefully, I didn't sound overly assertive here. I have a quick question though. What's the best way to modify a patch? The only way I know how is to go back to dismiss my changes and start from scratch. I'm sure there is a better way that I don't know of. So, I am by no means the git expert here (I still barely understand the basics of it) but ... you probably still have the original patch committed locally, (and if not, you can do $ git am path/to.patch ), so, do all the modifications you want to do, then do the usual $ git add . $ git commit At the end, you can just use $ git rebase -i HEAD~2 to either squash (merge the commits and edit the commit message) or fixup (just merge the commits) (assuming you had only your original commit and the new one = HEAD~2). Also: Note that you should only ever use rebase -i on local commits – modifying the global commit history is evil. (It won't do any harm to everyone else, if you don't have commit access, but still.) Modifying the patch in a text editor can easily go wrong, so that's not recommended. Astron. 0001-fdo-52636-Added-Sectional-Line-and-Header-for-Experi.patch Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sd/source
sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx |6 --
sd/source/ui/slidesorter/inc/view/SlsButtonBar.hxx|5 --
sd/source/ui/slidesorter/view/SlideSorterView.cxx | 14 +
sd/source/ui/slidesorter/view/SlsButtonBar.cxx| 45 +++---
4 files changed, 15 insertions(+), 55 deletions(-)
New commits:
commit ee1ee06ec96c6db87203970bf05dd6cd7513f674
Author: Ivan Timofeev timofeev@gmail.com
Date: Thu Aug 2 21:53:58 2012 +0400
fdo#51231 Revert Slidesorter: Show the buttons on the opposite side...
This reverts commit 4866b20ec6205b04cd21077fd00d68c4d4bb2c1b.
(cherry picked from commit e995824285cf6697a355d567abc8cd2df2b38b72)
Change-Id: If7ddcbbee142a384375c29c9b9389077e077b963
Signed-off-by: Stefan Knorr heinzless...@gmail.com
Signed-off-by: Jan Holesovsky ke...@suse.cz
diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
index d65bb90..4229665 100644
--- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
@@ -226,15 +226,13 @@ public:
const bool bAnimate = true);
void SetPageUnderMouse (
const model::SharedPageDescriptor rpDescriptor,
-const bool bAnimate = true,
-const Point rMousePosition = Point());
+const bool bAnimate = true);
bool SetState (
const model::SharedPageDescriptor rpDescriptor,
const model::PageDescriptor::State eState,
const bool bStateValue,
-const bool bAnimate = true,
-const Point rMousePosition = Point());
+const bool bAnimate = true);
void UpdateOrientation (void);
diff --git a/sd/source/ui/slidesorter/inc/view/SlsButtonBar.hxx
b/sd/source/ui/slidesorter/inc/view/SlsButtonBar.hxx
index 6bb273f..c08c328 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsButtonBar.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsButtonBar.hxx
@@ -69,11 +69,6 @@ public:
const Point aMouseModelLocation,
const bool bIsMouseButtonDown);
-/// Decide whether the button should be drawn at the top, or the bottom.
-void UpdateButtonPosition(
-const model::SharedPageDescriptor rpDescriptor,
-const Point rMousePosition);
-
void ResetPage (void);
bool IsMouseOverBar (void) const;
diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx
b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
index 711a0f6..c403162 100644
--- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx
+++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
@@ -956,7 +956,7 @@ void SlideSorterView::UpdatePageUnderMouse (
const bool bAnimate)
{
// Update the page under the mouse.
-SetPageUnderMouse(rpDescriptor, bAnimate, rMousePosition);
+SetPageUnderMouse(rpDescriptor, bAnimate);
// Tell the button bar about the new mouse position.
SharedSdWindow pWindow (mrSlideSorter.GetContentWindow());
@@ -984,8 +984,7 @@ void SlideSorterView::UpdatePageUnderMouse (
void SlideSorterView::SetPageUnderMouse (
const model::SharedPageDescriptor rpDescriptor,
-const bool bAnimate,
-const Point rMousePosition)
+const bool bAnimate)
{
if (mpPageUnderMouse != rpDescriptor)
{
@@ -995,7 +994,7 @@ void SlideSorterView::SetPageUnderMouse (
mpPageUnderMouse = rpDescriptor;
if (mpPageUnderMouse)
-SetState(mpPageUnderMouse, PageDescriptor::ST_MouseOver, true,
bAnimate, rMousePosition);
+SetState(mpPageUnderMouse, PageDescriptor::ST_MouseOver, true,
bAnimate);
// Change the quick help text to display the name of the page under
// the mouse.
@@ -1010,8 +1009,7 @@ bool SlideSorterView::SetState (
const model::SharedPageDescriptor rpDescriptor,
const PageDescriptor::State eState,
const bool bStateValue,
-const bool bAnimate,
-const Point rMousePosition)
+const bool bAnimate)
{
model::SharedPageDescriptor pDescriptor (rpDescriptor);
if ( ! pDescriptor)
@@ -1039,11 +1037,7 @@ bool SlideSorterView::SetState (
if (eState == PageDescriptor::ST_MouseOver)
{
if (bStateValue)
-{
-if (bAnimate)
-GetButtonBar().UpdateButtonPosition(rpDescriptor,
rMousePosition);
GetButtonBar().RequestFadeIn(rpDescriptor, bAnimate);
-}
else
GetButtonBar().RequestFadeOut(rpDescriptor, bAnimate);
}
diff --git a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
index 3ed33d8..2e41520 100644
--- a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
+++ b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
@@ -70,25 +70,19 @@ namespace sd { namespace slidesorter { namespace view {
class ButtonBar::BackgroundTheme
{
public:
-enum ButtonPosition { TOP, BOTTOM };
-public:
[Libreoffice-commits] .: 2 commits - basctl/source sc/source
basctl/source/basicide/baside2b.cxx |1 +
sc/source/filter/excel/excdoc.cxx |8 +++-
2 files changed, 4 insertions(+), 5 deletions(-)
New commits:
commit 285a5ae06cf51927c2df4b47043e51394aab98b7
Author: Noel Power noel.po...@novell.com
Date: Thu Aug 2 19:24:00 2012 +0100
new fix for fdo#47907
Change-Id: Icc5e90ac40056430bfbe36d8da1aaad8716cfee9
diff --git a/sc/source/filter/excel/excdoc.cxx
b/sc/source/filter/excel/excdoc.cxx
index bf189bf..e83c119 100644
--- a/sc/source/filter/excel/excdoc.cxx
+++ b/sc/source/filter/excel/excdoc.cxx
@@ -510,7 +510,7 @@ void ExcTable::FillAsTable( SCTAB nCodeNameIdx )
}
// list of NOTE records, generated by the cell table
-aRecList.AppendRecord( mxCellTable-CreateRecord( EXC_ID_NOTE ) );
+aRecList.AppendRecord( mxNoteList );
// sheet view settings: WINDOW2, SCL, PANE, SELECTION
aRecList.AppendNewRecord( new XclExpTabViewSettings( GetRoot(), mnScTab )
);
@@ -589,10 +589,8 @@ void ExcTable::FillAsXmlTable( SCTAB nCodeNameIdx )
aRecList.AppendRecord( GetPivotTableManager().CreatePivotTablesRecord(
mnScTab ) );
// list of NOTE records, generated by the cell table
-XclExpRecordRef xNotes = mxCellTable-CreateRecord( EXC_ID_NOTE );
-XclExpRecordList XclExpNote * xNoteList = dynamic_cast
XclExpRecordList XclExpNote * ( xNotes.get() );
-if( xNoteList != NULL !xNoteList-IsEmpty() )
-aRecList.AppendNewRecord( new XclExpComments( mnScTab, *xNoteList ) );
+if( mxNoteList != NULL !mxNoteList-IsEmpty() )
+aRecList.AppendNewRecord( new XclExpComments( mnScTab, *mxNoteList ) );
// web queries
Add( new XclExpWebQueryBuffer( GetRoot() ) );
commit f29c91f3351db2887f994c2cc82ceaaa6d717906
Author: Noel Power noel.po...@novell.com
Date: Thu Aug 2 19:23:23 2012 +0100
Revert fix for fdo#47907
This reverts commit 8ba8aca1ac4744a23eefb7bb5892e2a697d9d987.
diff --git a/basctl/source/basicide/baside2b.cxx
b/basctl/source/basicide/baside2b.cxx
index c3223c6..a5702c1 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -682,6 +682,7 @@ void EditorWindow::Notify( SfxBroadcaster /*rBC*/, const
SfxHint rHint )
( 0, pModulWindow-GetBreakPointWindow().GetCurYOffset() -
pEditView-GetStartDocPos().Y() );
pModulWindow-GetLineNumberWindow().DoScroll
( 0, pModulWindow-GetLineNumberWindow().GetCurYOffset() -
pEditView-GetStartDocPos().Y() );
+pModulWindow-Invalidate();
}
else if( rTextHint.GetId() == TEXT_HINT_TEXTHEIGHTCHANGED )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-ux-advise] [PUSHED] fix bug 51231, but...
Hi Kendy On 02.08.2012 21:42, Jan Holesovsky wrote: Hi Ivan, Terribly sorry for the belated answer. no problem :) instead - I must be sorry, because I saw this commit when it was pushed, and only now submitted a complaint... oh, when everyone is busy. Argh, bad lazy Ivan! On 2012-08-02 at 18:15 +0400, Ivan Timofeev wrote: So can I use your sign-off for reverting http://cgit.freedesktop.org/libreoffice/core/commit/?id=4866b20ec6205b04cd21077fd00d68c4d4bb2c1b on the libreoffice-3-6 branch? Yes, if Astron says it should go, you have my sign-off too :-) Pushed, thanks!! Best regards, Ivan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW-3-6][REVIEW-3-6-x]fdo#52998 fdo#52999 MAB
Hi Eike, Markus On 02/08/12 18:05, Markus Mohrhard wrote: Hello Noel 2012/8/2 Noel Power nopo...@suse.com: On 02/08/12 17:15, Eike Rathke wrote: but works in master right, sigh yes I did test it in 3.6 but I mustn't have reloaded there actually I think did really reload it, but.. it's like Markus said any new comments are dropped yes, markus sent me a mail pointing to http://opengrok.libreoffice.org/xref/core/sc/source/filter/excel/excdoc.cxx#428 which should have done the trick ( but it's obvious the mxNoteList isn't used ) and as suspected that was the problem, see master:f29c91f3351db2887f994c2cc82ceaaa6d717906 'reverts the previous patch' master:285a5ae06cf51927c2df4b47043e51394aab98b7 'new patch' I can take care of this bug if it helps. I think I know what is broken in this case. hopefully my latest attempt does the trick :-) Noel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Problem building on Mac OS X 10.7
Hi Tor That fixed it. I have now managed to do my first build on a Mac. I had to disable -werror and add a second language to get there but I have a running build. I'll try to get some time to look at the errors next week. Thanks, Niklas Den onsdagen den 1:e augusti 2012 skrev Tor Lillqvist: Any help/pointers would be much appreciated. The (mysterious) code in solenv/bin/modules/macosxotoolhelper.pm doesn't cope with a file name that contains regexp metacharacters (the '+' in your /Volumes/hfs+/git). I think the quickest solution might be to change the $line =~ /^$file:\n$/ to $line =~ /^\Q$file\E:\n$/ in said macosxotoolhelper.pm. Try that and report back. An even better thing would be to eventually figure out whether all that special Mac OS X dylib crack is needed at all when building with a current Xcode tool-chain for a current OS... and hopefully notice that it isn't. --tml P.S. Anticipating the knee-jerk reaction from the more leet coders: Yes, using Python instead of Perl this problem would go away, sure, sure, you win, have a cookie. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Draw and gradient opacity
On 30/07/12 22:47, Christina Roßmanith wrote: I've created a rectangle in Draw (manually - no svg import this time), filled it with a linear gradient with a constant 50% opacity and saved the file as fodg. Then I saw that opacity is stored at two places in the file: 1. in the gradient definition (draw:start-intensity=50% draw:end-intensity=50%) No, this is not the opacity it is intensity of the colour which is how big percentage of the colour is mixed with 100-percentage of black. The opacity gradient is a draw:opacity _element_ that has draw:start and draw:end percentage. It is referred to from the style with its draw:opacity-name like a normal colour gradient. 2. in the rectangle style (draw:opacity=50%) This is the draw:opacity _attribute_ that characterizes a constant opacity of the shape. According to the standard, the draw:opacity-name overrides this attribute. If I remove it in the rectangle style and re-open the fodg file the rectangle isn't filled transparently anymore, i.e. the opacity in the gradient definition is ignored. So my question is: Which code is responsible for reading fodg files (to check if start-intensity and end-intensity are processed at all) and which code does the painting? Cheers F. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[GSOC-UPDATE](02.08) Impress Remote
Hi everyone, Today I implemented server discovery using multicast -- the client can now successfully find the address of at least one server (once I get a build working on my desktop I'll test that everything works when there are two servers on the network). Since osl Sockets don't appear to support multicast, the latest code on the LO side involves plain C sockets, however it appears that the code should be platform independent if the correct headers are imported. I intend to try to rebase on master tomorow to allow me to test whether that builds over the weekend (I want to do a full debug build as well). Just to make sure: is git merge the correct command to use? (Git rebase would mess up histories as far as I can tell?) Cheers, Andrzej ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - o3tl/inc o3tl/qa solenv/gbuild sw/inc sw/source
o3tl/inc/o3tl/sorted_vector.hxx| 19 ++---
o3tl/qa/test-sorted_vector.cxx |6 -
solenv/gbuild/filter-showIncludes.pl | 85 ---
solenv/gbuild/platform/WNT_INTEL_MSC.mk|2
solenv/gbuild/platform/filter-showIncludes.awk | 91 +
sw/inc/docary.hxx |2
sw/inc/ndhints.hxx |4 -
sw/source/filter/html/htmlfly.hxx |3
sw/source/ui/utlui/content.cxx |3
9 files changed, 109 insertions(+), 106 deletions(-)
New commits:
commit b4d5eebfdd095a75966f2fa0997817d3441a3b80
Author: Michael Stahl mst...@redhat.com
Date: Thu Aug 2 22:07:30 2012 +0200
filter-showIncludes: convert to AWK
Change-Id: Iedc315550f4eafdf1612bc390044a4b1b0c8e80b
diff --git a/solenv/gbuild/filter-showIncludes.pl
b/solenv/gbuild/filter-showIncludes.pl
deleted file mode 100755
index 1ed3679..000
--- a/solenv/gbuild/filter-showIncludes.pl
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/usr/bin/env perl
-#
-# filter-showIncludes.pl depfile.d objfile.o orginal.cxx
-#
-# Create dependency information from the output of cl.exe's showInclude. It
-# needs additional information - the output name to which to write, objfile
-# that depends on the includes, and the original file name.
-#
-# It also consolidates the file names to a canonical form, and filters out
-# duplicates.
-#
-# LGPL v3 / GPL v3 / MPL 1.1
-#
-# Original author: Jan Holesovsky ke...@suse.cz
-
-use File::Basename;
-use File::Copy;
-use File::Temp qw/tempfile/;
-
-my $outfile = $ARGV[0];
-my $objfile = $ARGV[1];
-my $srcfile = $ARGV[2];
-if ( !defined $outfile || !defined $objfile || !defined $srcfile ) {
-die Not enough parameters to create dependencies.;
-}
-
-my $showincludes_prefix = $ENV{'SHOWINCLUDES_PREFIX'};
-if ( !defined( $showincludes_prefix ) || $showincludes_prefix eq ) {
-$showincludes_prefix = 'Note: including file:';
-}
-
-my ($OUT, $tmp_filename) = tempfile( 'showIncludesXX', DIR = dirname(
$outfile ) ) or die Cannot create a temp file.;
-
-print $OUT $objfile: \\\n $srcfile;
-
-my %seen;
-my $first_line = 1;
-while ( STDIN ) {
-if ( /^$showincludes_prefix/ ) {
-s/^$showincludes_prefix\s*//;
-s/\r$//;
-
-chomp;
-s/\\/\//g;
-
-
-# skip system headers, i.e. everything not under source or build dirs
-if ( /$ENV{'SRCDIR'}|$ENV{'OUTDIR'}|$ENV{'WORKDIR'}/ )
-{
-
-# X: - /cygdrive/x/
-s/^(.):/\/cygdrive\/\l\1/;
-
-s/ /\\ /g;
-
-if ( !defined $seen{$_} ) {
-$seen{$_} = 1;
-print $OUT \\\n $_;
-}
-}
-}
-else {
-# skip the first line, it always just duplicates what is being
-# compiled
-print unless ( $first_line );
-}
-$first_line = 0;
-}
-
-print $OUT \n;
-
-# fdo#40099 if header.h does not exist, it will simply be considered out of
-# date and any targets that use it as a prerequisite will be updated,
-# which avoid misery when the header is deliberately deleted and removed
-# as an include
-# see http://www.makelinux.net/make3/make3-CHP-8-SECT-3
-foreach my $key ( keys %seen ) {
- print $OUT \n$key:\n;
-}
-
-close( $OUT ) or die Cannot close $tmp_filename.;
-
-move( $tmp_filename, $outfile ) or die Cannot move $tmp_filename to
$outfile.;
-
-# vim: shiftwidth=4 softtabstop=4 expandtab:
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 9519a48..a060cc8 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -228,7 +228,7 @@ gb_COMPILERNOOPTFLAGS := -Od
ifeq ($(gb_FULLDEPS),$(true))
gb_COMPILERDEPFLAGS := -showIncludes
define gb_create_deps
-| $(GBUILDDIR)/filter-showIncludes.pl $(1) $(2) $(3); exit $${PIPESTATUS[0]}
+| $(GBUILDDIR)/platform/filter-showIncludes.awk -vdepfile=$(1)
-vobjectfile=$(2) -vsourcefile=$(3); exit $${PIPESTATUS[0]}
endef
else
gb_COMPILERDEPFLAGS :=
diff --git a/solenv/gbuild/platform/filter-showIncludes.awk
b/solenv/gbuild/platform/filter-showIncludes.awk
new file mode 100755
index 000..9d94f3b
--- /dev/null
+++ b/solenv/gbuild/platform/filter-showIncludes.awk
@@ -0,0 +1,91 @@
+#!/usr/bin/gawk -f
+# -*- tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# Create dependency information from the output of cl.exe's showInclude. It
+# needs additional information - the output name to which to write, objfile
+# that depends on the includes, and the original file name.
+# For best results all arguments should be absolute paths.
+#
+# It also consolidates the file names to a canonical form, and filters out
+#
./logeerit resubmit
Hi, just a quick note that there is now a: ./logerrit resubmit which will regenerate the Change-Id of the current HEAD and sumbit it for review on current branch. This should solve the already reviewed on master, cant review on release branch-issue. HTH, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Bug 6 depends on bug 51231, which changed state. Bug 51231 Summary: UI: Slide thumbnail overlay start presentation, disable slide, copy slide position depends on slides pane scroll slider position and mouse way https://bugs.freedesktop.org/show_bug.cgi?id=51231 What|Old Value |New Value Resolution||FIXED Status|NEW |RESOLVED -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- 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
Re: [PUSHED]fdo#53002:Turkish Default Currency to be changed YTL to TL
2012/8/2 Eike Rathke er...@redhat.com Hi Efe, On Thursday, 2012-08-02 00:05:29 +0300, Efe Gürkan YALAMAN wrote: Thanks for the patches. The first where you added another currency entry goes into the right direction, but there's an error Error: CurrencySymbol YTL flagged as usedInCompatibleFormatCodes doesn't match TL determined from format codes. Error: Currency: more than one currency flagged as usedInCompatibleFormatCodes. The entry used in the format codes usually stays the same, the number formatter exchanges symbols in the format codes, but since the older symbol is now reused it would duplicate the list of formats. I fixed that, and since the ISO 4217 code TRY actually stays the same and only the currency symbol changes another attribute legacyOnly=true is needed to correctly load documents using the old currency symbol and not offer it in the dialog otherwise. Using legacyOnly=true on the old TL entry and makeing the new one default prevents duplication of the currency formats. That part is little bit challenging for me. Much of weird stuff happens if some organizations decide to reuse symbols ;-) Yes i recognized it. :-) There is also a new currency sign for Turkish Lira. The sign can be implemented later. I would had preferred if we could had added it now, as we're on it anyway and for changing the symbol again later we would have to introduce yet another entry and declare the current as legacy, but the new Unicode code point U+20BA assigned to the symbol isn't in yet and won't be displayed properly by systems (it is some generic ₺ currency symbol now) so we'll have to do that later, see also https://en.wikipedia.org/wiki/Turkish_lira_sign By the way new currency sign is just a character inside of a font. http://www.tcmb.gov.tr/yeni/eng/ I commited your patch as d09b4e30d7e87f181fa3913e81c6d38c04a8f5f8 and my follow-up changes cb7c34f3bcd4df7a67f1a9d31b3bf849af4f79e4 (sorry, the fdo machine where cgit runs on is currently down, otherwise I'd give you browsable URLs) Thank you. Btw, please configure your git to use a correct email address, in the patch I changed efe@efe-HP-Ubuntu.(none) to efeyala...@gmail.com git config --global user.email efeyala...@gmail.com I recognized after i sending patches. sorry. As a convention, if a patch fixes a bug we also mention fdo#... in the commit summary to have a patch assigned to a bug, in this case fdo#53002, I added that in the commit. Last but not least, apparently we don't have your license statement on file, https://wiki.documentfoundation.org/Development/Developers Could you please send a mail to the mailing list with a blanket statement that you contribute this and further patches under LGPLv3+ and MPL 1.1 licenses? I will. Thanks It was challenging for me as a 1. grade computer engineering student. I learned a lot from you. Thank you again. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD -- Efe Gürkan YALAMAN http://about.me/efegurkan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
license statement
All of my past future contributions to LibreOffice are licensed under the MPL 1.1 and LGPLv3+ dual license. -- Efe Gürkan YALAMAN http://about.me/efegurkan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
