[Libreoffice-commits] .: android/experimental
android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java | 37 -- 1 file changed, 32 insertions(+), 5 deletions(-) New commits: commit cd43461697c0532b5056f9d3449e880d88084c7d Author: Tor Lillqvist tlillqv...@suse.com Date: Thu Jun 21 17:01:34 2012 +0300 Add some thinking aloud style comments Change-Id: Ib4a57649ec98bcbce851687633f35e52771f137a diff --git a/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java b/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java index 50e8a06..ec3855f 100644 --- a/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java +++ b/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java @@ -17,15 +17,42 @@ // - rendering a page (render()) // Unclear whether pages can be rendered in parallel. Probably best to -// serialize all the above in the same worker thread, for instance using -// AsyncTask.SERIAL_EXECUTOR. +// serialize all the above in the same worker thread. We use +// AsyncTask.SERIAL_EXECUTOR below. // While a page is loading ideally should display some animated spinner (but // for now just a static please wait text). -// Just three views are used for the pages: For the current page being viewed, -// the previous, and the next. This could be bumped higher, need to make the -// 3 into a parameter below. +// === + +// How should we handle re-rendering at higher resolution when zooming in, and +// then panning around? + +// Hopefully when LO is asked to render just a part of a page (i.e. the +// MapMode of the device rendered to causes significant parts of the page to +// be outside the device) the code is clever enough to quickly skip stuff that +// will be clipped. But I don't hold my breath. + +// How could we do it? + +// 1/ Re-render just the zoomed-in area. Probably not a good idea, as probably +// the user will almost immediately also pan a bit or zoom out a bit, which +// would cause a re-render. + +// 2/ Some kind of tiled approach. Initially just one tile for the whole +// page. When zooming in, at some point (2x?) split the currently visible +// tiles into four sub-tiles, each initially displaying the same resolution as +// the parent tile. Start asynchronous rendering of visible sub-tiles at +// double resolution. Keep the parent rendered bitmap but don't keep bitmaps +// that go out of view. (Except perhaps for some caching.) When zooming out, +// at some point (0.5x?) merge four sub-tiles back into one. Hmm. Is this the +// right approach? + +// In any case, also this rendering at higher resolution should be done +// asynchronously, of course. If the user zooms in and pans around, the +// existing bitmap will be shown scaled (and ugly) until required rendering +// has finished and then the affected tiles are replaced with +// higher-resolution ones. package org.libreoffice.android.examples; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/gsoc-calc-perf2' - 2 commits - sc/qa sc/source
sc/qa/unit/subsequent_filters-test.cxx |6 +++-
sc/source/filter/xml/xmlimprt.cxx |3 --
sc/source/filter/xml/xmlsubti.cxx | 42 -
sc/source/filter/xml/xmlsubti.hxx |1
4 files changed, 5 insertions(+), 47 deletions(-)
New commits:
commit a2abf16d605b9e4b4437124a08fc312e81ae33af
Author: Daniel Bankston daniel.e.banks...@gmail.com
Date: Mon Jun 25 01:21:26 2012 -0500
Stop calculating row heights and instead use imported row heights only
Change-Id: I1a5e33c292fb915e61511efbdb9ce4a0cfd7265f
diff --git a/sc/source/filter/xml/xmlimprt.cxx
b/sc/source/filter/xml/xmlimprt.cxx
index 5d1d99a..093c3bc 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -2807,6 +2807,7 @@ throw(::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::R
uno::Referencedocument::XActionLockable xActionLockable(xDoc,
uno::UNO_QUERY);
if (xActionLockable.is())
xActionLockable-addActionLock();
+pDoc-EnableAdjustHeight(false);
}
// XServiceInfo
@@ -3100,8 +3101,6 @@ throw( ::com::sun::star::xml::sax::SAXException,
::com::sun::star::uno::RuntimeE
if (!pSheetData-IsSheetBlocked( nTab ))
pDoc-SetStreamValid( nTab, true );
}
-
-aTables.UpdateRowHeights();
aTables.FixupOLEs();
}
if (GetModel().is())
diff --git a/sc/source/filter/xml/xmlsubti.cxx
b/sc/source/filter/xml/xmlsubti.cxx
index 662f278..7825bbf 100644
--- a/sc/source/filter/xml/xmlsubti.cxx
+++ b/sc/source/filter/xml/xmlsubti.cxx
@@ -200,48 +200,6 @@ void ScMyTables::AddColumn(bool bIsCovered)
rImport.GetStylesImportHelper()-InsertCol(maCurrentCellPos.Col(),
maCurrentCellPos.Tab(), rImport.GetDocument());
}
-void ScMyTables::UpdateRowHeights()
-{
-if (rImport.GetModel().is())
-{
-ScXMLImport::MutexGuard aGuard(rImport);
-
-// update automatic row heights
-
-// For sheets with any kind of shapes (including notes),
-// update row heights immediately (before setting the positions).
-// For sheets without shapes, set pending flag
-// and update row heights when a sheet is shown.
-// The current sheet (from view settings) is always updated
immediately.
-
-ScDocument* pDoc = ScXMLConverter::GetScDocument(rImport.GetModel());
-if (pDoc)
-{
-SCTAB nCount = pDoc-GetTableCount();
-ScDrawLayer* pDrawLayer = pDoc-GetDrawLayer();
-
-SCTAB nVisible = rImport.GetVisibleSheet();
-
-ScMarkData aUpdateSheets;
-for (SCTAB nTab=0; nTabnCount; ++nTab)
-{
-const SdrPage* pPage = pDrawLayer ? pDrawLayer-GetPage(nTab)
: NULL;
-if ( nTab == nVisible || ( pPage pPage-GetObjCount() != 0
) )
-aUpdateSheets.SelectTable( nTab, true );
-else
-pDoc-SetPendingRowHeights( nTab, true );
-}
-
-if (aUpdateSheets.GetSelectCount())
-{
-pDoc-LockStreamValid( true ); // ignore draw page size
(but not formula results)
-
ScModelObj::getImplementation(rImport.GetModel())-UpdateAllRowHeights(aUpdateSheets);
-pDoc-LockStreamValid( false );
-}
-}
-}
-}
-
void ScMyTables::DeleteTable()
{
ScXMLImport::MutexGuard aGuard(rImport);
diff --git a/sc/source/filter/xml/xmlsubti.hxx
b/sc/source/filter/xml/xmlsubti.hxx
index 971cb69..3f98af9 100644
--- a/sc/source/filter/xml/xmlsubti.hxx
+++ b/sc/source/filter/xml/xmlsubti.hxx
@@ -107,7 +107,6 @@ public:
voidAddRow();
voidSetRowStyle(const rtl::OUString
rCellStyleName);
voidAddColumn(bool bIsCovered);
-voidUpdateRowHeights();
voidFixupOLEs() { aFixupOLEs.FixupOLEs(); }
boolIsOLE(com::sun::star::uno::Reference
com::sun::star::drawing::XShape rShape) const
{ return
ScMyOLEFixer::IsOLE(rShape); }
commit 44cf1f0db7860b2193a663809678d2056c2cb5ff
Author: Daniel Bankston daniel.e.banks...@gmail.com
Date: Fri Jun 22 23:53:25 2012 -0500
Add unit test for ODS row height import
Change-Id: If8535f80d2f2cd57132d9d694d6bb2535df31c80
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index b9e4a52..1f29ae7 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -450,8 +450,10 @@ void testFormats_Impl(ScFiltersTest* pFiltersTest,
ScDocument* pDoc, sal_Int32 n
pPattern = pDoc-GetPattern(1,3,1);
pPattern-GetFont(aFont, SC_AUTOCOL_RAW);
CPPUNIT_ASSERT_EQUAL_MESSAGE(font should be underlined with a
Re: [GSOC] ODS Row height import
Hi, Markus, I was right about some things, and I was wrong about some other things. XMLTableStylesContext::EndElement() did use ScXMLImport::InsertStyles() which used ScTable::SetOptimalHeight() (or something similar) to set the row heights. I used ScDocument::EnableAdjustHeight(false) to prevent SetOptimalHeight() from actually doing any work. ScXMLImport::endDocument() did use ScMyTables::UpdateRowHeights() which used ScTable::SetOptimalHeightOnly() to set the row heights for the visible sheet and any sheets with tabs. I removed the call to this method, and I removed the method itself since nothing else was using it. Turns out that the row height was already being imported using UNO. ScXMLTableRowContext::EndElement() uses XMLTableStyleContext::FillPropertySet() which uses ScDocument::SetRowHeightOnly() to set the row height to the imported row height values. This remains. With these changes, the all unit tests passed and visual inspection of the heights appeared correct. Using my slow debug build on my laptop (Intel Core2 Duo T7500 @ 2.20GHz running 32bit GNU/Linux with 3.5GB of ram) and the large test file that you gave me, the total load time was consistently shorter from 1:48 to 1:37. I'll push my commits to my feature branch so you can see the changes. Do you think there is something I am missing here? For example, will there ever be a case where row height is not specified, requiring us to calculate the row height? Respectfully, Daniel Bankston ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: configure.in
configure.in | 15 +-- 1 file changed, 9 insertions(+), 6 deletions(-) New commits: commit e6dfd9da6bdc0b2bf8c9990eca83207edf86011f Author: Tor Lillqvist tlillqv...@suse.com Date: Mon Jun 25 09:32:30 2012 +0300 Improve help message at end of configure Change-Id: I2afa40a0da8fb0df5e9a1ae5f9aee4300854a656 diff --git a/configure.in b/configure.in index b1f049d..b10ad8d 100644 --- a/configure.in +++ b/configure.in @@ -12010,6 +12010,14 @@ cat _EOF To build, issue: $GNUMAKE +run: $GNUMAKE help +for details + +_EOF + +if test $_os != WINNT -a $CROSS_COMPILING != YES; then +cat _EOF + To install when the build is finished, issue: $GNUMAKE install @@ -12019,12 +12027,7 @@ $GNUMAKE dev-install If you want to run the smoketest, issue: $GNUMAKE check -ATTENTION: Env.Host.sh and Env.Build.sh are no more. -The environment is now in config_host.mk and config_build.mk (for cross-compile) -You do not need to source them, even for partial build. -run: make help -for details - _EOF +fi dnl vim:set shiftwidth=4 softtabstop=4 expandtab: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: minutes of ESC call ...
Hi Cor, On Sun, Jun 24, 2012 at 11:23:13PM +0200, Cor Nouws oo...@nouenoff.nl wrote: Just taking a quick look at issues from the query below, I would suggest to skip mentioning numbers. There is pollution with old issues, regressions in new functions, minor-if at all issues .. The query is very useful to track and look at the reports. But the number gives a wrong idea of quality. It only shows there's a lot QA /triage work pending. And that was not really news ;-) (Might well be that the same applies for other numbers..) OTOH that's an easy way to notice when the number of regressions in a component increases, it's an easy trick, but still works -- as long as these numbers show up weekly here, I try to care about them. ;-) Miklos ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: oox/inc
oox/inc/oox/vml/vmlformatting.hxx | 44 +++---
1 file changed, 22 insertions(+), 22 deletions(-)
New commits:
commit 35c2b717857baa37d1f31f0bb6aa1ae27201b419
Author: Miklos Vajna vmik...@suse.cz
Date: Mon Jun 25 09:32:18 2012 +0200
oox: kill last vml doxygen errors
Change-Id: I955086f0c816d58fe8dfd104fe90367c76ad6568
diff --git a/oox/inc/oox/vml/vmlformatting.hxx
b/oox/inc/oox/vml/vmlformatting.hxx
index 428e2bd..9bf1683 100644
--- a/oox/inc/oox/vml/vmlformatting.hxx
+++ b/oox/inc/oox/vml/vmlformatting.hxx
@@ -166,16 +166,16 @@ struct StrokeArrowModel
/** The stroke model structure contains all shape border properties. */
struct StrokeModel
{
-OptValue bool moStroked; /// Shape border line on/off.
-StrokeArrowModelmaStartArrow; /// Start line arrow style.
-StrokeArrowModelmaEndArrow; /// End line arrow style.
-OptValue ::rtl::OUString moColor;/// Solid line color.
-OptValue double moOpacity; /// Solid line color opacity.
-OptValue ::rtl::OUString moWeight; /// Line width.
-OptValue ::rtl::OUString moDashStyle;/// Line dash (predefined or
manually).
-OptValue sal_Int32 moLineStyle; /// Line style (single,
double, ...).
-OptValue sal_Int32 moEndCap; /// Type of line end cap.
-OptValue sal_Int32 moJoinStyle; /// Type of line join.
+OptValue bool moStroked; /// Shape border line on/off.
+StrokeArrowModelmaStartArrow; /// Start line arrow style.
+StrokeArrowModelmaEndArrow; /// End line arrow style.
+OptValue ::rtl::OUString moColor;/// Solid line color.
+OptValue double moOpacity; /// Solid line color opacity.
+OptValue ::rtl::OUString moWeight; /// Line width.
+OptValue ::rtl::OUString moDashStyle;/// Line dash (predefined or
manually).
+OptValue sal_Int32 moLineStyle; /// Line style (single,
double, ...).
+OptValue sal_Int32 moEndCap; /// Type of line end cap.
+OptValue sal_Int32 moJoinStyle; /// Type of line join.
voidassignUsed( const StrokeModel rSource );
@@ -190,18 +190,18 @@ struct StrokeModel
/** The fill model structure contains all shape fill properties. */
struct FillModel
{
-OptValue bool moFilled; /// Shape fill on/off.
-OptValue ::rtl::OUString moColor;/// Solid fill color.
-OptValue double moOpacity; /// Solid fill color opacity.
-OptValue ::rtl::OUString moColor2; /// End color of gradient.
-OptValue double moOpacity2; /// End color opacity of
gradient.
-OptValue sal_Int32 moType; /// Fill type.
-OptValue sal_Int32 moAngle; /// Gradient rotation angle.
-OptValue double moFocus;/// Linear gradient focus of
second color.
-OptValue DoublePair moFocusPos; /// Rectangular gradient focus
position of second color.
-OptValue DoublePair moFocusSize; /// Rectangular gradient focus
size of second color.
-OptValue ::rtl::OUString moBitmapPath; /// Path to fill bitmap
fragment.
-OptValue bool moRotate; /// True = rotate
gradient/bitmap with shape.
+OptValue bool moFilled; /// Shape fill on/off.
+OptValue ::rtl::OUString moColor;/// Solid fill color.
+OptValue double moOpacity; /// Solid fill color opacity.
+OptValue ::rtl::OUString moColor2; /// End color of gradient.
+OptValue double moOpacity2; /// End color opacity of
gradient.
+OptValue sal_Int32 moType; /// Fill type.
+OptValue sal_Int32 moAngle; /// Gradient rotation angle.
+OptValue double moFocus;/// Linear gradient focus of
second color.
+OptValue DoublePair moFocusPos; /// Rectangular gradient
focus position of second color.
+OptValue DoublePair moFocusSize; /// Rectangular gradient
focus size of second color.
+OptValue ::rtl::OUString moBitmapPath; /// Path to fill bitmap
fragment.
+OptValue bool moRotate; /// True = rotate
gradient/bitmap with shape.
voidassignUsed( const FillModel rSource );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[gsoc] circular dependency in feature/template-dialog
Hi Rafael, Here is the build error I get when I try to build your branch from scratch: ~/git/libreoffice/gsoc2012/tail_build$ make -sr [ build MOD ] accessibility [ build MOD ] animations make: Circular /home/vmiklos/git/libreoffice/gsoc2012/workdir/unxlngx6.pro/ExternalHeaders/Library/libdrawinglayerlo.so - /home/vmiklos/git/libreoffice/gsoc2012/workdir/unxlngx6.pro/Headers/Library/libavmedialo.so dependency dropped. make: Circular /home/vmiklos/git/libreoffice/gsoc2012/workdir/unxlngx6.pro/LinkTarget/Library/libdrawinglayerlo.so - /home/vmiklos/git/libreoffice/gsoc2012/solver/unxlngx6.pro/lib/libavmedialo.so dependency dropped. [ build LNK ] Library/libdrawinglayerlo.so /usr/lib64/gcc/x86_64-suse-linux/4.6/../../../../x86_64-suse-linux/bin/ld: cannot find -lavmedialo collect2: ld returned 1 exit status make: *** [/home/vmiklos/git/libreoffice/gsoc2012/workdir/unxlngx6.pro/LinkTarget/Library/libdrawinglayerlo.so] Error 1 And indeed it seems: - drawinglayer depends on avmedia - avmedia depends on sfx2 - sfx2 depends on drawinglayer - circular dependency It seems you introduced this dependency in commit 643f30de35d26e7e50ef3ea39a476733dbf38251. Not something that will block you right now, but definitely something to fix before your feature branch gets merged. Miklos ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
patch for building on OS X 10.7 using clang
When building using Mac OS X 10.7.4, the latest Xcode (4.3.3) and the default clang, the build fails to build two unit-tests and aborts: [ build LNK ] CppunitTest/libtest_sw_subsequent_rtftok.dylib Undefined symbols for architecture i386: typeinfo for cppu::OWeakObject, referenced from: typeinfo for cppu::WeakImplHelper32com::sun::star::text::XTextDocument, com::sun::star::text::XLineNumberingProperties, com::sun::star::text::XChapterNumberingSupplier, com::sun::star::text::XNumberingRulesSupplier, com::sun::star::text::XFootnotesSupplier, com::sun::star::text::XEndnotesSupplier, com::sun::star::util::XReplaceable, com::sun::star::text::XPagePrintable, com::sun::star::text::XReferenceMarksSupplier, com::sun::star::text::XTextTablesSupplier, com::sun::star::text::XTextFramesSupplier, com::sun::star::text::XBookmarksSupplier, com::sun::star::text::XTextSectionsSupplier, com::sun::star::text::XTextGraphicObjectsSupplier, com::sun::star::text::XTextEmbeddedObjectsSupplier, com::sun::star::text::XTextFieldsSupplier, com::sun::star::style::XStyleFamiliesSupplier, com::sun::star::style::XAutoStylesSupplier, com::sun::star::lang::XServiceInfo, com::sun::star::drawing::XDrawPageSupplier, com::sun::star::text::XDocumentIndexesSupplier, com::sun::star::beans::XPr opertySet, com::sun::star::beans::XPropertyState, com::sun::star::document::XLinkTargetSupplier, com::sun::star::document::XRedlinesSupplier, com::sun::star::util::XRefreshable, com::sun::star::util::XLinkUpdate, com::sun::star::view::XRenderable, com::sun::star::xforms::XFormsSupplier, com::sun::star::text::XFlatParagraphIteratorProvider, com::sun::star::document::XDocumentLanguages, com::sun::star::util::XCloneable in ooxmltok.o typeinfo for comphelper::WeakImplHelper32com::sun::star::container::XChild, com::sun::star::document::XDocumentInfoSupplier, com::sun::star::document::XDocumentPropertiesSupplier, com::sun::star::rdf::XDocumentMetadataAccess, com::sun::star::document::XDocumentRecovery, com::sun::star::document::XUndoManagerSupplier, com::sun::star::document::XEventBroadcaster, com::sun::star::document::XDocumentEventBroadcaster, com::sun::star::lang::XEventListener, com::sun::star::document::XEventsSupplier, com::sun::star::document::XEmbeddedScripts, com::sun::star::document::XScriptInvocationContext, com::sun::star::frame::XModel2, com::sun::star::util::XModifiable2, com::sun::star::view::XPrintable, com::sun::star::view::XPrintJobBroadcaster, com::sun::star::frame::XStorable2, com::sun::star::frame::XLoadable, com::sun::star::script::XStarBasicAccess, com::sun::star::document::XViewDataSupplier, com::sun::star::util::XCloseable, com::sun::star::datatransfer::XTransferable, com::sun: :star::document::XDocumentSubStorageSupplier, com::sun::star::document::XStorageBasedDocument, com::sun::star::script::provider::XScriptProviderSupplier, com::sun::star::ui::XUIConfigurationManagerSupplier, com::sun::star::embed::XVisualObject, com::sun::star::lang::XUnoTunnel, com::sun::star::frame::XModule, com::sun::star::frame::XTitle, com::sun::star::frame::XTitleChangeBroadcaster, com::sun::star::frame::XUntitledNumbers in ooxmltok.o ld: symbol(s) not found for architecture i386 clang: error: linker command failed with exit code 1 (use -v to see invocation) make[2]: *** [/Users/ward/Projects/libreoffice/libo/workdir/unxmacxi/LinkTarget/CppunitTest/libtest_sw_subsequent_ooxmltok.dylib] Error 1 The below patch (LGPLv3+ / MPL) solves this. Best regards, Ward van Wanrooij diff --git a/sw/CppunitTest_sw_subsequent_ooxmltok.mk b/sw/CppunitTest_sw_subsequent_ooxmltok.mk index 4348603..a1683c1 100644 --- a/sw/CppunitTest_sw_subsequent_ooxmltok.mk +++ b/sw/CppunitTest_sw_subsequent_ooxmltok.mk @@ -36,6 +36,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sw_subsequent_ooxmltok, \ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ooxmltok, \ cppu \ +cppuhelper \ sal \ test \ unotest \ diff --git a/sw/CppunitTest_sw_subsequent_rtftok.mk b/sw/CppunitTest_sw_subsequent_rtftok.mk index 2207756..15a6851 100644 --- a/sw/CppunitTest_sw_subsequent_rtftok.mk +++ b/sw/CppunitTest_sw_subsequent_rtftok.mk @@ -36,6 +36,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sw_subsequent_rtftok, \ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_rtftok, \ cppu \ +cppuhelper \ sal \ sw \ test \ ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
RE: fdo 50950 make (ISO)WEEKNUM comply with ODFF1.2, advise asked
Hi Eike, Please see my Splinter review in https://bugs.freedesktop.org/show_bug.cgi?id=50950#c3 I will do that. (I hope my contributions don't cost you too much time in correcting so that they fit well in the general picture...) It seems one point didn't make it across: I did not suggest to create yet another (internal) WEEKNUM function. I did start with keeping WEEKNUM_ADD in the Add-in module, but as I had diffuculties in using the Date::getWeekofYear function (getting the null date right), I simply thought keeping WEEKNUM and ISOWEEKNUM together would be logical - disrepecting pre-ODFF1.2 and interoperability issues. I will go back to your original plan and upload another diff file to the bugs.feedesktop.org (with corrections as taken from your Splinter review). I'll come back to the compiler details later. The problem there may be mapping from internal (ISOWEEKNUM) to Add-In (WEEKNUM). I am a bit busy with other projects at the time, so don't hurry for my sake :-) Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/CppunitTest_sw_subsequent_ooxmltok.mk sw/CppunitTest_sw_subsequent_rtftok.mk
sw/CppunitTest_sw_subsequent_ooxmltok.mk |1 + sw/CppunitTest_sw_subsequent_rtftok.mk |1 + 2 files changed, 2 insertions(+) New commits: commit ece31c7f44061b89019b334a6fee29dd7cb778c5 Author: Ward van Wanrooij w...@ward.nu Date: Mon Jun 25 09:56:10 2012 +0200 fix build on OS X 10.7 using clang Change-Id: Iffb5d6d74709e9d8b72a87ef6bcd0d37b891c661 diff --git a/sw/CppunitTest_sw_subsequent_ooxmltok.mk b/sw/CppunitTest_sw_subsequent_ooxmltok.mk index 4348603..a1683c1 100644 --- a/sw/CppunitTest_sw_subsequent_ooxmltok.mk +++ b/sw/CppunitTest_sw_subsequent_ooxmltok.mk @@ -36,6 +36,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sw_subsequent_ooxmltok, \ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ooxmltok, \ cppu \ +cppuhelper \ sal \ test \ unotest \ diff --git a/sw/CppunitTest_sw_subsequent_rtftok.mk b/sw/CppunitTest_sw_subsequent_rtftok.mk index 2207756..15a6851 100644 --- a/sw/CppunitTest_sw_subsequent_rtftok.mk +++ b/sw/CppunitTest_sw_subsequent_rtftok.mk @@ -36,6 +36,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sw_subsequent_rtftok, \ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_rtftok, \ cppu \ +cppuhelper \ sal \ sw \ test \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED] for building on OS X 10.7 using clang
Hi Ward, On Mon, Jun 25, 2012 at 12:26:11AM +0200, Ward van Wanrooij w...@ward.nu wrote: The below patch (LGPLv3+ / MPL) solves this. Pushed. Next time please use git format-patch to create patches as described here: http://wiki.documentfoundation.org/Development#Preparing_patches I had to apply your patch manually as it had whitespace issues. Thanks, Miklos ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
REMINDER: Release 3.5.5-rc2 from libreoffice-3-5-5 branch
Hi, please note that the commit deadline for 3.5.5-rc2 is today, June 25, 2012. It will be used as LO-3.5.5 final if no blocker is reported. See also http://wiki.documentfoundation.org/ReleasePlan#3.5_release http://wiki.documentfoundation.org/Release_Criteria http://wiki.documentfoundation.org/Development/Branches Best Regards, Petr PS: Please, help with reviewing patches. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: patch for building on OS X 10.7 using clang
Hi Ward, Thanks for your patch ! :-) On Mon, 2012-06-25 at 00:26 +0200, Ward van Wanrooij wrote: The below patch (LGPLv3+ / MPL) solves this. What really helps ease the license book-keeping is if you can make a blanket license statement on the public list for all commits that we can link into: http://wiki.documentfoundation.org/Development/Developers Any chance of that ? :-) Great to have you involved with improving the Mac version ! Thanks again, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: vcl/aqua
vcl/aqua/source/gdi/coretext/salcoretextfontutils.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 3220899cd80dd3e0f10e305d882da92eaeed8055
Author: Tor Lillqvist t...@iki.fi
Date: Mon Jun 25 11:37:52 2012 +0300
Fix error: redefinition of 'value'
Change-Id: I6c887971b91380543a2c59a4f1b477b9eb4a49b8
diff --git a/vcl/aqua/source/gdi/coretext/salcoretextfontutils.cxx
b/vcl/aqua/source/gdi/coretext/salcoretextfontutils.cxx
index 08db4fd..faaf11b 100644
--- a/vcl/aqua/source/gdi/coretext/salcoretextfontutils.cxx
+++ b/vcl/aqua/source/gdi/coretext/salcoretextfontutils.cxx
@@ -11,6 +11,7 @@
static bool GetDevFontAttributes( CTFontDescriptorRef font_descriptor,
ImplDevFontAttributes rDFA )
{
+int value = 0;
// reset the attributes
rDFA.meFamily = FAMILY_DONTKNOW;
@@ -35,7 +36,6 @@ static bool GetDevFontAttributes( CTFontDescriptorRef
font_descriptor, ImplDevFo
CFRelease(rHeadTable);
#else
CFNumberRef format =
(CFNumberRef)CTFontDescriptorCopyAttribute(font_descriptor,
kCTFontFormatAttribute);
-int value = 0;
CFNumberGetValue(format, kCFNumberIntType, value);
CFRelease(format);
@@ -54,7 +54,6 @@ static bool GetDevFontAttributes( CTFontDescriptorRef
font_descriptor, ImplDevFo
CFDictionaryRef traits =
(CFDictionaryRef)CTFontDescriptorCopyAttribute(font_descriptor,
kCTFontTraitsAttribute);
CFNumberRef symbolics = (CFNumberRef)CFDictionaryGetValue(traits,
kCTFontSymbolicTrait);
-int value = 0;
CFNumberGetValue(symbolics, kCFNumberIntType, value);
CFRelease(symbolics);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PATCH] fdo#35365 default font color for documents
Hi Benjamin, On 2012-06-23 at 19:57 +0200, Benjamin Drung wrote: I am afraid this breaks the way we are handling the hicontrast theme that is supposed to target visually impaired people - we use dark background and white text in the hicontrast case (which wouldn't be the case any more with this patch). Adding the UX advise people what they think - I have no experience with accessibility, so cannot say what is right in this area. If they agree that we should let the hicontrast behavior as it is, I'd prefer: case DOCCOLOR : -aRet = Application::GetSettings().GetStyleSettings().GetWindowColor(); +aRet = Application::GetSettings().GetStyleSettings().GetHighContrastMode()? COL_BLACK: COL_WHITE; break; and similarly for FONTCOLOR - how does that sound to you? Does it make a difference for visually impaired people between black on white and white on black? I have no idea :-( What I wanted to say was that we were handling the color the way I described, but unfortunately I still do not know if it is the correct thing to do, or not - I hope the UX people will be able to help... Is it really a good idea to allow the desktop theme to influence the appearance of the document? Imagine following: I create a document where LibreOffice is configured with black font on white background. I select a brown 1 for the text and save it. Then someone with a hiconstrast theme opens the document and will see dark brown text on a black background. The contrast was reduces instead of increased. ...but you are right that the current handling of hicontrast would make this use case much worse. Please read bug #50861 and the examples given in comment 2 [1]. [1] https://bugs.freedesktop.org/show_bug.cgi?id=50861#c2 BTW, this all color setting thing requires a cleanup - why should we have the baroque StyleSettings class, and on top of that this ColorConfig approach to colors? Are you interested in cleaning up / consolidating the approach to colors as a follow-up? ;-) Yes and no. On the one hand it is appealing to me, but on the other hand other free software projects already consume enough of my spare time. Completely understood :-) All the best, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Calc-Edit Picture with External Tool
Hi there, On Sun, 2012-06-24 at 18:32 -0700, jkedar wrote: Is there a way to set up Right Click -Edit Picture With External Tool in Calc the same way as in Writer ? If you want to hack on this it shouldn't be a huge problem to come up with something: git grep FN_EXTERNAL_EDIT will show you how it works for writer. This is useful for correcting OCR outputs of external programs. This is a developer's list, which is not a good place for requesting features unless you're going to hack on them yourself :-) All the best, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: 3D-Spreadsheets-Setting Transparency to sheets
Hi there, On Sun, 2012-06-24 at 17:40 -0700, jkedar wrote: Is there an in-built way API, Macro, etc. to set Transparency to sheets in Calc in LibreOffice ? Again, this seems like a user question not suited for the developers' list; please read: http://www.libreoffice.org/get-help/ Thanks for your interest, Regards, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - vcl/generic vcl/inc vcl/source
vcl/generic/fontmanager/fontsubst.cxx | 59 ++--
vcl/inc/outfont.hxx | 38 +--
vcl/source/gdi/outdev3.cxx| 165 ++
3 files changed, 210 insertions(+), 52 deletions(-)
New commits:
commit eaf9cbd403f375f9b69e1c7ed8503d3bc23bcc6e
Author: Caolán McNamara caol...@redhat.com
Date: Tue Jun 19 22:23:33 2012 +0100
Resolves: fdo#47636 cache fontconfig font substitutions
But this time cache on *all* properties, not just the name, which doesn't
cut
it, given the things fontconfig can do, e.g. fdo#41556
(cherry picked from commit 8c023fd645c8b83637ffcde4055886b2e4f94393)
Conflicts:
vcl/generic/fontmanager/fontsubst.cxx
vcl/inc/outfont.hxx
vcl/source/gdi/outdev3.cxx
Change-Id: Idfc1dbac67b6912e4985570a0b7c6ccdf47fa4a5
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/vcl/generic/fontmanager/fontsubst.cxx
b/vcl/generic/fontmanager/fontsubst.cxx
index 3e1cafc..188e628 100644
--- a/vcl/generic/fontmanager/fontsubst.cxx
+++ b/vcl/generic/fontmanager/fontsubst.cxx
@@ -42,15 +42,27 @@
#include salprn.hxx
#include region.h
+#include list
+
// ===
// platform specific font substitution hooks
// ===
+struct FontSelectPatternAttributesHash
+{
+size_t operator()(const FontSelectPatternAttributes rAttributes) const
+{ return rAttributes.hashCode(); }
+};
+
class FcPreMatchSubstititution
: public ImplPreMatchFontSubstitution
{
public:
bool FindFontSubstitute( FontSelectPattern ) const;
+typedef ::std::pairFontSelectPatternAttributes,
FontSelectPatternAttributes value_type;
+private:
+typedef ::std::listvalue_type CachedFontMapType;
+mutable CachedFontMapType maCachedFontMap;
};
class FcGlyphFallbackSubstititution
@@ -135,6 +147,19 @@ namespace
rOrig.meWidthType == rNew.meWidthType
);
}
+
+class equal
+{
+private:
+const FontSelectPatternAttributes mrAttributes;
+public:
+equal(const FontSelectPatternAttributes rAttributes)
+: mrAttributes(rAttributes)
+{
+}
+bool operator()(const FcPreMatchSubstititution::value_type rOther)
const
+{ return rOther.first == mrAttributes; }
+};
}
//--
@@ -149,11 +174,26 @@ bool FcPreMatchSubstititution::FindFontSubstitute(
FontSelectPattern rFontSelDa
|| 0 == rFontSelData.maSearchName.CompareIgnoreCaseToAscii( opensymbol,
10) )
return false;
-//Note: see fdo#41556 if you feel compelled to cache the results here,
-//remember that fontconfig can return e.g. an italic font for a non-italic
-//input and/or different fonts depending on fontsize, bold, etc settings so
-//don't cache just on the name, cache on all the input and be don't just
-//return the original selection data with the fontname updated
+//see fdo#41556 and fdo#47636
+//fontconfig can return e.g. an italic font for a non-italic input and/or
+//different fonts depending on fontsize, bold, etc settings so don't cache
+//just on the name, cache map all the input and all the output not just map
+//from original selection to output fontname
+FontSelectPatternAttributes rPatternAttributes = rFontSelData;
+CachedFontMapType rCachedFontMap = const_castCachedFontMapType
(maCachedFontMap);
+CachedFontMapType::iterator itr = std::find_if(rCachedFontMap.begin(),
rCachedFontMap.end(), equal(rPatternAttributes));
+if (itr != rCachedFontMap.end())
+{
+// Cached substitution
+rFontSelData.copyAttributes(itr-second);
+if (itr != rCachedFontMap.begin())
+{
+// MRU, move it to the front
+rCachedFontMap.splice(rCachedFontMap.begin(), rCachedFontMap, itr);
+}
+return true;
+}
+
rtl::OUString aDummy;
const FontSelectPattern aOut = GetFcSubstitute( rFontSelData, aDummy );
@@ -176,7 +216,14 @@ bool FcPreMatchSubstititution::FindFontSubstitute(
FontSelectPattern rFontSelDa
#endif
if( bHaveSubstitute )
+{
+rCachedFontMap.push_front(value_type(rFontSelData, aOut));
+//fairly arbitrary limit in this case, but I recall measuring max 8
+//fonts as the typical max amount of fonts in medium sized documents
+if (rCachedFontMap.size() 8)
+rCachedFontMap.pop_back();
rFontSelData = aOut;
+}
return bHaveSubstitute;
}
@@ -188,7 +235,7 @@ bool FcGlyphFallbackSubstititution::FindFontSubstitute(
FontSelectPattern rFont
{
// We dont' actually want to talk to Fontconfig at all for symbol fonts
if( rFontSelData.IsSymbolFont() )
-return false;
+return false;
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - vcl/generic vcl/inc vcl/source
vcl/generic/fontmanager/fontsubst.cxx | 59 ++--
vcl/inc/outfont.hxx | 38 +--
vcl/source/gdi/outdev3.cxx| 165 ++
3 files changed, 210 insertions(+), 52 deletions(-)
New commits:
commit 304bb8386cef389c82e437f387576c4cf436de48
Author: Caolán McNamara caol...@redhat.com
Date: Tue Jun 19 22:23:33 2012 +0100
Resolves: fdo#47636 cache fontconfig font substitutions
But this time cache on *all* properties, not just the name, which doesn't
cut
it, given the things fontconfig can do, e.g. fdo#41556
(cherry picked from commit 8c023fd645c8b83637ffcde4055886b2e4f94393)
Conflicts:
vcl/inc/outfont.hxx
vcl/source/gdi/outdev3.cxx
Change-Id: Idfc1dbac67b6912e4985570a0b7c6ccdf47fa4a5
diff --git a/vcl/generic/fontmanager/fontsubst.cxx
b/vcl/generic/fontmanager/fontsubst.cxx
index 4f3ec48..3f51fe5 100644
--- a/vcl/generic/fontmanager/fontsubst.cxx
+++ b/vcl/generic/fontmanager/fontsubst.cxx
@@ -42,15 +42,27 @@
#include salprn.hxx
#include region.h
+#include list
+
// ===
// platform specific font substitution hooks
// ===
+struct FontSelectPatternAttributesHash
+{
+size_t operator()(const FontSelectPatternAttributes rAttributes) const
+{ return rAttributes.hashCode(); }
+};
+
class FcPreMatchSubstititution
: public ImplPreMatchFontSubstitution
{
public:
bool FindFontSubstitute( FontSelectPattern ) const;
+typedef ::std::pairFontSelectPatternAttributes,
FontSelectPatternAttributes value_type;
+private:
+typedef ::std::listvalue_type CachedFontMapType;
+mutable CachedFontMapType maCachedFontMap;
};
class FcGlyphFallbackSubstititution
@@ -135,6 +147,19 @@ namespace
rOrig.meWidthType == rNew.meWidthType
);
}
+
+class equal
+{
+private:
+const FontSelectPatternAttributes mrAttributes;
+public:
+equal(const FontSelectPatternAttributes rAttributes)
+: mrAttributes(rAttributes)
+{
+}
+bool operator()(const FcPreMatchSubstititution::value_type rOther)
const
+{ return rOther.first == mrAttributes; }
+};
}
//--
@@ -149,11 +174,26 @@ bool FcPreMatchSubstititution::FindFontSubstitute(
FontSelectPattern rFontSelDa
|| 0 == rFontSelData.maSearchName.CompareIgnoreCaseToAscii( opensymbol,
10) )
return false;
-//Note: see fdo#41556 if you feel compelled to cache the results here,
-//remember that fontconfig can return e.g. an italic font for a non-italic
-//input and/or different fonts depending on fontsize, bold, etc settings so
-//don't cache just on the name, cache on all the input and don't just
-//return the original selection data with the fontname updated
+//see fdo#41556 and fdo#47636
+//fontconfig can return e.g. an italic font for a non-italic input and/or
+//different fonts depending on fontsize, bold, etc settings so don't cache
+//just on the name, cache map all the input and all the output not just map
+//from original selection to output fontname
+FontSelectPatternAttributes rPatternAttributes = rFontSelData;
+CachedFontMapType rCachedFontMap = const_castCachedFontMapType
(maCachedFontMap);
+CachedFontMapType::iterator itr = std::find_if(rCachedFontMap.begin(),
rCachedFontMap.end(), equal(rPatternAttributes));
+if (itr != rCachedFontMap.end())
+{
+// Cached substitution
+rFontSelData.copyAttributes(itr-second);
+if (itr != rCachedFontMap.begin())
+{
+// MRU, move it to the front
+rCachedFontMap.splice(rCachedFontMap.begin(), rCachedFontMap, itr);
+}
+return true;
+}
+
rtl::OUString aDummy;
const FontSelectPattern aOut = GetFcSubstitute( rFontSelData, aDummy );
@@ -178,7 +218,14 @@ bool FcPreMatchSubstititution::FindFontSubstitute(
FontSelectPattern rFontSelDa
#endif
if( bHaveSubstitute )
+{
+rCachedFontMap.push_front(value_type(rFontSelData, aOut));
+//fairly arbitrary limit in this case, but I recall measuring max 8
+//fonts as the typical max amount of fonts in medium sized documents
+if (rCachedFontMap.size() 8)
+rCachedFontMap.pop_back();
rFontSelData = aOut;
+}
return bHaveSubstitute;
}
@@ -190,7 +237,7 @@ bool FcGlyphFallbackSubstititution::FindFontSubstitute(
FontSelectPattern rFont
{
// We dont' actually want to talk to Fontconfig at all for symbol fonts
if( rFontSelData.IsSymbolFont() )
-return false;
+return false;
// StarSymbol is a unicode font, but it still deserves the symbol flag
if( 0 ==
Re: minutes of ESC call ...
Hi Cor, On Sun, 2012-06-24 at 23:23 +0200, Cor Nouws wrote: Michael Meeks wrote (21-06-12 17:55) * 3.5 bugs tagged with 'regression' + 179(+12) bugs open of 631(+17) total [...] Just taking a quick look at issues from the query below, I would suggest to skip mentioning numbers. There is pollution with old issues, regressions in new functions, minor-if at all issues .. Sure - and there is double counting of some issues - as I point out in the numbers - which gives a misleading spike recently. Furthermore, an increase in the apparent number of regressions may be related to an increase in QA activity categorising and triaging bugs :-) and thus totally un-related to any underlying improvement / degradation in real quality. The query is very useful to track and look at the reports. But the number gives a wrong idea of quality. It only shows there's a lot QA /triage work pending. And that was not really news ;-) (Might well be that the same applies for other numbers..) True; OTOH, this is not a news headline, it is a motivational set of numbers that are designed to try to encourage people to shrink the numbers. Already (IMHO) they have helped to improve our component categorisation (the writer guys got sick of being blamed for all common / core code bugs), and (I hope) also encouraged people to work on getting the numbers down. The hope is that by double counting crashers eg. we encourage people to focus first on those. So - the numbers are by no means perfect, but hopefully they serve a useful purpose and show at least something of our QA activity, and developer / bug-fixing work. The overall graphs I produce also show bugs fixed, where you can see (from the growing separation of the 'open' and 'closed' trends) that we are fixing more most annoying regression bugs over time, and particularly Most Annoying Bugs :-) At least, that's my thinking :-) do you have some better insights ? All the best, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-5-5' - vcl/generic vcl/inc vcl/source
vcl/generic/fontmanager/fontsubst.cxx | 59 ++--
vcl/inc/outfont.hxx | 38 +--
vcl/source/gdi/outdev3.cxx| 165 ++
3 files changed, 210 insertions(+), 52 deletions(-)
New commits:
commit d122b0f592aaa8af00695109ce2a71f6d8807a96
Author: Caolán McNamara caol...@redhat.com
Date: Tue Jun 19 22:23:33 2012 +0100
Resolves: fdo#47636 cache fontconfig font substitutions
But this time cache on *all* properties, not just the name, which doesn't
cut
it, given the things fontconfig can do, e.g. fdo#41556
(cherry picked from commit 8c023fd645c8b83637ffcde4055886b2e4f94393)
Conflicts:
vcl/generic/fontmanager/fontsubst.cxx
vcl/inc/outfont.hxx
vcl/source/gdi/outdev3.cxx
Change-Id: Idfc1dbac67b6912e4985570a0b7c6ccdf47fa4a5
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/vcl/generic/fontmanager/fontsubst.cxx
b/vcl/generic/fontmanager/fontsubst.cxx
index 3e1cafc..188e628 100644
--- a/vcl/generic/fontmanager/fontsubst.cxx
+++ b/vcl/generic/fontmanager/fontsubst.cxx
@@ -42,15 +42,27 @@
#include salprn.hxx
#include region.h
+#include list
+
// ===
// platform specific font substitution hooks
// ===
+struct FontSelectPatternAttributesHash
+{
+size_t operator()(const FontSelectPatternAttributes rAttributes) const
+{ return rAttributes.hashCode(); }
+};
+
class FcPreMatchSubstititution
: public ImplPreMatchFontSubstitution
{
public:
bool FindFontSubstitute( FontSelectPattern ) const;
+typedef ::std::pairFontSelectPatternAttributes,
FontSelectPatternAttributes value_type;
+private:
+typedef ::std::listvalue_type CachedFontMapType;
+mutable CachedFontMapType maCachedFontMap;
};
class FcGlyphFallbackSubstititution
@@ -135,6 +147,19 @@ namespace
rOrig.meWidthType == rNew.meWidthType
);
}
+
+class equal
+{
+private:
+const FontSelectPatternAttributes mrAttributes;
+public:
+equal(const FontSelectPatternAttributes rAttributes)
+: mrAttributes(rAttributes)
+{
+}
+bool operator()(const FcPreMatchSubstititution::value_type rOther)
const
+{ return rOther.first == mrAttributes; }
+};
}
//--
@@ -149,11 +174,26 @@ bool FcPreMatchSubstititution::FindFontSubstitute(
FontSelectPattern rFontSelDa
|| 0 == rFontSelData.maSearchName.CompareIgnoreCaseToAscii( opensymbol,
10) )
return false;
-//Note: see fdo#41556 if you feel compelled to cache the results here,
-//remember that fontconfig can return e.g. an italic font for a non-italic
-//input and/or different fonts depending on fontsize, bold, etc settings so
-//don't cache just on the name, cache on all the input and be don't just
-//return the original selection data with the fontname updated
+//see fdo#41556 and fdo#47636
+//fontconfig can return e.g. an italic font for a non-italic input and/or
+//different fonts depending on fontsize, bold, etc settings so don't cache
+//just on the name, cache map all the input and all the output not just map
+//from original selection to output fontname
+FontSelectPatternAttributes rPatternAttributes = rFontSelData;
+CachedFontMapType rCachedFontMap = const_castCachedFontMapType
(maCachedFontMap);
+CachedFontMapType::iterator itr = std::find_if(rCachedFontMap.begin(),
rCachedFontMap.end(), equal(rPatternAttributes));
+if (itr != rCachedFontMap.end())
+{
+// Cached substitution
+rFontSelData.copyAttributes(itr-second);
+if (itr != rCachedFontMap.begin())
+{
+// MRU, move it to the front
+rCachedFontMap.splice(rCachedFontMap.begin(), rCachedFontMap, itr);
+}
+return true;
+}
+
rtl::OUString aDummy;
const FontSelectPattern aOut = GetFcSubstitute( rFontSelData, aDummy );
@@ -176,7 +216,14 @@ bool FcPreMatchSubstititution::FindFontSubstitute(
FontSelectPattern rFontSelDa
#endif
if( bHaveSubstitute )
+{
+rCachedFontMap.push_front(value_type(rFontSelData, aOut));
+//fairly arbitrary limit in this case, but I recall measuring max 8
+//fonts as the typical max amount of fonts in medium sized documents
+if (rCachedFontMap.size() 8)
+rCachedFontMap.pop_back();
rFontSelData = aOut;
+}
return bHaveSubstitute;
}
@@ -188,7 +235,7 @@ bool FcGlyphFallbackSubstititution::FindFontSubstitute(
FontSelectPattern rFont
{
// We dont' actually want to talk to Fontconfig at all for symbol fonts
if( rFontSelData.IsSymbolFont() )
-return false;
+return false;
//
Re: another 3.6.0beta2 build error
Hi Andreas, On Sun, 2012-06-24 at 11:10 +0200, Andreas Radke wrote: In file included from /build/src/libreoffice-core-3.6.0.0.beta2/avmedia/source/framework/mediacontrol.cxx:33:0: /build/src/libreoffice-core-3.6.0.0.beta2/solver/unxlngx6.pro/inc/avmedia/mediaplayer.hxx:32:29: fatal error: sfx2/ctrlitem.hxx: No such file or directory compilation terminated. Yes - this is indeed annoying; I too had this bug - and I have -no- idea how the avmedia module can end up with stale files lying around in the source code that contain this sort of include. I had it when I switched my compiled git tree between branches. What has changed here? Somehow the source is not copied: I -think- the problem is that we are compiling a file that happens to be left lying around in the git tree - despite not being used anymore - perhaps it is a generated file, referred to by a (now obsolete) dependency file (or somesuch). The solution is to build from a clean workdir solver I think (sadly); so make clean rm -Rf workdir solver make It's possible there are also some malingering files in the source causing grief; so - sometimes (assuming you have no un-committed changes), it is worth doing: rm -Rf * git reset --hard which will restore a pristine git checkout; though you could do 'git status' and check there is nothing bad there first I guess. HTH ! Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] Give Macro recorder separate option, apart from Experimental features
On Sat, 2012-06-23 at 22:12 +0200, Cor Nouws wrote: Ah well, my memory was wrong. But apparently some change in the dialog container code saved me: the 3.6.0 beta produces a higher dialog on Windows :-) Great :-) So I can forget my initial thoughts about rearrangements. Thanks for checking, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED 3-5][REVIEW 3-5-5] Fix fdo#48602: code-page mismatch in Visio 2000 files
On Fri, 2012-06-22 at 17:11 +0200, Petr Mladek wrote: Two more approvals are needed for 3-5-5. You have one from me :-) the diff looks big, but the text/ tool is irrelevant for us, and the charset stuff is mostly code-movement and simplification it seems. Thanks, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#44602 Modeless word count window hides when user clicks into note
Hello. = Bug = https://bugs.freedesktop.org/show_bug.cgi?id=44602 = Patch = https://bugs.freedesktop.org/attachment.cgi?id=63423 = Patch Review = https://bugs.freedesktop.org/page.cgi?id=splinter.htmlbug=44602attachment=63423 = Changes = The word count dialog wasn't registered as a child window in the SwView interface. Now it is. = Testing = make check Ad-hoc testing Regards, --Muhammad ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: extensions/source
extensions/source/bibliography/bibconfig.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ee7404c81903896515d5248a0dc4543989f6023c Author: Tor Lillqvist t...@iki.fi Date: Mon Jun 25 13:06:58 2012 +0300 WaE: 'Mapping' defined as a struct here but previously declared as a class Change-Id: I79de31ca5eac837fe755ea0b52ac6fe5cfec8e15 diff --git a/extensions/source/bibliography/bibconfig.hxx b/extensions/source/bibliography/bibconfig.hxx index 02fe71e..28d0de6 100644 --- a/extensions/source/bibliography/bibconfig.hxx +++ b/extensions/source/bibliography/bibconfig.hxx @@ -32,7 +32,7 @@ #include unotools/configitem.hxx #include boost/ptr_container/ptr_vector.hpp -class Mapping; +struct Mapping; typedef boost::ptr_vectorMapping MappingArray; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED 3-5-5] Request sign-off for crash fix
Found pushed to libreoffice-3-5-5. Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Gerrit review patch query helper...
Hi Sebastian, On Fri, 2012-06-22 at 16:03 +0200, Sebastian Spaeth wrote: Hi all, I was annoyed by the oververbose gerrit query output so I fixed it for me. Me too :-) I learned too late that David has something similar as logerrit in the core repository. But it is in shell script, and I have written a small query helper in python. It lists outstanding patches similar to git log (it also uses less to show them). The output is like this: Could we not convert David's logerrit into python ? and have a single script in more of a real programming language :-) [ shell eventually becomes an un-maintainable / non-portable tangle IMHO ]. David - would you be ok with that ? The code is at git://gitorious.org/querrit/querrit.git and requires Python3. Oh - but of course requiring the very latest python is not so cool for general use I guess :-) Feedback is welcome. I plan to add some config file support to be able to configure the hostname. If I have plenty of time, I'll also add a userfriendly review tool. Sounds great to me, but I'd -love- us all using, documenting, and improving the same tooling (preferably not written in shell) ;-) Thanks for jumping on and fixing the problem :-) All the best ! Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sc/source
sc/source/filter/excel/xetable.cxx |6 ++ 1 file changed, 6 insertions(+) New commits: commit 66ea6d9801ea8e214f39a70251e5ccc5f47c315a Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Mon Jun 25 12:29:02 2012 +0200 only export the supported number of rows/columns, fdo#49582 Change-Id: I51fc4d0a6d9cc09c82268351ad069467bf8acc31 diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx index 5656b71..150c730 100644 --- a/sc/source/filter/excel/xetable.cxx +++ b/sc/source/filter/excel/xetable.cxx @@ -2210,6 +2210,12 @@ XclExpCellTable::XclExpCellTable( const XclExpRoot rRoot ) : SCROW nLastUsedScRow; rDoc.GetFormattedAndUsedArea( nScTab, nLastUsedScCol, nLastUsedScRow ); +if(nLastUsedScCol nMaxScCol) +nLastUsedScCol = nMaxScCol; + +if(nLastUsedScRow nMaxScRow) +nLastUsedScRow = nMaxScRow; + ScRange aUsedRange( 0, 0, nScTab, nLastUsedScCol, nLastUsedScRow, nScTab ); GetAddressConverter().ValidateRange( aUsedRange, true ); nLastUsedScCol = aUsedRange.aEnd.Col(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED 3-5][PUSHED 3-6][REVIEW 3-5-5?] fdo#47636 font fallback performance regression
Michael Meeks píše v Čt 21. 06. 2012 v 17:21 +0100: Hi there, On Thu, 2012-06-21 at 16:20 +0100, Caolán McNamara wrote: So 8c023fd645c8b83637ffcde4055886b2e4f94393 should fix a performance regression with font fallback under fontconfig using platforms when a font is missing. This may be a duplicate of MAB fdo#44719. Fontconfig is fairly slow on finding a replacement font so proposed solution is to cache the results. You have my +1 for both branches (no need for review for -3-6 for this regression / bug IMHO) ;-) The patch is also a lot simpler when considering the revert of the original cache logic. I'll push it in a bit if no-one else has - just building -3-5 currently to test the performance improvement. It built fine, so I pushed it into 3-5 branch with Michael's approval, see http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5id=eaf9cbd403f375f9b69e1c7ed8503d3bc23bcc6e I saw it also in 3-6 branch. The questions is if it is save enough for 3-5-5 branch. The problem is that there won't be much testing before 3.5.5 release. Well, I do not see anything wrong in the patch, so I might give one extra approval. So, if we get one more... Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: libicudata in non-standard directory linking issues.
yeah, that compiled icu fine, and I didn't even have to copy the icu libs to the solver ... compiled for a long time after that ... tools_test fails though ... If you can look through the debug file (sorry 1.7Mb https://docs.google.com/open?id=0B6o_jmGQm0dWd3VMWEc5alhJaWc ) and give me pointers I'd be grateful ... if you can't then I'll leave it as is for now and try when I get access to a new compiler/updated LibreOffice source. Jon On 22 June 2012 09:57, Jonathan Adams t12nsloo...@gmail.com wrote: i'm not sure if adding a defined(__IBMC__) etc. is the right approach but if it doesn't break anything... they added that line for z/OS ... which, I may be wrong, I believe to be an IBM system ... looking around wikipedia; I found references to what defines are set when compiling on z/OS ... there is code a little further down to set _XOPEN_SOURCE_EXTENDED to 0 on Solaris, but Solaris just checks to see if _XOPEN_SOURCE_EXTENDED is defined ... I guess I could fix it by changing the following statement to an undef. you should try to update your ICU bug with the new patch as well, to get upstream's opinion and hopefully a fixed next ICU version. I updated the patch before I posted the email ... :) I'll do a git pull and then re-autogen it. Jon ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/source
sc/source/filter/excel/xetable.cxx |6 ++ 1 file changed, 6 insertions(+) New commits: commit 462f94c2b93a65e5388e2935baaeeac165679a14 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Mon Jun 25 12:29:02 2012 +0200 only export the supported number of rows/columns, fdo#49582 Change-Id: I51fc4d0a6d9cc09c82268351ad069467bf8acc31 diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx index 5656b71..150c730 100644 --- a/sc/source/filter/excel/xetable.cxx +++ b/sc/source/filter/excel/xetable.cxx @@ -2210,6 +2210,12 @@ XclExpCellTable::XclExpCellTable( const XclExpRoot rRoot ) : SCROW nLastUsedScRow; rDoc.GetFormattedAndUsedArea( nScTab, nLastUsedScCol, nLastUsedScRow ); +if(nLastUsedScCol nMaxScCol) +nLastUsedScCol = nMaxScCol; + +if(nLastUsedScRow nMaxScRow) +nLastUsedScRow = nMaxScRow; + ScRange aUsedRange( 0, 0, nScTab, nLastUsedScCol, nLastUsedScRow, nScTab ); GetAddressConverter().ValidateRange( aUsedRange, true ); nLastUsedScCol = aUsedRange.aEnd.Col(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: writerfilter/source
writerfilter/source/dmapper/DomainMapper.cxx | 10 ++
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 14 ++
writerfilter/source/dmapper/DomainMapper_Impl.hxx |6 ++
3 files changed, 30 insertions(+)
New commits:
commit eae88a9cb1120aecf2e29628fb22a70a62dc
Author: Miklos Vajna vmik...@suse.cz
Date: Mon Jun 25 12:43:18 2012 +0200
n#766481 dmapper: don't import fake paragraph containing sectpr only
Change-Id: I5eaf8b765d03b898c1c9a466802b75bbfe05a622
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index f51ce3f..9b7ee29 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -2795,6 +2795,8 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext, SprmType
case NS_ooxml::LN_CT_Style_rPr:
case NS_ooxml::LN_CT_PPr_rPr:
case NS_ooxml::LN_CT_PPrBase_numPr:
+if (nSprmId == NS_ooxml::LN_CT_PPr_sectPr)
+m_pImpl-SetParaSectpr(true);
resolveSprmProps(*this, rSprm);
break;
case NS_ooxml::LN_EG_SectPrContents_footnotePr:
@@ -3396,7 +3398,15 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_,
size_t len)
// RTF always uses text() instead of utext() for run break
if(len == 1 ((*data_) == 0x0d || (*data_) == 0x07)
!IsRTFImport())
+{
+// If the paragraph contains only the section properties and it has
+// no runs, we should not create a paragraph for it in Writer.
+bool bRemove = !m_pImpl-GetParaChanged()
m_pImpl-GetParaSectpr();
+m_pImpl-SetParaSectpr(false);
m_pImpl-finishParagraph(m_pImpl-GetTopContextOfType(CONTEXT_PARAGRAPH));
+if (bRemove)
+m_pImpl-RemoveLastParagraph();
+}
else
{
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 8e6d2c6..fb4dbcc 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -207,6 +207,7 @@ DomainMapper_Impl::DomainMapper_Impl(
m_bIsParaChange( false ),
m_bParaChanged( false ),
m_bIsLastParaInSection( false ),
+m_bParaSectpr( false ),
m_bUsingEnhancedFields( false )
{
appendTableManager( );
@@ -307,7 +308,20 @@ void DomainMapper_Impl::SetIsLastParagraphInSection( bool
bIsLast )
m_bIsLastParaInSection = bIsLast;
}
+void DomainMapper_Impl::SetParaSectpr(bool bParaSectpr)
+{
+m_bParaSectpr = bParaSectpr;
+}
+bool DomainMapper_Impl::GetParaSectpr()
+{
+return m_bParaSectpr;
+}
+
+bool DomainMapper_Impl::GetParaChanged()
+{
+return m_bParaChanged;
+}
voidDomainMapper_Impl::PushProperties(ContextType eId)
{
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 77a2b62..55c8e6e 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -349,8 +349,11 @@ private:
RedlineParamsPtrm_pParaRedline;
boolm_bIsParaChange;
+/// If the current paragraph has any runs.
boolm_bParaChanged;
boolm_bIsLastParaInSection;
+/// If the current paragraph contains section property definitions.
+boolm_bParaSectpr;
boolm_bUsingEnhancedFields;
//annotation import
@@ -406,6 +409,9 @@ public:
void RemoveLastParagraph( );
void SetIsLastParagraphInSection( bool bIsLast );
+void SetParaSectpr(bool bParaSectpr);
+bool GetParaSectpr();
+bool GetParaChanged();
void deferBreak( BreakType deferredBreakType );
bool isBreakDeferred( BreakType deferredBreakType );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: filter/inc
filter/inc/filter/msfilter/msdffimp.hxx | 126
1 file changed, 63 insertions(+), 63 deletions(-)
New commits:
commit 003b4d21a43b607fb754ca3a65746937cbcc20e9
Author: Jesso Clarence Murugan jmuru...@kacst.edu.sa
Date: Sat Jun 23 12:09:37 2012 +0300
Translated German comments in filter/inc/filter/msfilter/msdffimp.hxx
Change-Id: I8cdc40e0d277567b0d9c5fe2794f8f5c381bbc59
diff --git a/filter/inc/filter/msfilter/msdffimp.hxx
b/filter/inc/filter/msfilter/msdffimp.hxx
index 3c4e9e2..ac9e8be 100644
--- a/filter/inc/filter/msfilter/msdffimp.hxx
+++ b/filter/inc/filter/msfilter/msdffimp.hxx
@@ -184,7 +184,7 @@ typedef ::std::map sal_Int32, SdrObject*
SvxMSDffShapeIdContainer;
#define SVEXT_PERSIST_STREAM \002OlePres000
-// nach der Reihenfolge des Auftretens sortiert werden:
+// are sorted by the order of occurrence:
typedef boost::ptr_vectorSvxMSDffBLIPInfo SvxMSDffBLIPInfos;
class SvxMSDffShapeOrders : public std::vectorSvxMSDffShapeOrder*
@@ -193,7 +193,7 @@ public:
~SvxMSDffShapeOrders();
};
-// explizit sortiert werden:
+// will be sorted explicitly:
SV_DECL_PTRARR_SORT_DEL_VISIBILITY(SvxMSDffShapeInfos, SvxMSDffShapeInfo_Ptr,
16, MSFILTER_DLLPUBLIC)
SV_DECL_PTRARR_SORT_VISIBILITY(SvxMSDffShapeTxBxSort, SvxMSDffShapeOrder*,
16, MSFILTER_DLLPUBLIC)
@@ -263,7 +263,7 @@ struct FIDCL
};
//---
-// von SvxMSDffManager fuer jedes in der Gruppe enthaltene Shape geliefert
+// from SvxMSDffManager provided for each group included in the shape
//---
struct MSDffTxId
{
@@ -294,7 +294,7 @@ struct MSFILTER_DLLPUBLIC SvxMSDffImportRec
sal_uInt32 nLayoutInTableCell;
sal_uInt32 nFlags;
longnTextRotationAngle;
-longnDxTextLeft;// Abstand der Textbox vom umgebenden Shape
+longnDxTextLeft;// The distance from the surrounding text
box shape
longnDyTextTop;
longnDxTextRight;
longnDyTextBottom;
@@ -306,8 +306,8 @@ struct MSFILTER_DLLPUBLIC SvxMSDffImportRec
longnCropFromBottom;
longnCropFromLeft;
longnCropFromRight;
-MSDffTxId aTextId;// Kennungen fuer Textboxen
-sal_uLong nNextShapeId; // fuer verlinkte Textboxen
+MSDffTxId aTextId;// Identifiers for text boxes
+sal_uLong nNextShapeId; // for linked text boxes
sal_uLong nShapeId;
MSO_SPT eShapeType;
MSO_LineStyle eLineStyle; // Umrandungs-Arten
@@ -337,7 +337,7 @@ private:
typedef SvxMSDffImportRec* MSDffImportRec_Ptr;
-// Liste aller SvxMSDffImportRec fuer eine Gruppe
+// List of all SvxMSDffImportRec for a Group
SV_DECL_PTRARR_SORT_DEL_VISIBILITY(MSDffImportRecords, MSDffImportRec_Ptr, 16,
MSFILTER_DLLPUBLIC)
//---
@@ -345,10 +345,10 @@ SV_DECL_PTRARR_SORT_DEL_VISIBILITY(MSDffImportRecords,
MSDffImportRec_Ptr, 16, M
//---
struct SvxMSDffImportData
{
-MSDffImportRecords aRecords; // Shape-Pointer, -Ids und private Daten
-Rectangle aParentRect;// Rectangle der umgebenden Gruppe
+MSDffImportRecords aRecords; // Shape-Pointer ids and private data
+Rectangle aParentRect;// Rectangle der umgebenden group
// bzw. von aussen reingegebenes Rect
-Rectangle aNewRect; // mit diesem Shape definiertes Rectangle
+Rectangle aNewRect; // defined by this Rectangle shape
SvxMSDffImportData()
{}
@@ -448,10 +448,10 @@ class MSFILTER_DLLPUBLIC DffRecordManager : public
DffRecordList
};
/*
-SvxMSDffManager - abstrakte Basis-Klasse fuer Escher-Import
+SvxMSDffManager - abstract base class for Escher-Import
===
-Zweck: Zugriff auf Objekte im Drawing File Format
-Stand: Zugriff nur auf BLIPs (wird spaeter erweitert)
+Purpose: To access objects in the Drawing File Format
+Current Status: Access only to blips (will be extended later)
Beachte: in der zwecks PowerPoint-, ODER Word- ODER Excel-Import
abgeleiteten Klasse
@@ -546,7 +546,7 @@ typedef std::mapsal_uInt32, sal_uInt32 OffsetMap;
const Rectangle rVisArea );
/*
-folgende Methoden sind zum Excel-Import zu ueberschreiben:
+the following methods are to overwrite the Excel import:
*/
virtual sal_Bool ProcessClientAnchor(SvStream rStData, sal_uInt32
nDatLen, char* rpBuff, sal_uInt32 rBuffLen ) const;
virtual void ProcessClientAnchor2( SvStream rStData, DffRecordHeader
rHd, void* pData, DffObjData );
@@ -602,23 +602,23 @@ public:
sal_uInt16 rInst,
[PUSHED] German comments translation
Hi Jesso, On Sat, 2012-06-23 at 12:28 +0300, Jesso Murugan wrote: I tranlsated German comments in filter/inc/filter/msfilter/msdffimp.hxx Lovely; Philipp has some good comments, hopefully he can improve the corner cases there, but I pushed your patch thus far as it is :-) It's no problem not being a native German speaker for comment translation, as long as you're sure you understand the code the comments are for. Do comments need a licence statement? Anyway, you have mine below. Much appreciated :-) As Philipp says, some of the easy hacks would be great to work on - unless you have something special in mind you'd like to fix / improve ? Great to have you hacking with us, All the best, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 4 commits - editeng/inc editeng/qa editeng/source sc/qa sc/source sdext/Extension_minimizer.mk sdext/Extension_pdfimport.mk sdext/Extension_presenter.mk sfx2/Library_qstart.mk
editeng/inc/editeng/borderline.hxx |4 +-- editeng/qa/items/borderline_test.cxx | 12 +-- editeng/source/items/borderline.cxx | 10 - editeng/source/items/frmitems.cxx| 16 --- editeng/source/rtf/rtfitem.cxx | 28 +-- sc/qa/unit/subsequent_filters-test.cxx | 12 +-- sc/source/core/data/attarray.cxx |2 - sc/source/filter/excel/xestyle.cxx |4 +-- sc/source/filter/excel/xistyle.cxx |3 +- sc/source/filter/html/htmlexp.cxx|2 - sc/source/filter/lotus/lotattr.cxx |4 +-- sc/source/ui/view/formatsh.cxx |3 +- sc/source/ui/view/tabvwsh8.cxx |2 - sc/source/ui/view/viewfun2.cxx |4 +-- sdext/Extension_minimizer.mk |4 +-- sdext/Extension_pdfimport.mk | 10 +++-- sdext/Extension_presenter.mk |4 +-- sfx2/Library_qstart.mk |1 solenv/gbuild/Extension.mk | 20 +++ svx/source/dialog/framelink.cxx |2 - svx/source/dialog/frmsel.cxx |9 +--- svx/source/table/viewcontactoftableobj.cxx |8 +++ svx/source/tbxctrls/tbcontrl.cxx |5 ++-- sw/source/core/docnode/ndtbl.cxx |2 - sw/source/core/edit/autofmt.cxx | 12 +-- sw/source/core/layout/paintfrm.cxx |2 - sw/source/filter/html/css1atr.cxx|2 - sw/source/filter/html/htmltab.cxx|8 +++ sw/source/filter/html/svxcss1.cxx| 18 - sw/source/filter/html/swhtml.cxx |6 +++-- sw/source/filter/ww1/w1sprm.cxx |4 +-- sw/source/filter/ww8/docxattributeoutput.cxx |2 - sw/source/filter/ww8/rtfattributeoutput.cxx |2 - sw/source/filter/ww8/wrtw8esh.cxx|2 - sw/source/filter/ww8/ww8atr.cxx |6 ++--- sw/source/filter/ww8/ww8graf.cxx |2 - sw/source/filter/ww8/ww8par6.cxx |2 - sw/source/filter/xml/xmlexpit.cxx|4 +-- sw/source/filter/xml/xmlithlp.cxx|6 +++-- sw/source/ui/shells/frmsh.cxx|4 +-- sw/source/ui/shells/tabsh.cxx|4 +-- 41 files changed, 147 insertions(+), 110 deletions(-) New commits: commit 7fb922b32b3fa612ebc8b7dfbc7e53ed990b40a0 Author: Michael Stahl mst...@redhat.com Date: Mon Jun 25 12:44:43 2012 +0200 Library_qstart.mk: remove -DDLL_NAME The library is not called sfx2 but sfx, and it should really be using gb_Library_get_runtime_filename, but it turns out DLL_NAME is not actually used, so just remove it. Change-Id: I553318015c3c2a21725860b28574995a8319a44b diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk index aa0a549..a1372e5 100644 --- a/sfx2/Library_qstart.mk +++ b/sfx2/Library_qstart.mk @@ -41,7 +41,6 @@ $(eval $(call gb_Library_use_api,qstart_gtk,\ )) $(eval $(call gb_Library_add_defs,qstart_gtk,\ --DDLL_NAME=$(notdir $(call gb_Library_get_target,sfx2)) \ -DENABLE_QUICKSTART_APPLET \ )) commit efb69f7c737f8f8dae876c8d6b7bf3968a40676d Author: Michael Stahl mst...@redhat.com Date: Mon Jun 25 12:34:42 2012 +0200 gbuild: add gb_Extension_add_executable This is not really necessary, but consistent. Change-Id: Ic0249efac26c9977ede7ef591d517cc03542b002 diff --git a/sdext/Extension_pdfimport.mk b/sdext/Extension_pdfimport.mk index 27841f5..c5692de 100644 --- a/sdext/Extension_pdfimport.mk +++ b/sdext/Extension_pdfimport.mk @@ -37,8 +37,11 @@ $(eval $(call gb_Extension_add_libraries,pdfimport,\ pdfimport \ )) +$(eval $(call gb_Extension_add_executables,pdfimport,\ +xpdfimport \ +)) + $(eval $(call gb_Extension_add_files,pdfimport,,\ -$(call gb_Executable_get_target,xpdfimport) \ $(SRCDIR)/sdext/source/pdfimport/config/pdf_import_filter.xcu \ $(SRCDIR)/sdext/source/pdfimport/config/pdf_types.xcu \ $(SRCDIR)/sdext/source/pdfimport/dialogs/xpdfimport_err.pdf \ diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index a959a8f..86c1366 100644 --- a/solenv/gbuild/Extension.mk +++ b/solenv/gbuild/Extension.mk @@ -166,6 +166,16 @@ define gb_Extension_add_libraries $(foreach lib,$(2),$(call gb_Extension_add_library,$(1),$(lib))) endef +# add an executable from the solver +define gb_Extension_add_executable +$(call gb_Extension_add_file,$(1),$(notdir $(call gb_Executable_get_target,$(2))),\ + $(call gb_Executable_get_target,$(2))) +endef + +define gb_Extension_add_executables +$(foreach exe,$(2),$(call gb_Extension_add_executable,$(1),$(exe))) +endef + # localize .properties file # source file is copied to $(WORKDIR) define gb_Extension_localize_properties commit
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Bug 37361 depends on bug 44719, which changed state. Bug 44719 Summary: extremely slow import of pptx ... https://bugs.freedesktop.org/show_bug.cgi?id=44719 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: [PATCH] fdo#44602 Modeless word count window hides when user clicks into note
Gerrit change: https://gerrit.libreoffice.org/236 Regards, --Muhammad ___ 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 51115, which changed state. Bug 51115 Summary: [FILEOPEN] PDF is not opened in draw, but as text file https://bugs.freedesktop.org/show_bug.cgi?id=51115 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: Bibisect for 3.6
On Sun, 2012-06-24 at 15:12 +0200, Lionel Elie Mamane wrote: Hmm... http://people.canonical.com/~bjoern/bibisect-3.6-20120428.tar.xz requires GNU glibc 2.15, while Debian only has 2.13 :-( It would be better (if possible) to build the builds inside our very old 'generic linux' system / virtual-machine, such that they run everywhere. Of course, that is more work ;-) HTH, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - cui/source
cui/source/dialogs/about.src |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b20a723a6915ba1d8a8ca908bf27182ce577557f
Author: Robinson Tryon qu...@runcibility.com
Date: Thu Jun 21 13:01:34 2012 -0400
fdo#43180: Use hyphen for copyright range in About box
A range of years is more clearly delineated with a hyphen than with a
comma.
Change-Id: I36a668b7e6ccecc210daa69de7948ad5c029f96d
diff --git a/cui/source/dialogs/about.src b/cui/source/dialogs/about.src
index 21fb624..3a38862 100644
--- a/cui/source/dialogs/about.src
+++ b/cui/source/dialogs/about.src
@@ -83,7 +83,7 @@ ModalDialog RID_DEFAULTABOUT
};
String ABOUT_STR_COPYRIGHT
{
-Text[ en-US ] = Copyright © 2000, 2012 LibreOffice contributors
and/or their affiliates;
+Text[ en-US ] = Copyright © 2000 - 2012 LibreOffice contributors
and/or their affiliates;
};
String ABOUT_STR_BASED
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED 3-5-5][REVIEW 3-5-5] Fix fdo#48602: code-page mismatch in Visio 2000 files
On Mon, Jun 25, 2012 at 10:58:49AM +0100, Michael Meeks wrote: On Fri, 2012-06-22 at 17:11 +0200, Petr Mladek wrote: Two more approvals are needed for 3-5-5. You have one from me :-) the diff looks big, but the text/ tool is irrelevant for us, and the charset stuff is mostly code-movement and simplification it seems. One more approval, which means I won the right to push it! Yippie! D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-5-5' - libvisio/libvisio-0.0.17-fdo48601_part1.patch libvisio/libvisio-0.0.17-fdo48601_part2.patch libvisio/libvisio-0.0.17-fdo50988.patch libvisio/libvi
libvisio/libvisio-0.0.17-fdo48601_part1.patch | 26 --
libvisio/libvisio-0.0.17-fdo48601_part2.patch | 64 --
libvisio/libvisio-0.0.17-fdo50988.patch | 27 --
libvisio/libvisio-0.0.17.patch| 35 --
libvisio/makefile.mk | 10
ooo.lst.in|2
6 files changed, 3 insertions(+), 161 deletions(-)
New commits:
commit 4a6b4b93173e5c354f315ff85afa6ffa8ee1774a
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Fri Jun 22 12:08:34 2012 +0200
Uploading libvisio 0.0.18, fixing fdo#48602
Change-Id: I8ab9462409bf5e0769d043209a8e2005bfdf4e0a
Signed-off-by: Petr Mladek pmla...@suse.cz
Signed-off-by: Michael Meeks michael.me...@suse.com
Signed-off-by: David Tardon dtar...@redhat.com
diff --git a/libvisio/libvisio-0.0.17-fdo48601_part1.patch
b/libvisio/libvisio-0.0.17-fdo48601_part1.patch
deleted file mode 100644
index c73af00..000
--- a/libvisio/libvisio-0.0.17-fdo48601_part1.patch
+++ /dev/null
@@ -1,26 +0,0 @@
misc/build/libvisio-0.0.17/src/lib/VSDXContentCollector.cpp
2012-06-16 13:41:40.583153038 +0200
-+++ misc/libvisio-0.0.17/src/lib/VSDXContentCollector.cpp 2012-06-16
13:44:16.311155881 +0200
-@@ -1131,14 +1131,16 @@
- if (x = m_pageWidth x = 0)
- points[x] = y;
-
--xmove = points.begin()-first;
--ymove = points.begin()-second;
--for (std::mapdouble, double::iterator iter = points.begin(); iter !=
points.end(); ++iter)
--{
-- if (iter-first != xmove || iter-second != ymove)
-+if (!points.empty()) {
-+ xmove = points.begin()-first;
-+ ymove = points.begin()-second;
-+ for (std::mapdouble, double::iterator iter = points.begin(); iter !=
points.end(); ++iter)
- {
--xline = iter-first;
--yline = iter-second;
-+if (iter-first != xmove || iter-second != ymove)
-+{
-+ xline = iter-first;
-+ yline = iter-second;
-+}
- }
- }
- }
diff --git a/libvisio/libvisio-0.0.17-fdo48601_part2.patch
b/libvisio/libvisio-0.0.17-fdo48601_part2.patch
deleted file mode 100644
index 5b65d8d..000
--- a/libvisio/libvisio-0.0.17-fdo48601_part2.patch
+++ /dev/null
@@ -1,64 +0,0 @@
misc/libvisio-0.0.17/src/lib/VSDXContentCollector.cpp 2012-06-18
10:18:48.450129329 +0200
-+++ misc/build/libvisio-0.0.17/src/lib/VSDXContentCollector.cpp
2012-06-18 10:18:17.935927778 +0200
-@@ -91,7 +91,8 @@
- else if (m_fillPattern == 1)
- {
- m_fillType = solid;
--m_styleProps.insert(draw:fill-color,
getColourString(m_colours[colourIndexFG]));
-+if (colourIndexFG m_colours.size())
-+ m_styleProps.insert(draw:fill-color,
getColourString(m_colours[colourIndexFG]));
- if (m_fillFGTransparency 0)
- m_styleProps.insert(draw:opacity, (double)(1 -
m_fillFGTransparency/255.0), WPX_PERCENT);
- else
-@@ -101,8 +102,10 @@
- {
- m_fillType = gradient;
- m_styleProps.insert(draw:style, axial);
--m_styleProps.insert(draw:start-color,
getColourString(m_colours[colourIndexFG]));
--m_styleProps.insert(draw:end-color,
getColourString(m_colours[colourIndexBG]));
-+if (colourIndexFG m_colours.size())
-+ m_styleProps.insert(draw:start-color,
getColourString(m_colours[colourIndexFG]));
-+if (colourIndexBG m_colours.size())
-+ m_styleProps.insert(draw:end-color,
getColourString(m_colours[colourIndexBG]));
- m_styleProps.remove(draw:opacity);
- if (m_fillBGTransparency 0)
- m_styleProps.insert(libwpg:start-opacity, (double)(1 -
m_fillBGTransparency/255.0), WPX_PERCENT);
-@@ -123,8 +126,10 @@
- {
- m_fillType = gradient;
- m_styleProps.insert(draw:style, linear);
--m_styleProps.insert(draw:start-color,
getColourString(m_colours[colourIndexBG]));
--m_styleProps.insert(draw:end-color,
getColourString(m_colours[colourIndexFG]));
-+if (colourIndexBG m_colours.size())
-+ m_styleProps.insert(draw:start-color,
getColourString(m_colours[colourIndexBG]));
-+if (colourIndexFG m_colours.size())
-+ m_styleProps.insert(draw:end-color,
getColourString(m_colours[colourIndexFG]));
- m_styleProps.remove(draw:opacity);
- if (m_fillBGTransparency 0)
- m_styleProps.insert(libwpg:start-opacity, (double)(1 -
m_fillBGTransparency/255.0), WPX_PERCENT);
-@@ -170,8 +175,10 @@
- m_styleProps.insert(draw:style, rectangular);
- m_styleProps.insert(svg:cx, 0.5, WPX_PERCENT);
- m_styleProps.insert(svg:cy, 0.5, WPX_PERCENT);
--m_styleProps.insert(draw:start-color,
getColourString(m_colours[colourIndexBG]));
--m_styleProps.insert(draw:end-color,
getColourString(m_colours[colourIndexFG]));
-+if (colourIndexBG m_colours.size())
-+ m_styleProps.insert(draw:start-color,
getColourString(m_colours[colourIndexBG]));
-+if (colourIndexFG m_colours.size())
-+
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - 4 commits - sdext/Extension_minimizer.mk sdext/Extension_pdfimport.mk sdext/Extension_presenter.mk sfx2/Library_qstart.mk solenv/gbuild
sdext/Extension_minimizer.mk |4 ++-- sdext/Extension_pdfimport.mk | 10 -- sdext/Extension_presenter.mk |4 ++-- sfx2/Library_qstart.mk |1 - solenv/gbuild/Extension.mk | 20 solenv/gbuild/TargetLocations.mk |6 +++--- solenv/gbuild/UnoApi.mk |2 +- solenv/gbuild/UnoApiTarget.mk| 24 8 files changed, 60 insertions(+), 11 deletions(-) New commits: commit bd0973a2106cb99b56e20204de85750cc0c8f52e Author: Michael Stahl mst...@redhat.com Date: Mon Jun 25 12:44:43 2012 +0200 Library_qstart.mk: remove -DDLL_NAME The library is not called sfx2 but sfx, and it should really be using gb_Library_get_runtime_filename, but it turns out DLL_NAME is not actually used, so just remove it. Change-Id: I553318015c3c2a21725860b28574995a8319a44b (cherry picked from commit 7fb922b32b3fa612ebc8b7dfbc7e53ed990b40a0) Signed-off-by: Michael Stahl mst...@redhat.com diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk index aa0a549..a1372e5 100644 --- a/sfx2/Library_qstart.mk +++ b/sfx2/Library_qstart.mk @@ -41,7 +41,6 @@ $(eval $(call gb_Library_use_api,qstart_gtk,\ )) $(eval $(call gb_Library_add_defs,qstart_gtk,\ --DDLL_NAME=$(notdir $(call gb_Library_get_target,sfx2)) \ -DENABLE_QUICKSTART_APPLET \ )) commit e930aa48efa5cb7c31585b3e92e5550ed94e80be Author: Michael Stahl mst...@redhat.com Date: Mon Jun 25 12:34:42 2012 +0200 gbuild: add gb_Extension_add_executable This is not really necessary, but consistent. Change-Id: Ic0249efac26c9977ede7ef591d517cc03542b002 (cherry picked from commit efb69f7c737f8f8dae876c8d6b7bf3968a40676d) Signed-off-by: Michael Stahl mst...@redhat.com diff --git a/sdext/Extension_pdfimport.mk b/sdext/Extension_pdfimport.mk index 27841f5..c5692de 100644 --- a/sdext/Extension_pdfimport.mk +++ b/sdext/Extension_pdfimport.mk @@ -37,8 +37,11 @@ $(eval $(call gb_Extension_add_libraries,pdfimport,\ pdfimport \ )) +$(eval $(call gb_Extension_add_executables,pdfimport,\ +xpdfimport \ +)) + $(eval $(call gb_Extension_add_files,pdfimport,,\ -$(call gb_Executable_get_target,xpdfimport) \ $(SRCDIR)/sdext/source/pdfimport/config/pdf_import_filter.xcu \ $(SRCDIR)/sdext/source/pdfimport/config/pdf_types.xcu \ $(SRCDIR)/sdext/source/pdfimport/dialogs/xpdfimport_err.pdf \ diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index a959a8f..86c1366 100644 --- a/solenv/gbuild/Extension.mk +++ b/solenv/gbuild/Extension.mk @@ -166,6 +166,16 @@ define gb_Extension_add_libraries $(foreach lib,$(2),$(call gb_Extension_add_library,$(1),$(lib))) endef +# add an executable from the solver +define gb_Extension_add_executable +$(call gb_Extension_add_file,$(1),$(notdir $(call gb_Executable_get_target,$(2))),\ + $(call gb_Executable_get_target,$(2))) +endef + +define gb_Extension_add_executables +$(foreach exe,$(2),$(call gb_Extension_add_executable,$(1),$(exe))) +endef + # localize .properties file # source file is copied to $(WORKDIR) define gb_Extension_localize_properties commit cf6d37a8f4e45fc29e4b156acb098268048af6f6 Author: Michael Stahl mst...@redhat.com Date: Mon Jun 25 12:27:04 2012 +0200 fdo#51115: fix sdext extensions on Windows: The sdext extensions contain the .lib link stub instead of DLLs; add gb_Extension_add_library to get the correct DLL filename on Windows, and use it in presenter screen, presentation minimizer and PDF import extensions. Change-Id: Ie8113a6002f9038e4df798edc255208977ba9497 (cherry picked from commit f0de66d9a541505e14261ffac08e021bce6b67ba) Signed-off-by: Michael Stahl mst...@redhat.com diff --git a/sdext/Extension_minimizer.mk b/sdext/Extension_minimizer.mk index 400c290..2e4d1ff 100644 --- a/sdext/Extension_minimizer.mk +++ b/sdext/Extension_minimizer.mk @@ -31,8 +31,8 @@ $(eval $(call gb_Extension_Extension,presentation-minimizer,sdext/source/minimiz $(eval $(call gb_Extension_set_platform,presentation-minimizer,$(sdext_PLATFORM))) -$(eval $(call gb_Extension_add_files,presentation-minimizer,,\ -$(call gb_Library_get_target,SunPresentationMinimizer) \ +$(eval $(call gb_Extension_add_libraries,presentation-minimizer,\ +SunPresentationMinimizer \ )) $(eval $(call gb_Extension_add_file,presentation-minimizer,components.rdb,$(call gb_Rdb_get_target,minimizer))) diff --git a/sdext/Extension_pdfimport.mk b/sdext/Extension_pdfimport.mk index 0ecdff1..27841f5 100644 --- a/sdext/Extension_pdfimport.mk +++ b/sdext/Extension_pdfimport.mk @@ -33,9 +33,12 @@ $(eval $(call gb_Extension_set_platform,pdfimport,$(sdext_PLATFORM))) $(eval $(call gb_Extension_add_file,pdfimport,components.rdb,$(call gb_Rdb_get_target,pdfimport))) +$(eval $(call gb_Extension_add_libraries,pdfimport,\ +pdfimport \ +)) + $(eval $(call
[Libreoffice-commits] .: bin/lo-commit-stat
bin/lo-commit-stat |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 418df9282d772d21eebb56f858fd84036d9b691a
Author: Thorsten Behrens tbehr...@suse.com
Date: Sat Jun 23 16:08:10 2012 +0200
Slightly more robust removal of bug title prefix.
Change-Id: Ic37589222831d03ec48689a077b1eb16a9199385
diff --git a/bin/lo-commit-stat b/bin/lo-commit-stat
index d2b6d85..4fb8a10 100755
--- a/bin/lo-commit-stat
+++ b/bin/lo-commit-stat
@@ -312,11 +312,11 @@ sub get_bug_name($$)
my $response = $ua-get($url);
if ($response-is_success) {
my $title = $response-title;
-if ( $title =~ s/^Bug \d+ â // ) {
+if ( $title =~ s/^Bug \d+ \S+ // ) {
print $title\n;
return $title;
} else {
-print warning: not found; using commit message\n;
+print warning: not found; using commit message (only got
$title)\n;
}
} else {
print \n;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in
configure.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit df3c7d6ddf633f8511cbd72a536c58a5006ca31e Author: Petr Mladek pmla...@suse.cz Date: Wed Jun 20 15:26:46 2012 +0200 explicitely check gmodule build flags for gtk3 module g_module_open is used in gtk3gtksys.cxx gmodule dependencies were moved into private requires in rencent gio-2.0.pc. It was because GIO users are not generally expected to use gmodule API, see http://git.gnome.org/browse/glib/commit/?id=1f02ef3205e810dd937f316f5a7b58ecc2893d59 Change-Id: I90e980678eaaa825ae130f54d13f4a5772a2700a diff --git a/configure.in b/configure.in index b10ad8d..e282af3 100644 --- a/configure.in +++ b/configure.in @@ -8799,7 +8799,7 @@ if test x$enable_gtk3 = xyes; then if test $with_system_cairo != yes; then echo System cairo required for gtk3 support, please use --with-system-cairo fi -PKG_CHECK_MODULES(GTK3, gtk+-3.0 = 3.2 gtk+-unix-print-3.0 cairo, ENABLE_GTK3=TRUE, ENABLE_GTK3=) +PKG_CHECK_MODULES(GTK3, gtk+-3.0 = 3.2 gtk+-unix-print-3.0 gmodule-no-export-2.0 cairo, ENABLE_GTK3=TRUE, ENABLE_GTK3=) if test x$ENABLE_GTK3 = xTRUE; then R=gtk3 else ___ 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 48243, which changed state. Bug 48243 Summary: Some extensions not work after install https://bugs.freedesktop.org/show_bug.cgi?id=48243 What|Old Value |New Value Resolution||DUPLICATE 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
[GSoC] testing - Weekly Report no. 5
Hello, This week I have dumped all the EnhancedCustomShape* services and structs from there: http://opengrok.libreoffice.org/xref/core/offapi/com/sun/star/drawing/ resulting in about * 10 services and structs dumped * containing about 50 properties, * having ~850 lines of code Next week's todo is: - improve the Impress' test files, different Shapes and Properties need to be separated - connect EnhancedCustomShape* dumper code with the rest and run it Best regards, Artur ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: binfilter/inc
binfilter/inc/bf_xmloff/XMLChartPropertySetMapper.hxx |2 --
1 file changed, 2 deletions(-)
New commits:
commit 64f9aceb74ca4c36049d89bfbd63b2fa6e71fb6b
Author: David Tardon dtar...@redhat.com
Date: Mon Jun 25 10:37:12 2012 +0200
remove useless extern declaration
This fixes segfault in checkdll libbf_xolo.so during build of
libreoffice 3.6 package for Fedora Rawhide. Do not ask me why...
Change-Id: I367a85ba2a10bc60bcd74ca90c2fd24e86f70967
diff --git a/binfilter/inc/bf_xmloff/XMLChartPropertySetMapper.hxx
b/binfilter/inc/bf_xmloff/XMLChartPropertySetMapper.hxx
index e4c9d27..a1e8932 100644
--- a/binfilter/inc/bf_xmloff/XMLChartPropertySetMapper.hxx
+++ b/binfilter/inc/bf_xmloff/XMLChartPropertySetMapper.hxx
@@ -37,8 +37,6 @@
namespace rtl { class OUString; }
namespace binfilter {
-extern const XMLPropertyMapEntry aXMLChartPropMap[];
-
class SvXMLExport;
//
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - binfilter/inc
binfilter/inc/bf_xmloff/XMLChartPropertySetMapper.hxx |2 --
1 file changed, 2 deletions(-)
New commits:
commit 8dcb94c6fcb2613834a91762aacdb07d4096a537
Author: David Tardon dtar...@redhat.com
Date: Mon Jun 25 10:37:12 2012 +0200
remove useless extern declaration
This fixes segfault in checkdll libbf_xolo.so during build of
libreoffice 3.6 package for Fedora Rawhide. Do not ask me why...
Change-Id: I367a85ba2a10bc60bcd74ca90c2fd24e86f70967
diff --git a/binfilter/inc/bf_xmloff/XMLChartPropertySetMapper.hxx
b/binfilter/inc/bf_xmloff/XMLChartPropertySetMapper.hxx
index e4c9d27..a1e8932 100644
--- a/binfilter/inc/bf_xmloff/XMLChartPropertySetMapper.hxx
+++ b/binfilter/inc/bf_xmloff/XMLChartPropertySetMapper.hxx
@@ -37,8 +37,6 @@
namespace rtl { class OUString; }
namespace binfilter {
-extern const XMLPropertyMapEntry aXMLChartPropMap[];
-
class SvXMLExport;
//
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Is fdo#43460 done and can be closed? Or: status of EasyHacks in Bugzilla is important too
On Fri, 2012-06-22 at 11:12 +0200, Philipp Riemer wrote: status NEW https://bugs.freedesktop.org/show_bug.cgi?id=43460. As far as I understand the comments, it is completed and can either be closed or needs new input: Nice catch; found closed :-) Thanks, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: writerfilter/source
writerfilter/source/dmapper/DomainMapper.cxx | 10 --
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 14 --
writerfilter/source/dmapper/DomainMapper_Impl.hxx |6 --
3 files changed, 30 deletions(-)
New commits:
commit 1b80a679c03af1fe7da716d9dcbe62b994d2276e
Author: Miklos Vajna vmik...@suse.cz
Date: Mon Jun 25 15:07:07 2012 +0200
Revert n#766481 dmapper: don't import fake paragraph containing sectpr
only
This reverts commit eae88a9cb1120aecf2e29628fb22a70a62dc. Need to
find a better fix, this breaks the ooxmltok unit test.
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 9b7ee29..f51ce3f 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -2795,8 +2795,6 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext, SprmType
case NS_ooxml::LN_CT_Style_rPr:
case NS_ooxml::LN_CT_PPr_rPr:
case NS_ooxml::LN_CT_PPrBase_numPr:
-if (nSprmId == NS_ooxml::LN_CT_PPr_sectPr)
-m_pImpl-SetParaSectpr(true);
resolveSprmProps(*this, rSprm);
break;
case NS_ooxml::LN_EG_SectPrContents_footnotePr:
@@ -3398,15 +3396,7 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_,
size_t len)
// RTF always uses text() instead of utext() for run break
if(len == 1 ((*data_) == 0x0d || (*data_) == 0x07)
!IsRTFImport())
-{
-// If the paragraph contains only the section properties and it has
-// no runs, we should not create a paragraph for it in Writer.
-bool bRemove = !m_pImpl-GetParaChanged()
m_pImpl-GetParaSectpr();
-m_pImpl-SetParaSectpr(false);
m_pImpl-finishParagraph(m_pImpl-GetTopContextOfType(CONTEXT_PARAGRAPH));
-if (bRemove)
-m_pImpl-RemoveLastParagraph();
-}
else
{
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index fb4dbcc..8e6d2c6 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -207,7 +207,6 @@ DomainMapper_Impl::DomainMapper_Impl(
m_bIsParaChange( false ),
m_bParaChanged( false ),
m_bIsLastParaInSection( false ),
-m_bParaSectpr( false ),
m_bUsingEnhancedFields( false )
{
appendTableManager( );
@@ -308,20 +307,7 @@ void DomainMapper_Impl::SetIsLastParagraphInSection( bool
bIsLast )
m_bIsLastParaInSection = bIsLast;
}
-void DomainMapper_Impl::SetParaSectpr(bool bParaSectpr)
-{
-m_bParaSectpr = bParaSectpr;
-}
-bool DomainMapper_Impl::GetParaSectpr()
-{
-return m_bParaSectpr;
-}
-
-bool DomainMapper_Impl::GetParaChanged()
-{
-return m_bParaChanged;
-}
voidDomainMapper_Impl::PushProperties(ContextType eId)
{
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 55c8e6e..77a2b62 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -349,11 +349,8 @@ private:
RedlineParamsPtrm_pParaRedline;
boolm_bIsParaChange;
-/// If the current paragraph has any runs.
boolm_bParaChanged;
boolm_bIsLastParaInSection;
-/// If the current paragraph contains section property definitions.
-boolm_bParaSectpr;
boolm_bUsingEnhancedFields;
//annotation import
@@ -409,9 +406,6 @@ public:
void RemoveLastParagraph( );
void SetIsLastParagraphInSection( bool bIsLast );
-void SetParaSectpr(bool bParaSectpr);
-bool GetParaSectpr();
-bool GetParaChanged();
void deferBreak( BreakType deferredBreakType );
bool isBreakDeferred( BreakType deferredBreakType );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
testing: activate components ...
Hi Artur, On Mon, 2012-06-25 at 14:47 +0200, Artur Dorda wrote: This week I have dumped all the EnhancedCustomShape* services and structs from there: Nice :-) Next week's todo is: - improve the Impress' test files, different Shapes and Properties need to be separated - connect EnhancedCustomShape* dumper code with the rest and run it Incidentally; we seem to be -very- regularly getting build and distribution errors that ruin our user experience in the betas at least due to missing components / poor registration etc. I was wondering if it wouldn't be rather an excessively useful test to have a small app as part of the smoketest (or elsewhere) that systematically activates every registered service (perhaps by parsing services.rdb or querying UNO ?). I guess we used to have that happening during registration - but now we have passive registration I suspect that we're letting a lot of issues here pass us by. At least my recollection was that that registration was a rats nest of issues ;-) Or do we have something like this already ? Stephan ? Thanks, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sysui/desktop
sysui/desktop/menus/base.desktop|4 ++-- sysui/desktop/menus/calc.desktop|4 ++-- sysui/desktop/menus/draw.desktop|4 ++-- sysui/desktop/menus/impress.desktop |4 ++-- sysui/desktop/menus/math.desktop|4 ++-- sysui/desktop/menus/writer.desktop |4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) New commits: commit 2b2e7aa7dfb3b41a2f0068a058bf7567465b87d2 Author: David Tardon dtar...@redhat.com Date: Mon Jun 25 15:14:43 2012 +0200 fix invalid .desktop files desktop-file-validate issued the following error: error: file contains group New Shortcut Group, but groups extending the format should start with X- Change-Id: I45c0039ab788546a37780927284c8827a19fd52c diff --git a/sysui/desktop/menus/base.desktop b/sysui/desktop/menus/base.desktop index 8cc8e7c..72cf467 100755 --- a/sysui/desktop/menus/base.desktop +++ b/sysui/desktop/menus/base.desktop @@ -10,8 +10,8 @@ Name=%PRODUCTNAME Base GenericName=Database Development Comment=Manage databases, create queries and reports to track and manage your information by using Base. InitialPreference=5 -X-Ayatana-Desktop-Shortcuts=New -[New Shortcut Group] +X-Ayatana-Desktop-Shortcuts=X-New +[X-New Shortcut Group] UnityQuicklist=New Database Exec=libreoffice --base %U TargetEnvironment=Unity diff --git a/sysui/desktop/menus/calc.desktop b/sysui/desktop/menus/calc.desktop index b1bde07..e9f3250 100755 --- a/sysui/desktop/menus/calc.desktop +++ b/sysui/desktop/menus/calc.desktop @@ -10,8 +10,8 @@ Name=%PRODUCTNAME Calc GenericName=Spreadsheet Comment=Perform calculations, analyze information and manage lists in spreadsheets by using Calc. InitialPreference=5 -X-Ayatana-Desktop-Shortcuts=New -[New Shortcut Group] +X-Ayatana-Desktop-Shortcuts=X-New +[X-New Shortcut Group] UnityQuicklist=New Spreadsheet Exec=libreoffice --calc %U TargetEnvironment=Unity diff --git a/sysui/desktop/menus/draw.desktop b/sysui/desktop/menus/draw.desktop index 0bec2b0..5c741a9 100755 --- a/sysui/desktop/menus/draw.desktop +++ b/sysui/desktop/menus/draw.desktop @@ -10,8 +10,8 @@ Name=%PRODUCTNAME Draw GenericName=Drawing Program Comment=Create and edit drawings, flow charts, and logos by using Draw. InitialPreference=5 -X-Ayatana-Desktop-Shortcuts=New -[New Shortcut Group] +X-Ayatana-Desktop-Shortcuts=X-New +[X-New Shortcut Group] UnityQuicklist=New Drawing Exec=libreoffice --draw %U TargetEnvironment=Unity diff --git a/sysui/desktop/menus/impress.desktop b/sysui/desktop/menus/impress.desktop index 0df250c..2fb8650 100755 --- a/sysui/desktop/menus/impress.desktop +++ b/sysui/desktop/menus/impress.desktop @@ -10,8 +10,8 @@ Name=%PRODUCTNAME Impress GenericName=Presentation Comment=Create and edit presentations for slideshows, meeting and Web pages by using Impress. InitialPreference=5 -X-Ayatana-Desktop-Shortcuts=New -[New Shortcut Group] +X-Ayatana-Desktop-Shortcuts=X-New +[X-New Shortcut Group] UnityQuicklist=New Presentation Exec=libreoffice --impress %U TargetEnvironment=Unity diff --git a/sysui/desktop/menus/math.desktop b/sysui/desktop/menus/math.desktop index 67f9ea6..122e01f 100755 --- a/sysui/desktop/menus/math.desktop +++ b/sysui/desktop/menus/math.desktop @@ -11,8 +11,8 @@ Name=%PRODUCTNAME Math GenericName=Formula Editor Comment=Create and edit scientific formulas and equations by using Math. InitialPreference=5 -X-Ayatana-Desktop-Shortcuts=New -[New Shortcut Group] +X-Ayatana-Desktop-Shortcuts=X-New +[X-New Shortcut Group] UnityQuicklist=New Formula Exec=libreoffice --math %U TargetEnvironment=Unity diff --git a/sysui/desktop/menus/writer.desktop b/sysui/desktop/menus/writer.desktop index 6d2274e..888b382 100755 --- a/sysui/desktop/menus/writer.desktop +++ b/sysui/desktop/menus/writer.desktop @@ -10,8 +10,8 @@ Name=%PRODUCTNAME Writer GenericName=Word Processor Comment=Create and edit text and graphics in letters, reports, documents and Web pages by using Writer. InitialPreference=5 -X-Ayatana-Desktop-Shortcuts=New -[New Shortcut Group] +X-Ayatana-Desktop-Shortcuts=X-New +[X-New Shortcut Group] UnityQuicklist=New Document Exec=libreoffice --writer %U TargetEnvironment=Unity ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sysui/desktop
sysui/desktop/menus/base.desktop|4 ++-- sysui/desktop/menus/calc.desktop|4 ++-- sysui/desktop/menus/draw.desktop|4 ++-- sysui/desktop/menus/impress.desktop |4 ++-- sysui/desktop/menus/math.desktop|4 ++-- sysui/desktop/menus/writer.desktop |4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) New commits: commit 3589f3dab091eaa9654b8466a7ca2d32d5110da2 Author: David Tardon dtar...@redhat.com Date: Mon Jun 25 15:14:43 2012 +0200 fix invalid .desktop files desktop-file-validate issued the following error: error: file contains group New Shortcut Group, but groups extending the format should start with X- Change-Id: I45c0039ab788546a37780927284c8827a19fd52c diff --git a/sysui/desktop/menus/base.desktop b/sysui/desktop/menus/base.desktop index 8cc8e7c..72cf467 100755 --- a/sysui/desktop/menus/base.desktop +++ b/sysui/desktop/menus/base.desktop @@ -10,8 +10,8 @@ Name=%PRODUCTNAME Base GenericName=Database Development Comment=Manage databases, create queries and reports to track and manage your information by using Base. InitialPreference=5 -X-Ayatana-Desktop-Shortcuts=New -[New Shortcut Group] +X-Ayatana-Desktop-Shortcuts=X-New +[X-New Shortcut Group] UnityQuicklist=New Database Exec=libreoffice --base %U TargetEnvironment=Unity diff --git a/sysui/desktop/menus/calc.desktop b/sysui/desktop/menus/calc.desktop index b1bde07..e9f3250 100755 --- a/sysui/desktop/menus/calc.desktop +++ b/sysui/desktop/menus/calc.desktop @@ -10,8 +10,8 @@ Name=%PRODUCTNAME Calc GenericName=Spreadsheet Comment=Perform calculations, analyze information and manage lists in spreadsheets by using Calc. InitialPreference=5 -X-Ayatana-Desktop-Shortcuts=New -[New Shortcut Group] +X-Ayatana-Desktop-Shortcuts=X-New +[X-New Shortcut Group] UnityQuicklist=New Spreadsheet Exec=libreoffice --calc %U TargetEnvironment=Unity diff --git a/sysui/desktop/menus/draw.desktop b/sysui/desktop/menus/draw.desktop index 0bec2b0..5c741a9 100755 --- a/sysui/desktop/menus/draw.desktop +++ b/sysui/desktop/menus/draw.desktop @@ -10,8 +10,8 @@ Name=%PRODUCTNAME Draw GenericName=Drawing Program Comment=Create and edit drawings, flow charts, and logos by using Draw. InitialPreference=5 -X-Ayatana-Desktop-Shortcuts=New -[New Shortcut Group] +X-Ayatana-Desktop-Shortcuts=X-New +[X-New Shortcut Group] UnityQuicklist=New Drawing Exec=libreoffice --draw %U TargetEnvironment=Unity diff --git a/sysui/desktop/menus/impress.desktop b/sysui/desktop/menus/impress.desktop index 0df250c..2fb8650 100755 --- a/sysui/desktop/menus/impress.desktop +++ b/sysui/desktop/menus/impress.desktop @@ -10,8 +10,8 @@ Name=%PRODUCTNAME Impress GenericName=Presentation Comment=Create and edit presentations for slideshows, meeting and Web pages by using Impress. InitialPreference=5 -X-Ayatana-Desktop-Shortcuts=New -[New Shortcut Group] +X-Ayatana-Desktop-Shortcuts=X-New +[X-New Shortcut Group] UnityQuicklist=New Presentation Exec=libreoffice --impress %U TargetEnvironment=Unity diff --git a/sysui/desktop/menus/math.desktop b/sysui/desktop/menus/math.desktop index 67f9ea6..122e01f 100755 --- a/sysui/desktop/menus/math.desktop +++ b/sysui/desktop/menus/math.desktop @@ -11,8 +11,8 @@ Name=%PRODUCTNAME Math GenericName=Formula Editor Comment=Create and edit scientific formulas and equations by using Math. InitialPreference=5 -X-Ayatana-Desktop-Shortcuts=New -[New Shortcut Group] +X-Ayatana-Desktop-Shortcuts=X-New +[X-New Shortcut Group] UnityQuicklist=New Formula Exec=libreoffice --math %U TargetEnvironment=Unity diff --git a/sysui/desktop/menus/writer.desktop b/sysui/desktop/menus/writer.desktop index 6d2274e..888b382 100755 --- a/sysui/desktop/menus/writer.desktop +++ b/sysui/desktop/menus/writer.desktop @@ -10,8 +10,8 @@ Name=%PRODUCTNAME Writer GenericName=Word Processor Comment=Create and edit text and graphics in letters, reports, documents and Web pages by using Writer. InitialPreference=5 -X-Ayatana-Desktop-Shortcuts=New -[New Shortcut Group] +X-Ayatana-Desktop-Shortcuts=X-New +[X-New Shortcut Group] UnityQuicklist=New Document Exec=libreoffice --writer %U TargetEnvironment=Unity ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/inc
binfilter/inc/bf_svtools/svarray.hxx |9 -
1 file changed, 9 deletions(-)
New commits:
commit 0a7904266b9e0281252d4afbca1d25f7df021362
Author: Caolán McNamara caol...@redhat.com
Date: Sun Jun 24 00:21:56 2012 +0100
callcatcher: remove unused _ForEach group
Change-Id: I0a5da38bd9ace5bb054c975b5966711f2d9f9d36
diff --git a/binfilter/inc/bf_svtools/svarray.hxx
b/binfilter/inc/bf_svtools/svarray.hxx
index f5eb78b..420c7e6 100644
--- a/binfilter/inc/bf_svtools/svarray.hxx
+++ b/binfilter/inc/bf_svtools/svarray.hxx
@@ -822,15 +822,6 @@ _SORT_CLASS_DEF(nm, AE, IS, GS, vis) \
return nm##_SAR::GetObject( nP );\
}\
BOOL Seek_Entry( const AE aE, USHORT* pP = 0 ) const;\
-void ForEach( CONCAT( FnForEach_, nm ) fnForEach, void* pArgs = 0 )\
-{\
-_ForEach( 0, nA, (FnForEach_##nm##_SAR)fnForEach, pArgs );\
-}\
-void ForEach( USHORT nS, USHORT nE, \
-CONCAT( FnForEach_, nm ) fnForEach, void* pArgs = 0 )\
-{\
-_ForEach( nS, nE, (FnForEach_##nm##_SAR)fnForEach, pArgs );\
-}\
private:\
nm( const nm );\
nm operator=( const nm );\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: android/experimental
android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
| 15
android/experimental/LibreOffice4Android/AndroidManifest.xml
|4
android/experimental/LibreOffice4Android/Makefile
|2
android/experimental/LibreOffice4Android/fonts.conf
|2
android/experimental/LibreOffice4Android/res/values/styles.xml
| 12
android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java
| 596 ++
android/experimental/LibreOffice4Android/src/org/libreoffice/android/examples/DocumentLoader.java
| 596 --
android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java
|2
8 files changed, 613 insertions(+), 616 deletions(-)
New commits:
commit 478465f21696230133bbf6c986f236d210504c5a
Author: Iain Billett iainbill...@gmail.com
Date: Mon Jun 25 14:25:00 2012 +0100
Fixed some erroneous package references.
diff --git
a/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
b/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
index ec3855f..daf42d9 100644
---
a/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
+++
b/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
@@ -622,21 +622,6 @@ public class DocumentLoader
{
return gestureDetector.onTouchEvent(event);
}
-
-@Override
- public boolean onOptionsItemSelected(MenuItem item) {
- switch (item.getItemId()) {
- case android.R.id.home:
- // app icon in action bar clicked; go home
- Intent intent = new Intent(this,
LibreOfficeUIActivity.class);
- intent.putExtras( extras );
- //intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
- startActivity(intent);
- return true;
- default:
- return super.onOptionsItemSelected(item);
- }
- }
}
// vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/android/experimental/LibreOffice4Android/AndroidManifest.xml
b/android/experimental/LibreOffice4Android/AndroidManifest.xml
index f521536..fcf6210 100644
--- a/android/experimental/LibreOffice4Android/AndroidManifest.xml
+++ b/android/experimental/LibreOffice4Android/AndroidManifest.xml
@@ -14,8 +14,8 @@
android:theme=@android:style/Theme.Holo.Light
!-- Original Document Loader activity - file Viewer --
-activity android:name=.android.examples.DocumentLoader
- android:label=LO DocumentLoader
+activity android:name=.android.DocumentLoader
+ android:label=DocumentLoader
android:configChanges=orientation|keyboardHidden
!-- intent-filter
action android:name=android.intent.action.MAIN /
diff --git a/android/experimental/LibreOffice4Android/Makefile
b/android/experimental/LibreOffice4Android/Makefile
index 9423336..d2c5f8e 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/android/experimental/LibreOffice4Android/Makefile
@@ -1,7 +1,7 @@
include ../../../config_host.mk
# The package of this app
-APP_PACKAGE=org.libreoffice.android.examples
+APP_PACKAGE=org.libreoffice
# We can't keep assuming APP_DATA_PATH like this, surely this can vary with
# Android versions and whatnot, this is temporary and works at least with the
diff --git a/android/experimental/LibreOffice4Android/fonts.conf
b/android/experimental/LibreOffice4Android/fonts.conf
index 699e9d1..263648a 100644
--- a/android/experimental/LibreOffice4Android/fonts.conf
+++ b/android/experimental/LibreOffice4Android/fonts.conf
@@ -74,7 +74,7 @@
later to patch in proper code in fontonfig on Android to
find out a good place.
--
-
cachedir/data/data/org.libreoffice.android.examples/fontconfig/cachedir
+ cachedir/data/data/org.libreoffice/fontconfig/cachedir
config
!--
diff --git a/android/experimental/LibreOffice4Android/res/values/styles.xml
b/android/experimental/LibreOffice4Android/res/values/styles.xml
new file mode 100644
index 000..5e74240
--- /dev/null
+++ b/android/experimental/LibreOffice4Android/res/values/styles.xml
@@ -0,0 +1,12 @@
+?xml version=1.0 encoding=utf-8?
+resources xmlns:android=http://schemas.android.com/apk/res/android;
+style name=DocumentViewer parent=@android:style/Theme.Holo
+item name=android:windowActionBarOverlaytrue/item
+ item name=android:windowActionModeOverlaytrue/item
+ item
name=android:actionBarStyle@style/TransparentDarkActionBar/item
+
where are extras/source/templates/wizard/bitmap used ?
Does anyone know where (if anywhere) the graphic in extras/source/templates/wizard/bitmap e.g. extras/source/templates/wizard/bitmap/taiwan.gif extras/source/templates/wizard/bitmap/germany.wmf get used ? C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 3 commits - filter/inc
filter/inc/filter/msfilter/msdffimp.hxx | 595 +++-
1 file changed, 295 insertions(+), 300 deletions(-)
New commits:
commit f3e7d82e7c20f8d78b418ecc92d2e22c0a3fb0dc
Author: Philipp Riemer ruderphil...@gmail.com
Date: Sat Jun 23 20:21:09 2012 +0200
cleanup filter/.../msdffimp.hxx
- deleted empty lines
- re-indented code
- added/deleted spaces in parameter lists
- wrapped parameter lists if too long
diff --git a/filter/inc/filter/msfilter/msdffimp.hxx
b/filter/inc/filter/msfilter/msdffimp.hxx
index 2116c85..ebfc993 100644
--- a/filter/inc/filter/msfilter/msdffimp.hxx
+++ b/filter/inc/filter/msfilter/msdffimp.hxx
@@ -55,7 +55,6 @@ class PolyPolygon;
class FmFormModel;
class SdrModel;
class DffRecordHeader;
-
class SwFlyFrmFmt;
struct SvxMSDffBLIPInfo;
@@ -64,7 +63,6 @@ struct SvxMSDffShapeOrder;
class MSFILTER_DLLPUBLIC DffRecordHeader
{
-
public:
sal_uInt8 nRecVer; // may be DFF_PSFLAG_CONTAINER
sal_uInt16 nRecInstance;
@@ -72,11 +70,13 @@ public:
sal_uInt16 nRecType;
sal_uInt32 nRecLen;
sal_uLong nFilePos;
-public:
-DffRecordHeader() : nRecVer(0), nRecInstance(0), nImpVerInst(0),
nRecType(0), nRecLen(0), nFilePos(0) {}
+
+DffRecordHeader() : nRecVer(0), nRecInstance(0), nImpVerInst(0),
+nRecType(0), nRecLen(0), nFilePos(0) {}
boolIsContainer() const { return nRecVer == DFF_PSFLAG_CONTAINER; }
sal_uLong GetRecBegFilePos() const { return nFilePos; }
-sal_uLong GetRecEndFilePos() const { return nFilePos +
DFF_COMMON_RECORD_HEADER_SIZE + nRecLen; }
+sal_uLong GetRecEndFilePos() const
+{ return nFilePos + DFF_COMMON_RECORD_HEADER_SIZE + nRecLen; }
bool SeekToEndOfRecord(SvStream rIn) const
{
sal_Size nPos = nFilePos + DFF_COMMON_RECORD_HEADER_SIZE + nRecLen;
@@ -93,7 +93,6 @@ public:
}
MSFILTER_DLLPUBLIC friend SvStream operator(SvStream rIn,
DffRecordHeader rRec);
-
};
struct DffPropFlags
@@ -113,22 +112,21 @@ private:
DffPropFlags rFlags, sal_uInt32 nRecordType) const;
protected:
-
-typedef std::mapsal_uInt32, sal_uInt32 RecordTypesMap;
+typedef std::mapsal_uInt32, sal_uInt32 RecordTypesMap;
RecordTypesMap maRecordTypes;
sal_uInt32 mpContents[ 1024 ];
DffPropFlagsmpFlags[ 1024 ];
public:
-
DffPropSet( sal_Bool bInitialize = sal_False )
{
if ( bInitialize )
memset( mpFlags, 0, 0x400 * sizeof( DffPropFlags ) );
};
-inline sal_Bool IsProperty( sal_uInt32 nRecType ) const { return (
mpFlags[ nRecType 0x3ff ].bSet ); };
+inline sal_Bool IsProperty( sal_uInt32 nRecType ) const
+{ return ( mpFlags[ nRecType 0x3ff ].bSet ); };
sal_BoolIsHardAttribute( sal_uInt32 nId ) const;
sal_uInt32 GetPropertyValue( sal_uInt32 nId, sal_uInt32 nDefault = 0
) const;
/** Returns a boolean property by its real identifier. */
@@ -150,43 +148,40 @@ class MSFILTER_DLLPUBLIC DffPropertyReader : public
DffPropSet
const SvxMSDffManager rManager;
DffPropSet* pDefaultPropSet;
-voidApplyCustomShapeTextAttributes( SfxItemSet rSet ) const;
-voidApplyCustomShapeAdjustmentAttributes( SfxItemSet rSet ) const;
-voidApplyCustomShapeGeometryAttributes( SvStream rIn, SfxItemSet
rSet, const DffObjData rObjData ) const;
-voidApplyLineAttributes( SfxItemSet rSet, const MSO_SPT
eShapeType ) const; // #i28269#
-voidApplyFillAttributes( SvStream rIn, SfxItemSet rSet, const
DffObjData rObjData ) const;
+void ApplyCustomShapeTextAttributes( SfxItemSet rSet ) const;
+void ApplyCustomShapeAdjustmentAttributes( SfxItemSet rSet ) const;
+void ApplyCustomShapeGeometryAttributes( SvStream rIn,
+ SfxItemSet rSet,
+ const DffObjData rObjData )
const;
+void ApplyLineAttributes( SfxItemSet rSet, const MSO_SPT eShapeType )
const; // #i28269#
+void ApplyFillAttributes( SvStream rIn, SfxItemSet rSet, const
DffObjData rObjData ) const;
public:
-
-sal_Int32 mnFix16Angle;
-
+sal_Int32 mnFix16Angle;
DffPropertyReader( const SvxMSDffManager rManager );
~DffPropertyReader();
-sal_Int32 Fix16ToAngle( sal_Int32 nAngle ) const;
+sal_Int32 Fix16ToAngle( sal_Int32 nAngle ) const;
#ifdef DBG_CUSTOMSHAPE
-voidReadPropSet( SvStream rIn, void* pClientData, sal_uInt32
nShapeType = 0 ) const;
+void ReadPropSet( SvStream rIn, void* pClientData, sal_uInt32 nShapeType
= 0 ) const;
#else
-voidReadPropSet( SvStream rIn, void* pClientData ) const;
+void ReadPropSet( SvStream rIn, void* pClientData ) const;
#endif
-voidSetDefaultPropSet( SvStream rIn, sal_uInt32 nOffDgg ) const;
-voidApplyAttributes( SvStream rIn, SfxItemSet rSet )
Re: [PATCH] fdo#39468: translate German comments (= filter/inc/filter/msfilter/msdffimp.hxx) plus questions
Hi there, On Sat, 2012-06-23 at 20:45 +0200, Philipp Riemer wrote: (1) Since it was addressed on the mailing list today (see http://lists.freedesktop.org/archives/libreoffice/2012-June/034038.html) I spent some time on filter/inc/filter/msfilter/msdffimp.hxx. Thanks for this set; (2) In addition, I was wondering if it would be possible to shorten parameters (e.g. com::sun::star::uno::Reference com::sun::star::embed::XStorage xDestStg) by using aliases or other ways to point to that namespaces. But I am not skilled enough in C++ to do that (see e.g. patch 0003 for examples). The great hope is LibreOffice 4 - which will discard the com::sun::star prefix and/or do something sensible instead here, making our APIs much easier to read. There was also hope for a transitional set of namespace aliases, but I forget why that was shot down, in the meantime we have that ugly, tangled madness (sadly) :-) (3) Moreover, the forward declarations and #define blocks are widely spread over the whole file. Can I rearrange these so that they are all bundled at the top of this file? In my eyes this would make it more readable plus provide all needed classes and definitions on one or two screen pages. Sounds good to me; as long as it's not some scripted thing across the whole code-base (yet) ;-) Thanks ! Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW 3.5.5 (2/3)] Re: [PATCH] fix proposed for fdo#49178
On Thu, 2012-06-21 at 15:13 -0700, julien2412 wrote: Sorry for having forgotten review tag :-( http://cgit.freedesktop.org/libreoffice/core/commit/?id=7588fa7a534a217e3949013b7c373fbb5503d466g=libreoffice-3-5 We might have missed the boat on this, but sure, +1 from me, and with the assumption that Miklos's push to 3-5 is an implicit +1 for 3-5-5, one more +1 is required for inclusion in 3-5-5. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - pyuno/zipcore
pyuno/zipcore/python.sh |9 +
1 file changed, 5 insertions(+), 4 deletions(-)
New commits:
commit cf5ac1ad17bd8d2e9c8b585254302ecc053a9547
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Jun 22 11:57:12 2012 +0200
fdo#50682: Setting DYLD_LIBRARY_PATH in python script appears unnecessary
...and apparently has negative consequences (system CFNetwork framework
picking
up LO libsqlite3.dylib instead of system one, as DYLD_LIBRARY_PATH overrides
recorded installnames).
Contrary to the old comment (so that 'import pyuno' finds libpyuno.so),
what
setting LD_LIBRARY_PATH on Linux is still necessary for is so that
python.bin
(a stripped version of the python executable from external python module)
finds
libpython2.6.so, as it lacks an RPATH. ('import pyuno' finds pyuno.so
apparently on PYTHONPATH, anyway, and pyuno.so in turn dlopen's
libpython.{dylib,so} with full path.)
(This might make dc82cf021f76ea83ff7a4bcb2d7525f2e111f0cc Make PyUNO work
--with-macox-version-min-required=10.6 irrelevant.)
Change-Id: I1c3a6c61d4cc976d85956e587497a13a77689128
(cherry picked from commit a164d246f2ed941fbdef19ec5b47dac1bab25509)
Signed-off-by: Caolán McNamara caol...@redhat.com
diff --git a/pyuno/zipcore/python.sh b/pyuno/zipcore/python.sh
index 22edea8..6626e3e 100644
--- a/pyuno/zipcore/python.sh
+++ b/pyuno/zipcore/python.sh
@@ -43,10 +43,6 @@ cd $sd_cwd
PATH=$sd_prog${PATH+:$PATH}
export PATH
-# Set %%OOO_LIBRARY_PATH_VAR%% so that import pyuno finds libpyuno.so:
-%%OOO_LIBRARY_PATH_VAR%%=$sd_prog:$sd_prog/../ure-link/lib${%%OOO_LIBRARY_PATH_VAR%%:+:$%%OOO_LIBRARY_PATH_VAR%%}
-export %%OOO_LIBRARY_PATH_VAR%%
-
# Set UNO_PATH so that officehelper.bootstrap() can find soffice executable:
: ${UNO_PATH=$sd_prog}
export UNO_PATH
@@ -57,6 +53,11 @@ export UNO_PATH
export URE_BOOTSTRAP
NONMACSECTION
+# Set %%OOO_LIBRARY_PATH_VAR%% so that python.bin finds libpython2.6.so (this
+# can go once python.bin contains a proper RPATH):
+%%OOO_LIBRARY_PATH_VAR%%=$sd_prog${%%OOO_LIBRARY_PATH_VAR%%:+:$%%OOO_LIBRARY_PATH_VAR%%}
+export %%OOO_LIBRARY_PATH_VAR%%
+
PYTHONPATH=$sd_prog:$sd_prog/python-core-%%PYVERSION%%/lib:$sd_prog/python-core-%%PYVERSION%%/lib/lib-dynload:$sd_prog/python-core-%%PYVERSION%%/lib/lib-tk:$sd_prog/python-core-%%PYVERSION%%/lib/site-packages${PYTHONPATH+:$PYTHONPATH}
export PYTHONPATH
PYTHONHOME=$sd_prog/python-core-%%PYVERSION%%
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PATCH] fdo#39468: translate German comments (= filter/inc/filter/msfilter/msdffimp.hxx) plus questions
On 2012-06-25 15:32, Michael Meeks wrote:
On Sat, 2012-06-23 at 20:45 +0200, Philipp Riemer wrote:
(2) In addition, I was wondering if it would be possible to shorten
parameters (e.g. com::sun::star::uno::Reference
com::sun::star::embed::XStorage xDestStg) by using aliases or
other ways to point to that namespaces. But I am not skilled enough in
C++ to do that (see e.g. patch 0003 for examples).
The great hope is LibreOffice 4 - which will discard the com::sun::star
prefix and/or do something sensible instead here, making our APIs much
easier to read.
There was also hope for a transitional set of namespace aliases, but I
forget why that was shot down, in the meantime we have that ugly,
tangled madness (sadly) :-)
Perhaps we could adopt a transitional scheme, where we move our types
and definitions to a new namespace, but leave aliases in the current
namespace?
i.e. in pseudo-code:
namespace shiny
{
class Reference . yada yada.
}
namespace com.sun.star.uno
{
typedef ::shiny::Reference Reference;
}
Does that sound reasonable (have no real idea, given my lack of C++
experience).
Disclaimer: http://www.peralex.com/disclaimer.html
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED 3-5][REVIEW-3-5-5 (1/3)] Using system libsqlite3.dylib on Mac OS X? (fdo#50682)
On Fri, 2012-06-22 at 12:27 +0200, Stephan Bergmann wrote: On closer inspection, the real problem appears to be an unnecessary setting of DYLD_LIBRARY_PATH in LO's python wrapper script. http://cgit.freedesktop.org/libreoffice/core/commit/?id=a164d246f2ed941fbdef19ec5b47dac1bab25509 fdo#50682: Setting DYLD_LIBRARY_PATH in python script appears unnecessary fixes that now. In any case, please review and consider for backport to libreoffice-3-5 and libreoffice-3-5-5. I consider the patch relatively low risk, as all it affects is scenarios where clients call LO's python script. Well, pushed to 3-5 anyway. +1 from me if there are some mac people willing to sign off on further acks for 3-5-5 C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: where are extras/source/templates/wizard/bitmap used ?
Hi, 2012/6/25 Caolán McNamara caol...@redhat.com: Does anyone know where (if anywhere) the graphic in extras/source/templates/wizard/bitmap e.g. extras/source/templates/wizard/bitmap/taiwan.gif extras/source/templates/wizard/bitmap/germany.wmf usa.gif is used: http://opengrok.libreoffice.org/xref/core/wizards/source/schedule/schedule.src#194 BTW this Calendar macro looks broken to me. Other country bitmaps are unused, as far as I can tell. Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: oox/inc oox/source
oox/inc/oox/ppt/pptshapegroupcontext.hxx |1
oox/source/drawingml/diagram/diagram.cxx | 66 ---
oox/source/ppt/pptshapegroupcontext.cxx | 14 --
3 files changed, 46 insertions(+), 35 deletions(-)
New commits:
commit 11c5699dad06fb0d7fc0e458550a1dac82f8ee5f
Author: Muthu Subramanian sumu...@suse.com
Date: Mon Jun 25 19:25:52 2012 +0530
n#759210: Certain smartart drawings weren't imported.
SmartArt info was reset, when there was a chart (e.g.)
in the same slide.
diff --git a/oox/inc/oox/ppt/pptshapegroupcontext.hxx
b/oox/inc/oox/ppt/pptshapegroupcontext.hxx
index 7e2a6d3..841e741 100644
--- a/oox/inc/oox/ppt/pptshapegroupcontext.hxx
+++ b/oox/inc/oox/ppt/pptshapegroupcontext.hxx
@@ -39,6 +39,7 @@ class PPTShapeGroupContext : public
::oox::drawingml::ShapeGroupContext
SlidePersistPtr mpSlidePersistPtr;
ShapeLocation meShapeLocation;
oox::drawingml::ShapePtrpGraphicShape;
+voidimportExtDrawings();
public:
PPTShapeGroupContext(
diff --git a/oox/source/drawingml/diagram/diagram.cxx
b/oox/source/drawingml/diagram/diagram.cxx
index 8e6586d..002e20a 100644
--- a/oox/source/drawingml/diagram/diagram.cxx
+++ b/oox/source/drawingml/diagram/diagram.cxx
@@ -395,40 +395,44 @@ void loadDiagram( ShapePtr pShape,
pShape-addExtDrawingRelId( *aIt );
}
-// layout
-if( !rLayoutPath.isEmpty() )
+// extLst is present, lets bet on that and ignore the rest of the data
from here
+if( !pData-getExtDrawings().size() )
{
-rtl::Reference core::FragmentHandler xRef(
-new DiagramLayoutFragmentHandler( rFilter, rLayoutPath, pLayout ));
-importFragment(rFilter,
- loadFragment(rFilter,xRef),
- DiagramLayout,
- pShape,
- xRef);
-}
+// layout
+if( !rLayoutPath.isEmpty() )
+{
+rtl::Reference core::FragmentHandler xRef(
+new DiagramLayoutFragmentHandler( rFilter, rLayoutPath,
pLayout ));
+importFragment(rFilter,
+loadFragment(rFilter,xRef),
+DiagramLayout,
+pShape,
+xRef);
+}
-// style
-if( !rQStylePath.isEmpty() )
-{
-rtl::Reference core::FragmentHandler xRef(
-new DiagramQStylesFragmentHandler( rFilter, rQStylePath,
pDiagram-getStyles() ));
-importFragment(rFilter,
- loadFragment(rFilter,xRef),
- DiagramQStyle,
- pShape,
- xRef);
-}
+// style
+if( !rQStylePath.isEmpty() )
+{
+rtl::Reference core::FragmentHandler xRef(
+new DiagramQStylesFragmentHandler( rFilter, rQStylePath,
pDiagram-getStyles() ));
+importFragment(rFilter,
+loadFragment(rFilter,xRef),
+DiagramQStyle,
+pShape,
+xRef);
+}
-// colors
-if( !rColorStylePath.isEmpty() )
-{
-rtl::Reference core::FragmentHandler xRef(
-new ColorFragmentHandler( rFilter, rColorStylePath,
pDiagram-getColors() ));
-importFragment(rFilter,
- loadFragment(rFilter,xRef),
- DiagramColorStyle,
- pShape,
- xRef);
+// colors
+if( !rColorStylePath.isEmpty() )
+{
+rtl::Reference core::FragmentHandler xRef(
+new ColorFragmentHandler( rFilter, rColorStylePath,
pDiagram-getColors() ));
+importFragment(rFilter,
+loadFragment(rFilter,xRef),
+DiagramColorStyle,
+pShape,
+xRef);
+}
}
// diagram loaded. now lump together attach to shape
diff --git a/oox/source/ppt/pptshapegroupcontext.cxx
b/oox/source/ppt/pptshapegroupcontext.cxx
index 0529ec6..bf2a99f 100644
--- a/oox/source/ppt/pptshapegroupcontext.cxx
+++ b/oox/source/ppt/pptshapegroupcontext.cxx
@@ -128,6 +128,8 @@ Reference XFastContextHandler
PPTShapeGroupContext::createFastChildContext( s
break;
case PPT_TOKEN( graphicFrame ): // CT_GraphicalObjectFrame
{
+if( pGraphicShape )
+importExtDrawings();
pGraphicShape = oox::drawingml::ShapePtr( new PPTShape(
meShapeLocation, com.sun.star.drawing.OLE2Shape ) );
xRet.set( new oox::drawingml::GraphicalObjectFrameContext( *this,
mpGroupShapePtr, pGraphicShape, true ) );
}
@@ -141,9 +143,9 @@ Reference XFastContextHandler
PPTShapeGroupContext::createFastChildContext( s
return xRet;
}
-void PPTShapeGroupContext::endFastElement( sal_Int32 nElement ) throw
(SAXException, RuntimeException)
+void
Re: [PATCH] fdo#39468: translate German comments (= filter/inc/filter/msfilter/msdffimp.hxx) plus questions
2012/6/25 Noel Grandin n...@peralex.com:
On 2012-06-25 15:32, Michael Meeks wrote:
On Sat, 2012-06-23 at 20:45 +0200, Philipp Riemer wrote:
(2) In addition, I was wondering if it would be possible to shorten
parameters (e.g. com::sun::star::uno::Reference
com::sun::star::embed::XStorage xDestStg) by using aliases or
other ways to point to that namespaces. But I am not skilled enough in
C++ to do that (see e.g. patch 0003 for examples).
The great hope is LibreOffice 4 - which will discard the
com::sun::star
prefix and/or do something sensible instead here, making our APIs much
easier to read.
There was also hope for a transitional set of namespace aliases,
but I
forget why that was shot down, in the meantime we have that ugly,
tangled madness (sadly) :-)
Perhaps we could adopt a transitional scheme, where we move our types and
definitions to a new namespace, but leave aliases in the current namespace?
i.e. in pseudo-code:
namespace shiny
{
class Reference . yada yada.
}
namespace com.sun.star.uno
{
typedef ::shiny::Reference Reference;
}
Does that sound reasonable (have no real idea, given my lack of C++
experience).
Correct me if I am wrong, but I think that exact step was proposed and
also rejected after discussion a few weeks ago.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: another 3.6.0beta2 build error
This error is gone now that I've switched using system clucene. Also my other reported issue not finding some .desktop files is gone now. Strange. But I'm happy that I can compile it again till the end :) -Andy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - sw/qa writerfilter/source
sw/qa/extras/ooxmltok/data/n766481.docx |binary
sw/qa/extras/ooxmltok/ooxmltok.cxx| 21 ++
writerfilter/source/dmapper/DomainMapper.cxx | 11 +++
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 31 ++
writerfilter/source/dmapper/DomainMapper_Impl.hxx | 10 +++
writerfilter/source/dmapper/PropertyMap.cxx |1
6 files changed, 74 insertions(+)
New commits:
commit 0eb3a0f2fa66e67f21035c5c14a41d2d6fb4b345
Author: Miklos Vajna vmik...@suse.cz
Date: Mon Jun 25 16:01:37 2012 +0200
n#766481 testcase
Change-Id: I0ebcb5c35f2e255da593c62b0a98cd4e0f44ba99
diff --git a/sw/qa/extras/ooxmltok/data/n766481.docx
b/sw/qa/extras/ooxmltok/data/n766481.docx
new file mode 100644
index 000..e1521ec
Binary files /dev/null and b/sw/qa/extras/ooxmltok/data/n766481.docx differ
diff --git a/sw/qa/extras/ooxmltok/ooxmltok.cxx
b/sw/qa/extras/ooxmltok/ooxmltok.cxx
index 4cd2aa3..1d1bbb1 100644
--- a/sw/qa/extras/ooxmltok/ooxmltok.cxx
+++ b/sw/qa/extras/ooxmltok/ooxmltok.cxx
@@ -71,6 +71,7 @@ public:
void testN764745();
void testN766477();
void testN758883();
+void testN766481();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -92,6 +93,7 @@ public:
CPPUNIT_TEST(testN764745);
CPPUNIT_TEST(testN766477);
CPPUNIT_TEST(testN758883);
+CPPUNIT_TEST(testN766481);
#endif
CPPUNIT_TEST_SUITE_END();
@@ -605,6 +607,25 @@ void Test::testN758883()
CPPUNIT_ASSERT_EQUAL(text::TextContentAnchorType_AT_CHARACTER,
eAnchorType);
}
+void Test::testN766481()
+{
+/*
+ * The problem was that we had an additional paragraph before the
pagebreak.
+ *
+ * oParas = ThisComponent.Text.createEnumeration
+ * oPara = oParas.nextElement
+ * oPara = oParas.nextElement
+ * xray oParas.hasMoreElements ' should be false
+ */
+load(n766481.docx);
+uno::Referencetext::XTextDocument xTextDocument(mxComponent,
uno::UNO_QUERY);
+uno::Referencecontainer::XEnumerationAccess
xParaEnumAccess(xTextDocument-getText(), uno::UNO_QUERY);
+uno::Referencecontainer::XEnumeration
xParaEnum(xParaEnumAccess-createEnumeration());
+for (int i = 0; i 2; ++i)
+xParaEnum-nextElement();
+CPPUNIT_ASSERT_EQUAL(sal_False, xParaEnum-hasMoreElements());
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
commit b696600821d8aafb63b6a88016d299ef89478f56
Author: Miklos Vajna vmik...@suse.cz
Date: Mon Jun 25 15:58:11 2012 +0200
n#766481 dmapper: don't import fake paragraph containing sectpr only, take
two
Change-Id: I4623dfd05498b5ba8de73b7e301eaf486f667738
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index f51ce3f..c11935d 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -2795,6 +2795,8 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext, SprmType
case NS_ooxml::LN_CT_Style_rPr:
case NS_ooxml::LN_CT_PPr_rPr:
case NS_ooxml::LN_CT_PPrBase_numPr:
+if (nSprmId == NS_ooxml::LN_CT_PPr_sectPr)
+m_pImpl-SetParaSectpr(true);
resolveSprmProps(*this, rSprm);
break;
case NS_ooxml::LN_EG_SectPrContents_footnotePr:
@@ -3396,7 +3398,16 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_,
size_t len)
// RTF always uses text() instead of utext() for run break
if(len == 1 ((*data_) == 0x0d || (*data_) == 0x07)
!IsRTFImport())
+{
+bool bSingleParagraph = m_pImpl-GetIsFirstParagraphInSection()
m_pImpl-GetIsLastParagraphInSection();
+// If the paragraph contains only the section properties and it has
+// no runs, we should not create a paragraph for it in Writer,
unless that would remove the whole section.
+bool bRemove = !m_pImpl-GetParaChanged()
m_pImpl-GetParaSectpr() !bSingleParagraph;
+m_pImpl-SetParaSectpr(false);
m_pImpl-finishParagraph(m_pImpl-GetTopContextOfType(CONTEXT_PARAGRAPH));
+if (bRemove)
+m_pImpl-RemoveLastParagraph();
+}
else
{
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 8e6d2c6..776aaba 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -206,7 +206,9 @@ DomainMapper_Impl::DomainMapper_Impl(
m_bIsCustomFtnMark( false ),
m_bIsParaChange( false ),
m_bParaChanged( false ),
+m_bIsFirstParaInSection( true ),
m_bIsLastParaInSection( false ),
+m_bParaSectpr( false ),
m_bUsingEnhancedFields( false )
{
appendTableManager( );
@@ -307,7 +309,35 @@ void DomainMapper_Impl::SetIsLastParagraphInSection( bool
bIsLast )
[Libreoffice-commits] .: Branch 'feature/svg-export' - 5 commits - filter/source slideshow/source
filter/source/svg/presentation_engine.js | 305 ---
slideshow/source/engine/animationnodes/animationbasenode.cxx | 10
slideshow/source/engine/animationnodes/basecontainernode.cxx | 39 +
slideshow/source/engine/animationnodes/basecontainernode.hxx |4
4 files changed, 268 insertions(+), 90 deletions(-)
New commits:
commit 78e4336eee71646c7f671372991a800b70fe3d08
Author: Marco Cecchetti mrcek...@gmail.com
Date: Sat Jun 23 21:12:58 2012 +0200
Modified the JavaScript implementation for repeated animations.
That has been needed because of Firefox that does not compute the bounding
box of a
shape with zero width and height properly.
diff --git a/filter/source/svg/presentation_engine.js
b/filter/source/svg/presentation_engine.js
index 4dba32e..5161780 100644
--- a/filter/source/svg/presentation_engine.js
+++ b/filter/source/svg/presentation_engine.js
@@ -1433,13 +1433,13 @@ var NAVDBG = new DebugPrinter();
NAVDBG.off();
var ANIMDBG = new DebugPrinter();
-ANIMDBG.on();
+ANIMDBG.off();
var aRegisterEventDebugPrinter = new DebugPrinter();
aRegisterEventDebugPrinter.off();
var aTimerEventQueueDebugPrinter = new DebugPrinter();
-aTimerEventQueueDebugPrinter.on();
+aTimerEventQueueDebugPrinter.off();
var aEventMultiplexerDebugPrinter = new DebugPrinter();
aEventMultiplexerDebugPrinter.off();
@@ -4585,49 +4585,6 @@ function createStateTransitionTable()
var aStateTransitionTable = createStateTransitionTable();
-
-
-
-//
--
//
-// Transition tables
-
-// transition table for restart=NEVER, fill=FREEZE
-var aStateTransitionTable_Never_Freeze =
-[
-INVALID_NODE,
-RESOLVED_NODE | ENDED_NODE, // active successors for UNRESOLVED
-ACTIVE_NODE | ENDED_NODE, // active successors for RESOLVED
-INVALID_NODE,
-FROZEN_NODE | ENDED_NODE, // active successors for ACTIVE:
freeze object
-INVALID_NODE,
-INVALID_NODE,
-INVALID_NODE,
-ENDED_NODE, // active successors for FROZEN: end
-INVALID_NODE,
-INVALID_NODE,
-INVALID_NODE,
-INVALID_NODE,
-INVALID_NODE,
-INVALID_NODE,
-INVALID_NODE,
-ENDED_NODE // active successors for ENDED:
-// this state is a sink here (cannot restart)
-];
-
-
-// Table guide
-var aTableGuide =
-[
- null,
- null,
- null,
- aStateTransitionTable_Never_Freeze,
- null,
- null
-];
-
-
-
//
--
//
function getTransitionTable( eRestartMode, eFillMode )
{
@@ -5352,9 +5309,6 @@ BaseNode.prototype.resolve = function()
BaseNode.prototype.activate = function()
{
-log( 'restart mode: ' + aRestartModeOutMap[ this.getRestartMode() ] );
-log( 'fill mode: ' + aFillModeOutMap[ this.getFillMode() ] );
-
if( ! this.checkValidNode() )
return false;
@@ -8373,7 +8327,7 @@ function AnimatedElement( aElement )
this.aClipPathContent = null;
this.aPreviousElement = null;
-this.aElementArray = new Array();
+this.aStateArray = new Array();
this.nCurrentState = -1;
this.eAdditiveMode = ADDITIVE_MODE_REPLACE;
this.bIsUpdated = true;
@@ -8486,7 +8440,8 @@ AnimatedElement.prototype.setToElement = function(
aElement )
AnimatedElement.prototype.notifySlideStart = function()
{
-this.setToFirst();
+this.nCurrentState = -1;
+//this.setToFirst();
this.DBG( '.notifySlideStart invoked' );
};
@@ -8529,9 +8484,15 @@ AnimatedElement.prototype.notifyNextEffectStart =
function( nEffectIndex )
AnimatedElement.prototype.saveState = function()
{
++this.nCurrentState;
-if( !this.aElementArray[ this.nCurrentState ] )
+if( !this.aStateArray[ this.nCurrentState ] )
{
-this.aElementArray[ this.nCurrentState ] =
this.aActiveElement.cloneNode( true );
+this.aStateArray[ this.nCurrentState ] = new Object();
+var aState = this.aStateArray[ this.nCurrentState ];
+aState.aElement = this.aActiveElement.cloneNode( true );
+aState.nCenterX = this.nCenterX;
+aState.nCenterY = this.nCenterY;
+aState.nScaleFactorX = this.nScaleFactorX;
+aState.nScaleFactorY = this.nScaleFactorY;
}
};
@@ -8542,29 +8503,28 @@ AnimatedElement.prototype.setToFirst = function()
AnimatedElement.prototype.setToLast = function()
{
-this.setTo( this.aElementArray.length - 1 );
+this.setTo( this.aStateArray.length - 1 );
};
AnimatedElement.prototype.setTo = function( nNewState )
{
-if( !this.aElementArray[ nNewState ] )
+if( !this.aStateArray[ nNewState ] )
{
log( 'AnimatedElement(' + this.getId() + ').setTo: state '
+ nNewState + ' is not valid' );
return false;
}
-var bRet = this.setToElement( this.aElementArray[
[Libreoffice] [GSoC 2012][svg export filter] Weekly Report #5
Hi everybody, sorry for the delay, I had some unexpected event on this weekend. It follows my weekly report: Report #5 - Ported all transition tables that describe how an animation can pass from one state to another. Added support for the repeatCount attribute for time containers. The support is limited to the case when the value of the repeatCount attribute is an integral number and the duration time is defined implicitly by the time container children. The support for such a feature has been implemented for both the C++ and the JavaScript presentation engine. Analyzed the effect of removing the call to the ActivityBase::performEnd method when an animation node is deactivated. Implemented support to the rewind option for the JavaScript engine. Created two Easy hacks for shape transitions and slide transitions. The goal of such easy hacks is to add support for more shape and slide transitions to the JavaScript presentation engine. Unfortunately I could not do more because I was knocked out by a gastrointestinal virus. I need to pay more attention to what I eat. --- You can read more details on my project log book: https://docs.google.com/document/d/1GSLPSIWRGSDTSi69dT9Te8tRyTJcAekxT7scoCoGO2M/edit You can download a sample presentation here: https://docs.google.com/open?id=0BwS_9-CU4098ZVc4WktBQU5ud3c In order to download the zip files click on the Download item under the File menu. You can look at the source code in the feature branch: feature/svg-export. Cheers, -- Marco -- Using Opera's revolutionary e-mail client: http://www.opera.com/mail/ ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [gsoc] circular dependency in feature/template-dialog
On Mon, Jun 25, 2012 at 3:11 AM, Miklos Vajna vmik...@suse.cz wrote: Hi Rafael, Here is the build error I get when I try to build your branch from scratch: ~/git/libreoffice/gsoc2012/tail_build$ make -sr [ build MOD ] accessibility [ build MOD ] animations make: Circular /home/vmiklos/git/libreoffice/gsoc2012/workdir/ unxlngx6.pro/ExternalHeaders/Library/libdrawinglayerlo.so - /home/vmiklos/git/libreoffice/gsoc2012/workdir/ unxlngx6.pro/Headers/Library/libavmedialo.so dependency dropped. make: Circular /home/vmiklos/git/libreoffice/gsoc2012/workdir/ unxlngx6.pro/LinkTarget/Library/libdrawinglayerlo.so - /home/vmiklos/git/libreoffice/gsoc2012/solver/ unxlngx6.pro/lib/libavmedialo.so dependency dropped. [ build LNK ] Library/libdrawinglayerlo.so /usr/lib64/gcc/x86_64-suse-linux/4.6/../../../../x86_64-suse-linux/bin/ld: cannot find -lavmedialo collect2: ld returned 1 exit status make: *** [/home/vmiklos/git/libreoffice/gsoc2012/workdir/ unxlngx6.pro/LinkTarget/Library/libdrawinglayerlo.so] Error 1 And indeed it seems: - drawinglayer depends on avmedia - avmedia depends on sfx2 - sfx2 depends on drawinglayer - circular dependency It seems you introduced this dependency in commit 643f30de35d26e7e50ef3ea39a476733dbf38251. Not something that will block you right now, but definitely something to fix before your feature branch gets merged. Miklos Hey miklos, try doing a make clean and rebuilding again. ___ 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 fabien.mic...@hespul.org changed: What|Removed |Added Depends on||40907 --- Comment #26 from fabien.mic...@hespul.org 2012-06-25 08:04:56 PDT --- Bug 40907 : the bug is very annoying for corporate use on mac network -- 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 fabien.mic...@hespul.org changed: What|Removed |Added Depends on|40907 | -- 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] Use hyphen for copyright range in About box
On Fri, 2012-06-22 at 10:40 -0400, Robinson Tryon wrote: I've been eyeing some of the unit test bugs (e.g. https://bugs.freedesktop.org/show_bug.cgi?id=39625) and I'll keep my eye out for any more obvious comma-hyphen fixes. Oh - nice ;-) unit testing is really critical; and this would be a great task to work with gerrit for - simply because re-enabling those the sal/ tests (eg. of which there are dozens of accidentally disabled ones) is almost certain to bust some platform or other for some small % age of the tests. I played around with the bibisect tool and marked up a couple of bugs, Nice work. I'm also working on getting t-shirts and stickers printed up and spread around (http://listarchives.libreoffice.org/us/marketing/msg01808.html). I've had some trouble getting source files for some artwork up on the wiki, but I'll forge ahead. I remember how tickled I was the first time that I saw a person on the bus in a Firefox hoodie; I'd like to see everyday people out there in LibreOffice swag, too! Wow - that's great work too - I believe Thorsten (or Bubli?) was digging at web stores and the like for swag at some stage - but I forget what the final outcome was. Thanks for your contribution ! Regards, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[GSOC] Weekly Report - Template Dialog UI
This week progress - Filtered files by their type when clicking the top buttons. - Added toolbar and context toolbar depending if you select a template file or not. - Import template to selected folders. - Open selected templates for editing. - Display search edit box when clicking in the search button TODO this week - Implement sort by name - Display popup menu when clicking on a toolbar button - Implement move selected templates to other folders. - Improve position and size of child controls in the dialog. - Rename a folder by clicking on the name in the overlay. - Create a new template. - Talk to the UX team about the moving template behaviour and missing icons for the toolbar and buttons. (For icons, in the mean time, select ones from the repository) - Improve display of items in ThumbnailView, their text name (truncate long names) and thumbnails size and position. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit ac00b2881824ebd40bfcb2b20c70df6d21daf677
Author: Miklos Vajna vmik...@suse.cz
Date: Fri Jun 22 18:55:15 2012 +0200
fdo#46966 dmapper: fix headery/footery default value
The docx spec doesn't say what is the default value, the rtf spec says
it's 720, not 1440.
Change-Id: Icb331591d4f2f96a7786f808d99af5974e645f8e
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 13abcad..0f9af17 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -3394,7 +3394,8 @@ void DomainMapper_Impl::SetPageMarginTwip( PageMarElement
eElement, sal_Int32 nV
_PageMar::_PageMar()
{
-header = footer = top = bottom = ConversionHelper::convertTwipToMM100(
sal_Int32(1440));
+header = footer = ConversionHelper::convertTwipToMM100(sal_Int32(720));
+top = bottom = ConversionHelper::convertTwipToMM100( sal_Int32(1440));
right = left = ConversionHelper::convertTwipToMM100( sal_Int32(1800));
gutter = 0;
}
___
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.cxx | 11 +++
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 31 ++
writerfilter/source/dmapper/DomainMapper_Impl.hxx | 10 +++
writerfilter/source/dmapper/PropertyMap.cxx |1
4 files changed, 53 insertions(+)
New commits:
commit ca555c596043c88894b964ac5e21f5a7271d5f3b
Author: Miklos Vajna vmik...@suse.cz
Date: Mon Jun 25 15:58:11 2012 +0200
n#766481 dmapper: don't import fake paragraph containing sectpr only, take
two
Change-Id: I4623dfd05498b5ba8de73b7e301eaf486f667738
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index f51ce3f..c11935d 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -2795,6 +2795,8 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext, SprmType
case NS_ooxml::LN_CT_Style_rPr:
case NS_ooxml::LN_CT_PPr_rPr:
case NS_ooxml::LN_CT_PPrBase_numPr:
+if (nSprmId == NS_ooxml::LN_CT_PPr_sectPr)
+m_pImpl-SetParaSectpr(true);
resolveSprmProps(*this, rSprm);
break;
case NS_ooxml::LN_EG_SectPrContents_footnotePr:
@@ -3396,7 +3398,16 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_,
size_t len)
// RTF always uses text() instead of utext() for run break
if(len == 1 ((*data_) == 0x0d || (*data_) == 0x07)
!IsRTFImport())
+{
+bool bSingleParagraph = m_pImpl-GetIsFirstParagraphInSection()
m_pImpl-GetIsLastParagraphInSection();
+// If the paragraph contains only the section properties and it has
+// no runs, we should not create a paragraph for it in Writer,
unless that would remove the whole section.
+bool bRemove = !m_pImpl-GetParaChanged()
m_pImpl-GetParaSectpr() !bSingleParagraph;
+m_pImpl-SetParaSectpr(false);
m_pImpl-finishParagraph(m_pImpl-GetTopContextOfType(CONTEXT_PARAGRAPH));
+if (bRemove)
+m_pImpl-RemoveLastParagraph();
+}
else
{
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 0f9af17..897402c 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -206,7 +206,9 @@ DomainMapper_Impl::DomainMapper_Impl(
m_bIsCustomFtnMark( false ),
m_bIsParaChange( false ),
m_bParaChanged( false ),
+m_bIsFirstParaInSection( true ),
m_bIsLastParaInSection( false ),
+m_bParaSectpr( false ),
m_bUsingEnhancedFields( false )
{
appendTableManager( );
@@ -307,7 +309,35 @@ void DomainMapper_Impl::SetIsLastParagraphInSection( bool
bIsLast )
m_bIsLastParaInSection = bIsLast;
}
+bool DomainMapper_Impl::GetIsLastParagraphInSection()
+{
+return m_bIsLastParaInSection;
+}
+
+void DomainMapper_Impl::SetIsFirstParagraphInSection( bool bIsFirst )
+{
+m_bIsFirstParaInSection = bIsFirst;
+}
+
+bool DomainMapper_Impl::GetIsFirstParagraphInSection()
+{
+return m_bIsFirstParaInSection;
+}
+void DomainMapper_Impl::SetParaSectpr(bool bParaSectpr)
+{
+m_bParaSectpr = bParaSectpr;
+}
+
+bool DomainMapper_Impl::GetParaSectpr()
+{
+return m_bParaSectpr;
+}
+
+bool DomainMapper_Impl::GetParaChanged()
+{
+return m_bParaChanged;
+}
voidDomainMapper_Impl::PushProperties(ContextType eId)
{
@@ -1030,6 +1060,7 @@ void DomainMapper_Impl::finishParagraph( PropertyMapPtr
pPropertyMap )
uno::Reference text::XTextRange xParaEnd( xCur,
uno::UNO_QUERY );
CheckParaRedline( xParaEnd );
+m_bIsFirstParaInSection = false;
m_bIsLastParaInSection = false;
m_bParaChanged = false;
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 77a2b62..0cfee56 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -349,8 +349,12 @@ private:
RedlineParamsPtrm_pParaRedline;
boolm_bIsParaChange;
+/// If the current paragraph has any runs.
boolm_bParaChanged;
+boolm_bIsFirstParaInSection;
boolm_bIsLastParaInSection;
+/// If the current paragraph contains section property definitions.
+boolm_bParaSectpr;
boolm_bUsingEnhancedFields;
//annotation import
@@ -406,6 +410,12 @@ public:
void RemoveLastParagraph( );
void SetIsLastParagraphInSection( bool bIsLast );
+bool GetIsLastParagraphInSection();
+void SetIsFirstParagraphInSection( bool bIsFirst );
+bool
Re: where are extras/source/templates/wizard/bitmap used ?
On Mon, 2012-06-25 at 15:48 +0200, Andras Timar wrote: usa.gif is used: http://opengrok.libreoffice.org/xref/core/wizards/source/schedule/schedule.src#194 BTW this Calendar macro looks broken to me. Other country bitmaps are unused, as far as I can tell. Aha! From that Schedule thing I see a bunch of LocalHolidays macros with country names that nearly match the country graphics except that they all show a picture of the US in practice. Presumably that's where they were meant to be used. Yeah, calendar thing is all a bit broken. I don't think it makes a lot of sense to continue with it, it doesn't work, its restricted to a set of fairly arbitrary bunch of places that StarOffice was marketed towards and is apparently out of date wrt public holidays in those places etc. So I removed it :-) C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] fdo#44602 Modeless word count window hides when user clicks into note
On Mon, Jun 25, 2012 at 12:08:03PM +0200, Muhammad Haggag wrote:
html style=direction: ltr;
head
meta content=text/html; charset=ISO-8859-1
http-equiv=Content-Type
style type=text/cssbody p { margin-bottom: 0cm; margin-top: 0pt; }
/style
/head
Please avoid HTML-mail to Mailing Lists; thank you.
--
Lionel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/source
sw/source/ui/uno/SwXDocumentSettings.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 85c69cbbf54016165053bccb5baaab4eec05dd24
Author: Maxime de Roucy mdero...@linagora.com
Date: Wed May 30 10:45:02 2012 +0200
Change unnecessary pointer dereference
Change-Id: I28404d9d1a18886361deae1aec583ef40c25ce85
diff --git a/sw/source/ui/uno/SwXDocumentSettings.cxx
b/sw/source/ui/uno/SwXDocumentSettings.cxx
index d988bf5..ff56b00 100644
--- a/sw/source/ui/uno/SwXDocumentSettings.cxx
+++ b/sw/source/ui/uno/SwXDocumentSettings.cxx
@@ -839,7 +839,7 @@ void SwXDocumentSettings::_getSingleValue( const
comphelper::PropertyInfo rInf
break;
case HANDLE_PRINTER_SETUP:
{
-SfxPrinter *pPrinter = mpDocSh-GetDoc()-getPrinter( sal_False );
+SfxPrinter *pPrinter = mpDoc-getPrinter( sal_False );
if (pPrinter)
{
SvMemoryStream aStream;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Bibisect for 3.6
On Mon, Jun 25, 2012 at 12:10:24PM +0100, Michael Meeks wrote: On Sun, 2012-06-24 at 15:12 +0200, Lionel Elie Mamane wrote: Hmm... http://people.canonical.com/~bjoern/bibisect-3.6-20120428.tar.xz requires GNU glibc 2.15, while Debian only has 2.13 :-( It would be better (if possible) to build the builds inside our very old 'generic linux' system / virtual-machine, such that they run everywhere. Of course, that is more work ;-) Yes, indeed. Plus the fact that Xen cannot handle OVA files, I think in the immediate, I'll leave the bibisecting to some (other) very nice QA person. -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice][PATCH] Prevent print settings dialog to show help button when it's called from help window
The patch 0003 introduce a bug :
-if ( SID_PRINTER_NAME == nId )
-{
-// just set a recorded printer name
-if ( pPrinter )
-SetPrinter( pPrinter, SFX_PRINTER_PRINTER );
-break;
-}
please wait before pushing it.
I will release a patch that will correct the problem.
Regards
--
Maxime de Roucy
Groupe LINAGORA - OSSA
80 rue Roque de Fillol
92800 PUTEAUX
Tel. : 0033(0)642004909
Le mardi 19 juin 2012 à 16:05 +0200, Maxime de Roucy a écrit :
Hello,
Here is some patchs :
0001 : one line, code simplification.
0002 : explicite NULL or 0 comparison in if. I don't know if LibreOffice
have a coding standard about that type of comparison ?
0003 : some rewriting of SfxViewShell::ExecPrint_Impl ; add some
comments, prevent a segfault (NULL pointer dereferencing ; add return
after rReq.SetReturnValue(SfxBoolItem(0,sal_False)))…
0004 : Prevent the printer settings dialog to show help button when it's
called from a help window.
Regards.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
signature.asc
Description: This is a digitally signed message part
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED partial][PATCH] Prevent print settings dialog to show help button when it's called from help window
On Tue, 2012-06-19 at 16:05 +0200, Maxime de Roucy wrote: Hello, Here is some patchs : 0001 : one line, code simplification. I've pushed this one anyway. 0002 : explicite NULL or 0 comparison in if. I don't know if LibreOffice have a coding standard about that type of comparison ? meh, I don't think we have any coding standards around it. But I'd skip this one as in the absence of a coding standard I don't see the value in swapping from one equally valid syntax to another. 0003 : some rewriting of SfxViewShell::ExecPrint_Impl ; add some comments, prevent a segfault (NULL pointer dereferencing ; add return after rReq.SetReturnValue(SfxBoolItem(0,sal_False)) 0004 : Prevent the printer settings dialog to show help button when it's called from a help window. I guess we'll leave the other two until your updated patches. Right ?, or is 0004 still valid ? C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Can #32260 and 51135 be closed? -- both: Request for account
Hi, (1) I just realized that https://bugs.freedesktop.org/show_bug.cgi?id=32260 from 2010-12-09 is still open/ in NEEDINFO state. Last comment from requesting user Andrew Dent is from end of 2010 and also on the mailing list I could not find any message of him after 2010-10-24 (see https://www.google.com/search?q=Andrew+Dentsitesearch=%25%28archive_url%29s%2F#q=Andrew+Dent+site:http%3A%2F%2Flists.freedesktop.org%2Farchives%2Flibreoffice%2Fhl=enprmd=imvnsosa=Xei=R4ToT4CKHo7NswbQuqSmAQved=0CCsQpwUoBgsource=lnttbs=cdr:1%2Ccd_min%3A1%2F1%2F2010%2Ccd_max%3A6%2F25%2F2012tbm=bav=on.2,or.r_gc.r_pw.r_cp.r_qf.,cf.osbfp=a364499a926ab80abiw=1440bih=683). As a result, I want to ask if this request can be closed? (2) Also Muhammad Haggag's request https://bugs.freedesktop.org/show_bug.cgi?id=51135 from 2012-06-15 is in UNCONFIRMED state. But here the situation seems to be different since I can only find three mails in total from him in Feb 2012 on the mailing list (see https://www.google.com/search?q=Muhammad%20Haggagsitesearch=%25%28archive_url%29s%2F#hl=entbs=cdr:1%2Ccd_min%3A1%2F1%2F2010%2Ccd_max%3A6%2F25%2F2012sclient=psy-abq=Muhammad+Haggag+site%3Ahttp%3A%2F%2Flists.freedesktop.org%2Farchives%2Flibreoffice%2Foq=Muhammad+Haggag+site:http%3A%2F%2Flists.freedesktop.org%2Farchives%2Flibreoffice%2Faq=faqi=aql=gs_l=serp.12...9421.9795.0.13069.3.3.0.0.0.0.63.177.3.3.0...0.0.uYm14PDWpJgpbx=1bav=on.2,or.r_gc.r_pw.r_qf.,cf.osbfp=3892739cde4f876ebiw=1440bih=812). Since Muhammad seems to be not interested anymore - can this request be changed into a closed state as well? Cheers, Philipp ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: scp2/source
scp2/source/ooo/file_ooo.scp |6 -- scp2/source/ooo/module_hidden_ooo.scp |1 - 2 files changed, 7 deletions(-) New commits: commit 3e377de063bc55e2ce71441343b7284599187460 Author: Caolán McNamara caol...@redhat.com Date: Mon Jun 25 16:59:17 2012 +0100 gid_File_Basic_Schedule doesn't exist now Change-Id: I5e081637617be8f15acf3c8a90810b2bd2ade7bb diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 450d9e6..6898e7a 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -57,12 +57,6 @@ File gid_File_Basic_Formwiz Name = basicsrvform.zip; End -File gid_File_Basic_Schedule -Dir = gid_Dir_Basic_Schedule; -ARCHIVE_TXT_FILE_BODY; -Name = basicsrvschedule.zip; -End - File gid_File_Basic_Scriptbindinglib Dir = gid_Dir_Basic_Scriptbindinglib; ARCHIVE_TXT_FILE_BODY; diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index a3ff86d..8c64871 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -552,7 +552,6 @@ Module gid_Module_Root_Files_6 gid_File_Basic_Gimmicks, gid_File_Basic_Importwiz, gid_File_Basic_Formwiz, - gid_File_Basic_Schedule, gid_File_Basic_Scriptbindinglib, gid_File_Basic_Template, gid_File_Basic_Tools, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Bibisect for 3.6
On Mon, Jun 25, 2012 at 05:40:31PM +0200, Lionel Elie Mamane wrote: It would be better (if possible) to build the builds inside our very old 'generic linux' system / virtual-machine, such that they run everywhere. Of course, that is more work ;-) Yes, indeed. Plus the fact that Xen cannot handle OVA files, I think in the immediate, I'll leave the bibisecting to some (other) very nice QA person. If you (or someone you find), tweaks: http://cgit.freedesktop.org/libreoffice/contrib/buildbot/ to do so, the immediate can be significantly shortened. ;) Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Possible option to simplify code?
On Sun, Jun 24, 2012 at 06:28:05PM +0200, Michael Stahl mst...@redhat.com wrote: On 23/06/12 21:26, Philipp Riemer wrote: (1) Wouldn't it be better in the method SwXTextDefaults::supportsService to use the output of SwXTextDefaults::getSupportedServiceNames and make an is in array? check there instead of duplicating the allowed/supported string values? but you can already do something similar by using the STL algorithms; there is a comphelper/stlunosequence.hxx that has some begin()/end() functions that work on uno::Sequence, and with that you can just use std::find() like on any STL container, which i guess is what's appropriate in C++. Yes, that makes sense, I just did so in master. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/source
sw/source/core/unocore/SwXTextDefaults.cxx | 10 +++---
1 file changed, 3 insertions(+), 7 deletions(-)
New commits:
commit 722c675241d3d652e744f445780766effd58b942
Author: Miklos Vajna vmik...@suse.cz
Date: Mon Jun 25 18:18:43 2012 +0200
SwXTextDefaults: use comphelper/stlunosequence.hxx
Change-Id: I4bf0214737c3f37eb4cf514f58e66c72617f857c
diff --git a/sw/source/core/unocore/SwXTextDefaults.cxx
b/sw/source/core/unocore/SwXTextDefaults.cxx
index 0bc4fc5..c17e802 100644
--- a/sw/source/core/unocore/SwXTextDefaults.cxx
+++ b/sw/source/core/unocore/SwXTextDefaults.cxx
@@ -31,6 +31,7 @@
#include osl/mutex.hxx
#include vcl/svapp.hxx
+#include comphelper/stlunosequence.hxx
#include SwXTextDefaults.hxx
#include SwStyleNameMapper.hxx
@@ -259,13 +260,8 @@ rtl::OUString SAL_CALL
SwXTextDefaults::getImplementationName( )
sal_Bool SAL_CALL SwXTextDefaults::supportsService( const ::rtl::OUString
rServiceName )
throw (RuntimeException)
{
-return rServiceName == com.sun.star.text.Defaults ||
-rServiceName == com.sun.star.style.CharacterProperties ||
-rServiceName == com.sun.star.style.CharacterPropertiesAsian ||
-rServiceName == com.sun.star.style.CharacterPropertiesComplex ||
-rServiceName == com.sun.star.style.ParagraphProperties ||
-rServiceName == com.sun.star.style.ParagraphPropertiesAsian ||
-rServiceName == com.sun.star.style.ParagraphPropertiesComplex;
+uno::Sequence ::rtl::OUString aSeq(getSupportedServiceNames());
+return std::find(comphelper::stl_begin(aSeq), comphelper::stl_end(aSeq),
rServiceName) != comphelper::stl_end(aSeq);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/template-dialog' - 2 commits - sfx2/source
sfx2/source/doc/templatedlg.cxx | 40 ++--
1 file changed, 38 insertions(+), 2 deletions(-)
New commits:
commit a2952b9a768915e9c0c91135fd2f9d7e742c53f6
Author: Rafael Dominguez venccsra...@gmail.com
Date: Mon Jun 25 11:51:05 2012 -0430
Add a function to create a new template depending on their type.
Change-Id: Ic4a0e74e7f87d2e7772ab5f92980c54f5d06e7f8
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 96171aa..f69e74c 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -41,6 +41,8 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::frame;
+void lcl_createTemplate(const FILTER_APPLICATION eApp);
+
SfxTemplateManagerDlg::SfxTemplateManagerDlg (Window *parent)
: ModalDialog(parent, SfxResId(DLG_TEMPLATE_MANAGER)),
aButtonAll(this,SfxResId(BTN_SELECT_ALL)),
@@ -422,4 +424,33 @@ void SfxTemplateManagerDlg::OnTemplateDelete ()
}
}
+void lcl_createTemplate(const FILTER_APPLICATION eApp)
+{
+rtl::OUString aURL;
+
+switch(eApp)
+{
+case FILTER_APP_WRITER:
+aURL = private:factory/swriter;
+break;
+case FILTER_APP_CALC:
+aURL = private:factory/scalc;
+break;
+case FILTER_APP_IMPRESS:
+aURL = private:factory/simpress;
+break;
+case FILTER_APP_DRAW:
+aURL = private:factory/sdraw;
+break;
+default:
+break;
+}
+
+if (!aURL.isEmpty())
+{
+uno::SequencePropertyValue aArgs;
+mxDesktop-loadComponentFromURL(aURL,rtl::OUString(_blank), 0, aArgs
);
+}
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit bdd1cfa4a56cdf7f8fa6b65384d379e359dbfa50
Author: Rafael Dominguez venccsra...@gmail.com
Date: Sun Jun 24 17:39:32 2012 -0430
Expand/Reduce dialog when search editbox is visible/hidden.
Change-Id: Ia7f4d078b80ab2ed5c2a7d7224eee9aaea2dfb16
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index b1b6395..96171aa 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -353,18 +353,23 @@ void SfxTemplateManagerDlg::OnTemplateSearch ()
{
Point aPos = maView-GetPosPixel();
bool bVisible = mpSearchEdit-IsVisible();
+Size aWinSize = GetSizePixel();
+long nEditHeight = mpSearchEdit-GetSizePixel().getHeight();
if (bVisible)
{
-aPos.setY(aPos.getY() - mpSearchEdit-GetSizePixel().getHeight());
+aWinSize.setHeight(aWinSize.getHeight() - nEditHeight );
+aPos.setY(aPos.getY() - nEditHeight );
mpActionBar-SetItemState(TBI_TEMPLATE_SEARCH,STATE_NOCHECK);
}
else
{
-aPos.setY(aPos.getY() + mpSearchEdit-GetSizePixel().getHeight());
+aWinSize.setHeight(aWinSize.getHeight() + nEditHeight );
+aPos.setY(aPos.getY() + nEditHeight );
mpActionBar-SetItemState(TBI_TEMPLATE_SEARCH,STATE_CHECK);
}
+SetSizePixel(aWinSize);
maView-SetPosPixel(aPos);
mpSearchEdit-Show(!bVisible);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/template-dialog' - sfx2/source
sfx2/source/doc/templatedlg.cxx |7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 4cc579ee792fbc81007bb8e0b31b6ae45429b349
Author: Rafael Dominguez venccsra...@gmail.com
Date: Mon Jun 25 14:10:04 2012 -0430
Add missing argument to lcl_createTemplate.
Change-Id: Icb19405a3fa0aad63f10181185f94872662247a6
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index f69e74c..39796dd 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -41,7 +41,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::frame;
-void lcl_createTemplate(const FILTER_APPLICATION eApp);
+void lcl_createTemplate(uno::ReferenceXComponentLoader xDesktop, const
FILTER_APPLICATION eApp);
SfxTemplateManagerDlg::SfxTemplateManagerDlg (Window *parent)
: ModalDialog(parent, SfxResId(DLG_TEMPLATE_MANAGER)),
@@ -424,7 +424,8 @@ void SfxTemplateManagerDlg::OnTemplateDelete ()
}
}
-void lcl_createTemplate(const FILTER_APPLICATION eApp)
+void lcl_createTemplate(uno::Reference
com::sun::star::frame::XComponentLoader xDesktop,
+const FILTER_APPLICATION eApp)
{
rtl::OUString aURL;
@@ -449,7 +450,7 @@ void lcl_createTemplate(const FILTER_APPLICATION eApp)
if (!aURL.isEmpty())
{
uno::SequencePropertyValue aArgs;
-mxDesktop-loadComponentFromURL(aURL,rtl::OUString(_blank), 0, aArgs
);
+xDesktop-loadComponentFromURL(aURL,rtl::OUString(_blank), 0, aArgs
);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Bibisect for 3.6
On Mon, Jun 25, 2012 at 06:17:54PM +0200, Bjoern Michaelsen wrote: On Mon, Jun 25, 2012 at 05:40:31PM +0200, Lionel Elie Mamane wrote: It would be better (if possible) to build the builds inside our very old 'generic linux' system / virtual-machine, such that they run everywhere. Of course, that is more work ;-) Yes, indeed. Plus the fact that Xen cannot handle OVA files, I think in the immediate, I'll leave the bibisecting to some (other) very nice QA person. If you (or someone you find), tweaks: http://cgit.freedesktop.org/libreoffice/contrib/buildbot/ to do so, the immediate can be significantly shortened. ;) What tweak does it need beyond *running* on the old 'generic linux' system instead of on a bleeding edge Ubuntu? -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] fdo#38828: Save position of tab dialogs
On Thu, 2012-06-21 at 20:03 -0500, Travis Carter wrote: I've already submitted a patch that isn't as well formed to the bug listing. Sorry. This was my first patch to any project and I should have checked a little better on the preferred submission method. The one attached here should be better. Looks good. So... First up, can you add yourself to http://wiki.documentfoundation.org/Development/Developers and link to a mail that states that your submission is under our preferred MPL/LGPLv3+ license combo. Most seem to go for a simple all my patches unless I say otherwise Second up, I wonder if we should do the save position thing *both* in the dtor and in the ::Ok handler that's called from apply. I mean, at the moment we seem to store which is the open tab and the position/size of the dialog on cancel/close too, do we want to continue doing that ? C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Image Scaling in the GUI (for 3.7)
Hi, Now that we have higher quality scaling algorithms on Bitmap, which are used for PDF export, I wanted to do the same in the GUI. I discovered that grfmgr is responsible for scaling when displaying images on the GUI, but it has its own functions for scaling. So I started to work on removing the scaling used in grfmgr and use Bitmap::Scale instead. Meanwhile Luboš Luňák enabled Bitmap::Scale (baca49fdda5e350b7b0f122d50739ee98cc6fe25) in a similar way I did at first, but this solution does not work well when zooming and the image must actually be croped to the display rectangle first. I have addressed this issue in commit 764525b39c78bfad1f6fc44a8517a565547f67cf, cleaned up the CreateOutput function and have additionally removed the scaling found in grfmgr. There are still some issues that I have found and need to be resolved: - Scaling is not so good when upscaling (can be seen at higher zoom levels), I need to check this in Bitmap::Scale to improve this. - Scaling is bad when dealing with transparent images. - There are some artifacts when rotating an image at arbitrary angles. - Scaling performance could be better - BMP_SCALE_BOX is faster and may be better for use on the GUI, however the same path is used for Export. Another idea is to combine scale and crop to speed up processing for certain scenarios (zoom). If someone finds other problems please report them to me. Thanks. Comments? Regards, Tomaž ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/source
sw/source/core/docnode/ndtbl.cxx | 45 +--
1 file changed, 20 insertions(+), 25 deletions(-)
New commits:
commit ff27d84e08951660edb77938db6ee7dbf806f4f8
Author: Michael Stahl mst...@redhat.com
Date: Mon Jun 25 22:45:07 2012 +0200
change lcl_SetDfltBoxAttr to use a std::map
Should hopefully fix the tinderbox breakage due to C++11 syntax as well.
Change-Id: I2805b7aae5fd1639177aa9d319652148f347393e
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 9ea5548..3e4ddc2 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -143,36 +143,31 @@ void lcl_SetDfltBoxAttr( SwFrmFmt rFmt, sal_uInt8 nId )
rFmt.SetFmtAttr( aBox );
}
-typedef struct {
-SwFrmFmt* pBoxFrmFmt;
-SwTableBoxFmt* pTableBoxFmt;
-} DfltBoxAttrTmp;
-typedef std::vectorDfltBoxAttrTmp DfltBoxAttrTmpVec;
-typedef std::vectorDfltBoxAttrTmpVec* DfltBoxAttrTmpVecVec;
-
-void lcl_SetDfltBoxAttr( SwTableBox rBox, DfltBoxAttrTmpVecVec rBoxFmtArr,
sal_uInt8 nId,
-const SwTableAutoFmt* pAutoFmt = 0 )
+typedef std::mapSwFrmFmt *, SwTableBoxFmt * DfltBoxAttrMap_t;
+typedef std::vectorDfltBoxAttrMap_t * DfltBoxAttrList_t;
+
+static void
+lcl_SetDfltBoxAttr(SwTableBox rBox, DfltBoxAttrList_t rBoxFmtArr,
+sal_uInt8 const nId, SwTableAutoFmt const*const pAutoFmt = 0)
{
-DfltBoxAttrTmpVec* pArr = rBoxFmtArr[ nId ];
-if( !pArr )
+DfltBoxAttrMap_t * pMap = rBoxFmtArr[ nId ];
+if (!pMap)
{
-pArr = new DfltBoxAttrTmpVec;
-rBoxFmtArr[ nId ] = pArr;
+pMap = new DfltBoxAttrMap_t;
+rBoxFmtArr[ nId ] = pMap;
}
SwTableBoxFmt* pNewTableBoxFmt = 0;
SwFrmFmt* pBoxFrmFmt = rBox.GetFrmFmt();
-for( sal_uInt16 n = 0; n pArr-size(); ++n )
-if( (*pArr)[n].pBoxFrmFmt == pBoxFrmFmt )
-{
-pNewTableBoxFmt = (*pArr)[n].pTableBoxFmt;
-break;
-}
-
-if( !pNewTableBoxFmt )
+DfltBoxAttrMap_t::iterator const iter(pMap-find(pBoxFrmFmt));
+if (pMap-end() != iter)
+{
+pNewTableBoxFmt = iter-second;
+}
+else
{
SwDoc* pDoc = pBoxFrmFmt-GetDoc();
-// das Format ist also nicht vorhanden, also neu erzeugen
+// format does not exist, so create it
pNewTableBoxFmt = pDoc-MakeTableBoxFmt();
pNewTableBoxFmt-SetFmtAttr( pBoxFrmFmt-GetAttrSet().Get(
RES_FRM_SIZE ) );
@@ -183,7 +178,7 @@ void lcl_SetDfltBoxAttr( SwTableBox rBox,
DfltBoxAttrTmpVecVec rBoxFmtArr, sal
else
::lcl_SetDfltBoxAttr( *pNewTableBoxFmt, nId );
-pArr-push_back( { pBoxFrmFmt, pNewTableBoxFmt } );
+(*pMap)[pBoxFrmFmt] = pNewTableBoxFmt;
}
rBox.ChgFrmFmt( pNewTableBoxFmt );
}
@@ -763,11 +758,11 @@ const SwTable* SwDoc::TextToTable( const
SwInsertTableOptions rInsTblOpts,
if( pTAFmt || ( rInsTblOpts.mnInsMode tabopts::DEFAULT_BORDER) )
{
sal_uInt8 nBoxArrLen = pTAFmt ? 16 : 4;
-boost::scoped_ptr DfltBoxAttrTmpVecVec aBoxFmtArr1;
+boost::scoped_ptr DfltBoxAttrList_t aBoxFmtArr1;
boost::scoped_ptr std::vectorSwTableBoxFmt* aBoxFmtArr2;
if( bUseBoxFmt )
{
-aBoxFmtArr1.reset(new DfltBoxAttrTmpVecVec( nBoxArrLen, NULL ));
+aBoxFmtArr1.reset(new DfltBoxAttrList_t( nBoxArrLen, NULL ));
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Re: [PATCH] Converting Svptrarr usage (33)
On 25/06/12 14:29, Noel Grandin wrote:
These patches convert various usage of Svptrarr to modern STL containers
like std::vector.
Along the way, I noticed some other stuff, so one of the patches deletes
a dead header file, and one of them cleans up a const-casting mess.
This patch series passes make check, and has been compiled with
--enable-dbgutil.
great, didn't have any build problems :)
pushed to master, thanks.
patches #1 and #14 have one of the dreaded vector(size_t)
+std::vectorDateTime* aDateTimeArr( 16 );
patch #17 has a subtle issue:
-sal_uInt16 nPos = SvPtrarr::GetPos( pObj );
-if( nPos )
+iterator it = std::find( begin(), end(), pObj );
+if( it != begin() )
{
// object is currently not the first in cache
-if( USHRT_MAX != nPos )
-SvPtrarr::Remove( nPos );
+if( it != end() )
+erase( it );
it != begin() will be false for empty container, because then it ==
end() and begin() == end() hence end() != end() is false; while before
nPos is USHRT_MAX for empty container, which is true here.
ah, and this bit here seems to be C++11 syntax that at least Apple GCC
doesn't understand:
-pArr-push_back( { pBoxFrmFmt, pNewTableBoxFmt } );
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
License applied on my templates contributions
All of my contributions to the LibreOffice Progress template may be licensed under the CC0 license. -- William Gathoye will...@gathoye.be ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: libicudata in non-standard directory linking issues.
On 25/06/12 12:38, Jonathan Adams wrote: yeah, that compiled icu fine, and I didn't even have to copy the icu libs to the solver ... great! compiled for a long time after that ... tools_test fails though ... If you can look through the debug file (sorry 1.7Mb https://docs.google.com/open?id=0B6o_jmGQm0dWd3VMWEc5alhJaWc ) and [ hmm for some reason i can't look at that in my browser profile which has my google account cookies, but i can look at it in another browser profile that doesn't allow any google cookies... go figure... ] give me pointers I'd be grateful ... if you can't then I'll leave it as is for now and try when I get access to a new compiler/updated LibreOffice source. anyway it looks like you're actually failing in sw_swdoc_test, which means that you must have compiled Writer, which means you've come pretty damn far :) don't have an immediate idea why it crashes (it says in SwDoc::GetVbaEventProcessor), but if this is just a problem in one or a few tests, then i suggest to just comment out these tests for now, or put them in a ifneq ($(OS),SOLARIS) check (edit e.g. sw/Module_sw.mk); if on the other hand all unit tests crash somehow then you've got a bigger problem... to better diagnose the crashes it would help to build with debug, i.e. the --enable-debug configure option; be aware that this will need 25GB of space, and linking will need some GBs of RAM (you will run out of RAM if you have less than 2GB, i think it's best to have at least 4GB but you may get by with 2 or even less if you disable parallel build). On 22 June 2012 09:57, Jonathan Adams t12nsloo...@gmail.com wrote: i'm not sure if adding a defined(__IBMC__) etc. is the right approach but if it doesn't break anything... they added that line for z/OS ... which, I may be wrong, I believe to be an IBM system ... looking around wikipedia; I found references to what defines are set when compiling on z/OS ... hmmm z/OS is apparently why that was initially added, but you never know what later happened to develop a dependency on this setting... well it seems our tinderboxes can build it on Linux and Mac OS X, so it's probably good enough, and we don't care at all if e.g. HP/UX fails with the patch :) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
About Clean Inspiration Template Licensing
All my past and future contributions to the LibreOffice Clean Inspiration template may be licensed under the CC0 license. :) -- *Mateus Machado Luna* 4º ano do Curso de Eletrônica Integrado ao Nível Médio - IFG Goiânia. http://www.flickr.com/photos/mateus-ml-wetah/ ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/template-dialog' - 6 commits - sfx2/inc sfx2/source
sfx2/inc/templatedlg.hxx|8 ++-
sfx2/source/doc/templatedlg.cxx | 92 +++-
sfx2/source/doc/templatedlg.hrc | 14 ++
sfx2/source/doc/templatedlg.src | 33 +++---
4 files changed, 128 insertions(+), 19 deletions(-)
New commits:
commit 50e90e208e53f72434d555ab926bcdf380871381
Author: Rafael Dominguez venccsra...@gmail.com
Date: Mon Jun 25 17:54:02 2012 -0430
Make sure to delete allocated attributes.
Change-Id: Ie441653c3204d70ecf0c8a5e23d78f5e547d4b71
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 8a2b2ac..ee4f3a2 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -142,8 +142,13 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg (Window
*parent)
SfxTemplateManagerDlg::~SfxTemplateManagerDlg ()
{
+delete mpSearchEdit;
+delete mpViewBar;
+delete mpActionBar;
+delete mpTemplateBar;
delete maView;
delete mpCreateMenu;
+delete mpActionMenu;
}
IMPL_LINK_NOARG(SfxTemplateManagerDlg,ViewAllHdl)
commit 62a5cd79db903b2afcd4cb795bd57642127fe0f5
Author: Rafael Dominguez venccsra...@gmail.com
Date: Mon Jun 25 17:52:13 2012 -0430
Remove unused methods.
Change-Id: I1d70a462b29bec7dcac7e4d5c2cac9f8e3af6e2f
diff --git a/sfx2/inc/templatedlg.hxx b/sfx2/inc/templatedlg.hxx
index ea82d78..84b3315 100644
--- a/sfx2/inc/templatedlg.hxx
+++ b/sfx2/inc/templatedlg.hxx
@@ -57,10 +57,8 @@ private:
DECL_LINK(MenuSelectHdl, Menu*);
-void OnTemplateCreate ();
void OnTemplateImport ();
void OnTemplateSearch ();
-void OnTemplateAction ();
void OnTemplateEdit ();
void OnTemplateProperties ();
void OnTemplateMove ();
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index cfacc3b..8a2b2ac 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -192,9 +192,6 @@ IMPL_LINK_NOARG(SfxTemplateManagerDlg,TBXViewHdl)
{
switch(mpViewBar-GetCurItemId())
{
-case TBI_TEMPLATE_CREATE:
-OnTemplateCreate();
-break;
case TBI_TEMPLATE_IMPORT:
OnTemplateImport();
break;
@@ -212,9 +209,6 @@ IMPL_LINK_NOARG(SfxTemplateManagerDlg,TBXActionHdl)
case TBI_TEMPLATE_SEARCH:
OnTemplateSearch();
break;
-case TBI_TEMPLATE_ACTION:
-OnTemplateAction();
-break;
default:
break;
}
@@ -350,10 +344,6 @@ IMPL_LINK(SfxTemplateManagerDlg, MenuSelectHdl, Menu*,
pMenu)
return 0;
}
-void SfxTemplateManagerDlg::OnTemplateCreate ()
-{
-}
-
void SfxTemplateManagerDlg::OnTemplateImport ()
{
sal_Int16 nDialogType =
@@ -455,10 +445,6 @@ void SfxTemplateManagerDlg::OnTemplateSearch ()
mpSearchEdit-Show(!bVisible);
}
-void SfxTemplateManagerDlg::OnTemplateAction ()
-{
-}
-
void SfxTemplateManagerDlg::OnTemplateEdit ()
{
uno::Sequence PropertyValue aArgs(1);
commit f10e1e007a3e481298649733bf83eff7d32c48d8
Author: Rafael Dominguez venccsra...@gmail.com
Date: Mon Jun 25 17:49:34 2012 -0430
Display action popup menu.
Change-Id: I6916be0c62385bd020ce08b314ee836f3c331d14
diff --git a/sfx2/inc/templatedlg.hxx b/sfx2/inc/templatedlg.hxx
index fdf458e..ea82d78 100644
--- a/sfx2/inc/templatedlg.hxx
+++ b/sfx2/inc/templatedlg.hxx
@@ -81,6 +81,7 @@ private:
ToolBox *mpTemplateBar;
TemplateFolderView *maView;
PopupMenu *mpCreateMenu;
+PopupMenu *mpActionMenu;
int mnSelectionCount;
std::setconst ThumbnailViewItem* maSelTemplates;
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 4a9215b..cfacc3b 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -69,6 +69,10 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg (Window *parent)
mpCreateMenu-InsertItem(MNI_CREATE_DRAW,SfxResId(STR_CREATE_DRAW).toString());
mpCreateMenu-SetSelectHdl(LINK(this, SfxTemplateManagerDlg,
MenuSelectHdl));
+mpActionMenu = new PopupMenu;
+
mpActionMenu-InsertItem(MNI_ACTION_SORT_NAME,SfxResId(STR_ACTION_SORT_NAME).toString());
+mpActionMenu-SetSelectHdl(LINK(this,SfxTemplateManagerDlg,MenuSelectHdl));
+
// Calculate toolboxs size and positions
Size aWinSize = GetOutputSize();
Size aViewSize = mpViewBar-CalcMinimumWindowSizePixel();
@@ -92,11 +96,13 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg (Window
*parent)
// Set toolbox button bits
mpViewBar-SetItemBits(TBI_TEMPLATE_CREATE, TIB_DROPDOWNONLY);
+mpActionBar-SetItemBits(TBI_TEMPLATE_ACTION, TIB_DROPDOWNONLY);
// Set toolbox handlers
mpViewBar-SetClickHdl(LINK(this,SfxTemplateManagerDlg,TBXViewHdl));
mpViewBar-SetDropdownClickHdl(LINK(this,SfxTemplateManagerDlg,TBXDropdownHdl));
mpActionBar-SetClickHdl(LINK(this,SfxTemplateManagerDlg,TBXActionHdl));
+
mpActionBar-SetDropdownClickHdl(LINK(this,SfxTemplateManagerDlg,TBXDropdownHdl));
