[Bug 30425] Making Icon Themes is Far too Difficult
https://bugs.freedesktop.org/show_bug.cgi?id=30425 --- Comment #8 from Andrew --- Proposed workflow, taking advantage of links.txt to remap icon references at runtime: After creating a canonical icon, and searching source for references to the duplicate .png icon file… 1. No reference found in source: - ICON - Delete redundant png file. - SOURCE - No action required. - LINKS - aLink - Remove any old links. Add link to canonical icon to be safe. Tag: '#unreferenced' for future removal. - LINKS - aOriginal - Replace any references, to point to the canonical icon. - LOG - Note: 'No source reference found for icon. Complete link removal after further investigations'. 2. Referenced only by full path: - ICON - Delete redundant png file. - SOURCE - Modify source reference, so that the full path points to new canonical icon. - LINKS - aLink - Remove any old links (every theme should have the canonical icon, or fallback to Galaxy icon thru packimages build script). - LINKS - aOriginal - Replace any references, to point to the canonical icon. - LOG - None required. 3. Referenced by .uno:Controller: - ICON - Delete redundant png file. - SOURCE - Do not change any .uno:Command function names or code. Safe to modify other source references with the full path to the canonical icon. - LINKS - aLink - Remove any old links. Add link to canonical icon. Tag: '#command123', where '123' is the number of uno references found (for sorting). - LINKS - aOriginal - Replace any references, to point to the canonical icon. - LOG - Note: 'Referenced by .uno:Command. Icon name maintained through links.txt'. 4. Referenced by ImageList index: - ICON - Delete redundant png file. - SOURCE - Do not change any index numbers, reference or code. Safe to modify other source references with the full path to the canonical icon. - LINKS - aLink - Remove any old links. Add link to canonical icon. Tag: '#imagelist', for future fixing / removal. - LINKS - aOriginal - Replace any references, to point to the canonical icon. - LOG - Note: 'Referenced by ImageList index. Icon name maintained through links.txt'. It is unlikely an icon will fall under both types 3 & 4. Also... - Fix Copyright notices to include new Canonical name after original, i.e. 'X.png' becomes 'X.png (> Y.png)'. CopyrightsHuman CopyrightsTango CopyrightsOxygen. - Change any references in helpcontent2 (Modify source reference, so that the full path points to new canonical icon.) - Fix filenames of SVG files and inside(?) (e.g 'select.svg' inside 'Select.SVG' ?). - Other references within svg files used to build icon sets. Push to Gerrit: 1) Main changes to LibO source. 2) Updates to helpcontent2 Pull request on Github: 3) SVG (& links.txt?) changes to Sifr theme 4) SVG & links.txt changes to Tango-experimental theme -- 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: [Libreoffice-ux-advise] LibreCalc Dev Projects
Hi Ian, as far as I know, nobody is working on this currently. Of course you can add the functionality yourself. This should help you get started with Development: https://wiki.documentfoundation.org/Development And this might be a good code entry point: http://opengrok.libreoffice.org/xref/core/sc/source/ui/miscdlgs/sharedocdlg.cxx#76 This List is for UX topics. You should write to the Developers list (libreoffice@lists.freedesktop.org) in future. I have included them in CC. Samuel Am 11.02.2014 22:30, schrieb Ian Smith: To whom it may concern: I am a software developer at a shipping/logistics company. Currently the company uses Excel for spreadshiting. I am attempting a LibreCalc coup, but I need help! The functionality of shared spreadsheets in LibreC is ideal, with one gleaming exception: shared spreadsheets do not allow color formatting of cells. Specifically, we need multiple users to be able format the background color of cells in a shared LibreCalc document). Currently this is not possible.(?) 1) are there any dev plans in the works to create this functionality ? 2) would it be possible to modify the source code to create this functionality myself? I use Arch Linux at work. Windows 7 at home. I have an intermediate understanding of Git, a basic understanding of C++, and extensive Python experience. Suggestions please! (If I have sent this query to the wrong location, please advise me as to the correct one). Cheers, Iman ___ Libreoffice-ux-advise mailing list libreoffice-ux-adv...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-ux-advise ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ANN] LIbreOffice 4.2.1 RC1 available
Dear Community, The Document Foundation is pleased to announce the first release candidate of LibreOffice 4.2.1. The upcoming 4.2.1 will be the first in a sequence of frequent bugfix release for our feature-packed 4.2 line. Please be aware that LibreOffice 4.2.1 RC1 is not been flagged as ready for production use yet, however feel free to give it a try instead of 4.2.0. Conservative users should continue to use LibreOffice 4.1.5 The release is available for Windows, Linux and Mac OS X from our QA builds download page at http://www.libreoffice.org/download/pre-releases/ LibreOffice 4.2.1 RC1 is also available in a 64bit version for Mac OS X 10.8 (or newer) Developers and QA might also be interested in the symbol server for windows debug information (see the release notes linked below for details) Should you find bugs, please report them to the FreeDesktop Bugzilla: https://bugs.freedesktop.org A good way to assess the release candidate quality is to run some specific manual tests on it, our TCM wiki page has more details: http://wiki.documentfoundation.org/QA/Testing/Regression_Tests#Full_Regression_Test For other ways to get involved with this exciting project - you can e.g. contribute code: http://www.libreoffice.org/get-involved/developers/ translate LibreOffice to your language: http://wiki.documentfoundation.org/LibreOffice_Localization_Guide or help with funding our operations: http://donate.libreoffice.org/ A list of known issues and fixed bugs with 4.2.1 RC1 is available from our wiki: http://wiki.documentfoundation.org/Releases/4.2.1/RC1 Let us close again with a BIG Thank You! to all of you having contributed to the LibreOffice project - this release would not have been possible without your help. On behalf of the Community, Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 64573] Photo Album: Add Captions feature
https://bugs.freedesktop.org/show_bug.cgi?id=64573 --- Comment #5 from Kunal Arora --- Hi Samuel, i did make the checkbox in photoalbum.ui but i am not sure how to implement the caption feature , it would be really helpful if you could provide me some pointers on how to implemnt the same. -- 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 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Samuel M. changed: What|Removed |Added Depends on||56394 --- Comment #141 from Samuel M. --- Nominating Bug 56394 It's almost impossible to open that specifix XLSX file. -- 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 64573] Photo Album: Add Captions feature
https://bugs.freedesktop.org/show_bug.cgi?id=64573 --- Comment #6 from Samuel M. --- Maybe someone else from the developers can help out? (Dev List is in CC) -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - vcl/source
vcl/source/app/svapp.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 9c8dbca600bcb32f2d9888e1a15f7d415ac5526d
Author: Yuri Dario
Date: Sat Feb 15 12:26:49 2014 +
#i107914# also OS/2 is a non-Windows platform, fix build break.
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 3d4f1bf..e8eb02f 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -2060,8 +2060,8 @@ sal_Bool InitAccessBridge( sal_Bool bShowCancel, sal_Bool
&rCancelled )
{
sal_Bool bRet = true;
-// Disable Java bridge on UNIX
-#if defined UNX
+// Disable Java bridge on UNIX and OS/2
+#ifndef WNT
(void) bShowCancel; // unsued
(void) rCancelled; // unused
#else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/possizetabpage.ui |1 - 1 file changed, 1 deletion(-) New commits: commit 7c7bddc9bb22088110544343e41cc185c615ab28 Author: Tomaž Vajngerl Date: Sat Feb 15 15:29:02 2014 +0100 fdo#72967 Draw position size tab - min size is 0 not 1 (mm) Adjustment for size of an object had the minimum set to 1 (mm) instead of 0. Change-Id: I7d4c0998d2987448cea0fd7934649c02a513ac06 diff --git a/cui/uiconfig/ui/possizetabpage.ui b/cui/uiconfig/ui/possizetabpage.ui index 65d83ef..25c48cb 100644 --- a/cui/uiconfig/ui/possizetabpage.ui +++ b/cui/uiconfig/ui/possizetabpage.ui @@ -500,7 +500,6 @@ 10 -1 100 1 10 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sc/inc sc/qa sc/source
sc/inc/tokenstringcontext.hxx |1
sc/qa/unit/data/ods/formula-quote-in-sheet-name.ods |binary
sc/qa/unit/subsequent_export-test.cxx | 26
sc/source/core/tool/compiler.cxx|1
sc/source/core/tool/tokenstringcontext.cxx |6
sc/source/filter/xml/xmlexprt.cxx | 20 ++-
sc/source/filter/xml/xmlexprt.hxx |7 +
7 files changed, 54 insertions(+), 7 deletions(-)
New commits:
commit 9a5ce676ede4828db0acde5db79d91320575ec08
Author: Kohei Yoshida
Date: Sat Feb 15 10:12:52 2014 -0500
fdo#74512: Fix the ODS export as well.
Change-Id: I54a2b2f405f9172d2ec5646346ef4e8a7ae27cb2
diff --git a/sc/inc/tokenstringcontext.hxx b/sc/inc/tokenstringcontext.hxx
index 3740f60..aa61ada 100644
--- a/sc/inc/tokenstringcontext.hxx
+++ b/sc/inc/tokenstringcontext.hxx
@@ -56,6 +56,7 @@ class CompileFormulaContext
public:
CompileFormulaContext( ScDocument* pDoc );
+CompileFormulaContext( ScDocument* pDoc, formula::FormulaGrammar::Grammar
eGram );
formula::FormulaGrammar::Grammar getGrammar() const;
void setGrammar( formula::FormulaGrammar::Grammar eGram );
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 03be402..8835026 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -1612,6 +1612,7 @@ void ScCompiler::CheckTabQuotes( OUString& rString,
case FormulaGrammar::CONV_XL_A1 :
case FormulaGrammar::CONV_XL_R1C1 :
case FormulaGrammar::CONV_XL_OOX :
+case FormulaGrammar::CONV_ODF :
if( bNeedsQuote )
{
const OUString one_quote('\'');
diff --git a/sc/source/core/tool/tokenstringcontext.cxx
b/sc/source/core/tool/tokenstringcontext.cxx
index 841867e..31bca19 100644
--- a/sc/source/core/tool/tokenstringcontext.cxx
+++ b/sc/source/core/tool/tokenstringcontext.cxx
@@ -111,6 +111,12 @@ CompileFormulaContext::CompileFormulaContext( ScDocument*
pDoc ) :
updateTabNames();
}
+CompileFormulaContext::CompileFormulaContext( ScDocument* pDoc,
formula::FormulaGrammar::Grammar eGram ) :
+mpDoc(pDoc), meGram(eGram)
+{
+updateTabNames();
+}
+
void CompileFormulaContext::updateTabNames()
{
// Fetch all sheet names.
diff --git a/sc/source/filter/xml/xmlexprt.cxx
b/sc/source/filter/xml/xmlexprt.cxx
index f1d247c..fa4c440 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -63,6 +63,7 @@
#include
#include
#include
+#include
#include
#include
@@ -3177,21 +3178,26 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32
nEqualCellCount)
{
if (aCell.maBaseCell.meType == CELLTYPE_FORMULA)
{
-OUStringBuffer sFormula;
ScFormulaCell* pFormulaCell = aCell.maBaseCell.mpFormula;
if (!bIsMatrix || (bIsMatrix && bIsFirstMatrixCell))
{
-const formula::FormulaGrammar::Grammar eGrammar =
pDoc->GetStorageGrammar();
-sal_uInt16 nNamespacePrefix = (eGrammar ==
formula::FormulaGrammar::GRAM_ODFF ? XML_NAMESPACE_OF : XML_NAMESPACE_OOOC);
-pFormulaCell->GetFormula(sFormula, eGrammar);
-OUString sOUFormula(sFormula.makeStringAndClear());
+if (!mpCompileFormulaCxt)
+{
+const formula::FormulaGrammar::Grammar eGrammar =
pDoc->GetStorageGrammar();
+mpCompileFormulaCxt.reset(new
sc::CompileFormulaContext(pDoc, eGrammar));
+}
+
+OUString aFormula =
pFormulaCell->GetFormula(*mpCompileFormulaCxt);
+sal_uInt16 nNamespacePrefix =
+(mpCompileFormulaCxt->getGrammar() ==
formula::FormulaGrammar::GRAM_ODFF ? XML_NAMESPACE_OF : XML_NAMESPACE_OOOC);
+
if (!bIsMatrix)
{
-AddAttribute(sAttrFormula,
GetNamespaceMap().GetQNameByKey( nNamespacePrefix, sOUFormula, false ));
+AddAttribute(sAttrFormula,
GetNamespaceMap().GetQNameByKey(nNamespacePrefix, aFormula, false));
}
else
{
-AddAttribute(sAttrFormula,
GetNamespaceMap().GetQNameByKey( nNamespacePrefix, sOUFormula.copy(1,
sOUFormula.getLength() - 2), false ));
+AddAttribute(sAttrFormula,
GetNamespaceMap().GetQNameByKey(nNamespacePrefix, aFormula.copy(1,
aFormula.getLength()-2), false));
}
}
if (pFormulaCell->GetErrCode())
diff --git a/sc/source/filter/xml/xmlexprt.hxx
b/sc/source/filter/xml/xml
[Bug 63154] replace tools/solar.h macros with osl versions
https://bugs.freedesktop.org/show_bug.cgi?id=63154 --- Comment #51 from Commit Notification --- Alexandre Vicenzi committed a patch related to this issue. It has been pushed to "master": http://cgit.freedesktop.org/libreoffice/core/commit/?id=d024fe60dcb402e7ed8c8fa0ef623176f03c62c0 fdo#63154 Remove unused solar.h reference in sd. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sd/inc sd/source
sd/inc/glob.hxx |7 +--
sd/inc/sdmod.hxx | 29 -
sd/source/filter/eppt/eppt.hxx|5 -
sd/source/filter/eppt/epptdef.hxx |2 --
sd/source/filter/ppt/propread.hxx |8
sd/source/ui/app/sdresid.cxx |9 ++---
sd/source/ui/inc/AnimationChildWindow.hxx |2 +-
sd/source/ui/inc/ViewClipboard.hxx|2 +-
sd/source/ui/inc/assclass.hxx |1 -
sd/source/ui/sidebar/DocumentHelper.hxx |1 -
10 files changed, 17 insertions(+), 49 deletions(-)
New commits:
commit d024fe60dcb402e7ed8c8fa0ef623176f03c62c0
Author: Alexandre Vicenzi
Date: Fri Feb 14 22:36:19 2014 -0200
fdo#63154 Remove unused solar.h reference in sd.
Change-Id: I3dca2ffe3f94bedfea954bd83e84c724fb564ec9
Reviewed-on: https://gerrit.libreoffice.org/8063
Tested-by: LibreOffice gerrit bot
Reviewed-by: Marcos Souza
diff --git a/sd/inc/glob.hxx b/sd/inc/glob.hxx
index 4261774..7f19f42 100644
--- a/sd/inc/glob.hxx
+++ b/sd/inc/glob.hxx
@@ -20,11 +20,8 @@
#ifndef INCLUDED_SD_INC_GLOB_HXX
#define INCLUDED_SD_INC_GLOB_HXX
-#include
-
#include
-
-//--
+#include
#define SD_IF_SDAPP SFX_INTERFACE_SD_START + 0
#define SD_IF_SDDRAWDOCSHELLSFX_INTERFACE_SD_START + 1
@@ -83,8 +80,6 @@ const sal_uInt32 SdUDInventor=sal_uInt32('S')*0x0001+
#define SD_OPTION_MORPHING "Morph"
#define SD_OPTION_VECTORIZE "Vectorize"
-//--
-
#endif // _ INCLUDED_SD_INC_GLOB_HXX
diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx
index 4b37b4a..518f086 100644
--- a/sd/inc/sdmod.hxx
+++ b/sd/inc/sdmod.hxx
@@ -30,7 +30,7 @@
#include
#include
#include
-
+#include
#include
class SdOptions;
@@ -52,28 +52,23 @@ namespace com { namespace sun { namespace star { namespace
frame {
class XFrame;
} } } }
-
-// --
-// - SdOptionStreamMode -
-// --
-
enum SdOptionStreamMode
{
SD_OPTION_LOAD = 0,
SD_OPTION_STORE = 1
};
-/*
-|*
-|* This subclass of (which is a subclass of ) is
-|* linked to the DLL. One instance of this class exists while the DLL is
-|* loaded.
-|*
-|* SdModule is like to be compared with the -subclass.
-|*
-|* Remember: Don`t export this class! It uses DLL-internal symbols.
-|*
-\/
+/*
+
+ This subclass of (which is a subclass of ) is
+ linked to the DLL. One instance of this class exists while the DLL is
+ loaded.
+
+ SdModule is like to be compared with the -subclass.
+
+ Remember: Don`t export this class! It uses DLL-internal symbols.
+
+*/
class SdModule : public SfxModule, public SfxListener
{
diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx
index 8f9054b..d36957d 100644
--- a/sd/source/filter/eppt/eppt.hxx
+++ b/sd/source/filter/eppt/eppt.hxx
@@ -22,7 +22,6 @@
#include
#include "escherex.hxx"
#include
-#include
#include
#include
#include
@@ -31,8 +30,6 @@
#include "text.hxx"
-//
-
#include
#include
#include
@@ -156,8 +153,6 @@ public:
voidWriteTextSpecInfo( SvStream* pStrm );
};
-//
-
struct CellBorder;
class PPTWriter : public PPTWriterBase, public PPTExBulletProvider
{
diff --git a/sd/source/filter/eppt/epptdef.hxx
b/sd/source/filter/eppt/epptdef.hxx
index 73cebe4..fbe824c 100644
--- a/sd/source/filter/eppt/epptdef.hxx
+++ b/sd/source/filter/eppt/epptdef.hxx
@@ -20,8 +20,6 @@
#ifndef INCLUDED_SD_SOURCE_FILTER_EPPT_EPPTDEF_HXX
#define INCLUDED_SD_SOURCE_FILTER_EPPT_EPPTDEF_HXX
-#include
-
#define EPP_FLAG_CONTAINER 0x0F // If the version field of a record
// header takes on this value, the
// record header marks the start of
diff --git a/sd/source/filter/ppt/propread.hxx
b/sd/source/filter/ppt/propread.hxx
index 0325a8f..c5f6512 100644
--- a/sd/source/filter/ppt/propread.hxx
+++ b/sd/source/filter/ppt/propread.hxx
@@ -24,7 +24,6 @@
#include
#include
-#include
#include
#include
@@ -96,8 +95,6 @@
#define VT_BYREF0x4000
#define VT_TYPEMASK 0xFFF
-//
-
typedef std::map Dictionary;
struct PropEntry
@@ -129,8 +126,6 @@ class PropItem : public SvMemoryStream
using SvStream::Read;
};
-//
-
class Section
{
sal_uInt16 mnTextEnc;
@@
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 tommy27 changed: What|Removed |Added See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=75025 -- 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 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 tommy27 changed: What|Removed |Added See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=75025 -- 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 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 tommy27 changed: What|Removed |Added See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=75025 -- 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
mab4.3 page created
see it here: https://bugs.freedesktop.org/show_bug.cgi?id=75025 it should collect only those bugs which appear in current 4.3 master branch ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 tommy27 changed: What|Removed |Added Depends on|34467 | -- 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 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 tommy27 changed: What|Removed |Added Depends on||34467 -- 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 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Bug 54157 depends on bug 53410, which changed state. Bug 53410 Summary: UI: Installation directory path and disk space button are disabled if excluded components are selected https://bugs.freedesktop.org/show_bug.cgi?id=53410 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WONTFIX -- 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 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 tommy27 changed: What|Removed |Added CC||libreoffice@lists.freedeskt ||op.org -- 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 30732] Character formatting not retained in entries of TOC, table lists, etc.
https://bugs.freedesktop.org/show_bug.cgi?id=30732 Regina Henschel changed: What|Removed |Added CC||arendhoogev...@gmail.com --- Comment #22 from Regina Henschel --- *** Bug 75021 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/core/data/dociter.cxx | 388
1 file changed, 280 insertions(+), 108 deletions(-)
New commits:
commit ff53d15a6633b1188e97b8b15a71190f072afeea
Author: Kohei Yoshida
Date: Thu Feb 13 14:45:47 2014 -0500
fdo#74558: Re-implement BinarySearch() to disregard empty cell blocks.
The old code before the calc core refactoring took advantage of the old
calc storage which did not store empty cells at all. The new storage does
"store" empty cell blocks, and it did negatively affect the binary search
used for VLOOKUP. The revised binary search code properly skips empty cell
blocks so that it will work more like the old algorithm in 4.1.
This change also fixes fdo#72348, which was caused by the same root cause.
Change-Id: Ic20cc54d8dae26b62f5e9193cd21dad06ad10a3e
(cherry picked from commit 377d749ff8211fa9e69d47a92810af9bc0652990)
Reviewed-on: https://gerrit.libreoffice.org/8042
Reviewed-by: Norbert Thiebaud
Tested-by: Norbert Thiebaud
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index d93ee06..5758c52 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -62,6 +62,14 @@ void incBlock(std::pair<_Iter, size_t>& rPos)
}
template
+void decBlock(std::pair<_Iter, size_t>& rPos)
+{
+// Move to the last element of the previous block.
+--rPos.first;
+rPos.second = rPos.first->size - 1;
+}
+
+template
void incPos(std::pair<_Iter, size_t>& rPos)
{
if (rPos.second + 1 < rPos.first->size)
@@ -1434,6 +1442,204 @@ bool ScQueryCellIterator::FindEqualOrSortedLastInRange(
SCCOL& nFoundCol,
return (nFoundCol <= MAXCOL) && (nFoundRow <= MAXROW);
}
+namespace {
+
+/**
+ * This class sequentially indexes non-empty cells in order, from the top of
+ * the block where the start row position is, to the bottom of the block
+ * where the end row position is. It skips all empty blocks that may be
+ * present in between.
+ *
+ * The index value is an offset from the first element of the first block
+ * disregarding all empty cell blocks.
+ */
+class NonEmptyCellIndexer
+{
+typedef std::map BlockMapType;
+
+BlockMapType maBlockMap;
+
+const sc::CellStoreType& mrCells;
+SCROW mnStartRow;
+SCROW mnEndRow;
+
+size_t mnLowIndex;
+size_t mnHighIndex;
+
+bool mbValid;
+
+public:
+
+typedef std::pair CellType;
+
+/**
+ * @param rCells cell storage container
+ * @param nStartRow logical start row position
+ * @param nEndRow logical end row position, inclusive.
+ * @param bSkipTopStrBlock when true, skip all leading string cells.
+ */
+NonEmptyCellIndexer(
+const sc::CellStoreType& rCells, SCROW nStartRow, SCROW nEndRow, bool
bSkipTopStrBlock ) :
+mrCells(rCells), mnStartRow(nStartRow), mnEndRow(nEndRow),
mnLowIndex(0), mnHighIndex(0), mbValid(true)
+{
+if (nEndRow < nStartRow)
+{
+mbValid = false;
+return;
+}
+
+// Find the low position.
+
+sc::CellStoreType::const_position_type aLoPos =
mrCells.position(nStartRow);
+if (aLoPos.first->type == sc::element_type_empty)
+incBlock(aLoPos);
+
+if (aLoPos.first == rCells.end())
+{
+mbValid = false;
+return;
+}
+
+if (bSkipTopStrBlock)
+{
+// Skip all leading string or empty blocks.
+while (aLoPos.first->type == sc::element_type_string ||
+ aLoPos.first->type == sc::element_type_edittext ||
+ aLoPos.first->type == sc::element_type_empty)
+{
+incBlock(aLoPos);
+if (aLoPos.first == rCells.end())
+{
+mbValid = false;
+return;
+}
+}
+}
+
+SCROW nFirstRow = aLoPos.first->position;
+SCROW nLastRow = aLoPos.first->position + aLoPos.first->size - 1;
+
+if (nFirstRow > nEndRow)
+{
+// Both start and end row positions are within the leading skipped
+// blocks.
+mbValid = false;
+return;
+}
+
+// Calculate the index of the low position.
+if (nFirstRow < nStartRow)
+mnLowIndex = nStartRow - nFirstRow;
+else
+{
+// Start row is within the skipped block(s). Set it to the first
+// element of the low block.
+mnLowIndex = 0;
+}
+
+if (nEndRow < nLastRow)
+{
+assert(nEndRow > nFirstRow);
+mnHighIndex = nEndRow - nFirstRow;
+
+maBlockMap.insert(BlockMapType::value_type(aLoPos.first->size,
aLoPos.first));
+return;
+}
+
+// Find the high position.
+
+sc::CellStoreType::const_position_type aHiPos =
mrCells.position(aLoPos.first, nEn
License Statement
Hey there, I hereby declare that all my contributions to LibreOffice, that are yet to come or were already made are licensed under LGPL3+/GPL3+/MPL1.1+. The same applies to my past contributions to the OpenOffice.org project between 2004 and 2007. -- Mit freundlichen Grüßen/best regards Christian Junker ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 62475] Remove pointless comments and ASCII art
https://bugs.freedesktop.org/show_bug.cgi?id=62475 Commit Notification changed: What|Removed |Added Whiteboard|EasyHack DifficultyBeginner |EasyHack DifficultyBeginner |target:4.1.0 target:4.2.0 |target:4.1.0 target:4.2.0 ||target:4.3.0 --- Comment #28 from Commit Notification --- Philipp Riemer committed a patch related to this issue. It has been pushed to "master": http://cgit.freedesktop.org/libreoffice/core/commit/?id=0ffc090d80707017f5f590c43be6c25184298a93 fdo#62475 - remove visual noise The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapper.cxx |4 -
writerfilter/source/doctok/resources.xmi | 62 -
writerfilter/source/ooxml/model.xml|4 -
writerfilter/source/rtftok/rtfdocumentimpl.cxx |8 +--
4 files changed, 8 insertions(+), 70 deletions(-)
New commits:
commit 90e2bdcdcca64e72cb0a82d4decfd17f134e7496
Author: Miklos Vajna
Date: Sat Feb 15 20:15:10 2014 +0100
writerfilter: sprm:PI{lvl,lfo} -> ooxml:CT_NumPr_{ilvl,numId}
Change-Id: I96cdf20d3ef53bda100dd2d06a18b74d374bab42
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 4e81336..229da91 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -995,7 +995,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm,
PropertyMapPtr rContext, SprmType
case NS_sprm::LN_PFPageBreakBefore:
rContext->Insert(PROP_BREAK_TYPE, uno::makeAny(
com::sun::star::style::BreakType_PAGE_BEFORE ) );
break; // sprmPFPageBreakBefore
-case NS_sprm::LN_PIlvl: // sprmPIlvl
+case NS_ooxml::LN_CT_NumPr_ilvl:
if (nIntValue < 0 || 10 <= nIntValue) // Writer can't do everything
{
SAL_INFO("writerfilter",
@@ -1012,7 +1012,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm,
PropertyMapPtr rContext, SprmType
else
rContext->Insert( PROP_NUMBERING_LEVEL, uno::makeAny(
(sal_Int16)nIntValue ));
break;
-case NS_sprm::LN_PIlfo: // sprmPIlfo
+case NS_ooxml::LN_CT_NumPr_numId:
{
//convert the ListTable entry to a NumberingRules propery and
apply it
ListsManager::Pointer pListTable = m_pImpl->GetListTable();
diff --git a/writerfilter/source/doctok/resources.xmi
b/writerfilter/source/doctok/resources.xmi
index 7369806..c9653fa 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -193,68 +193,6 @@
-
-
-
-
-
-
-
- 0x260A
-
-
-
-
-
-
-
-
rtf:sprmPIlvl
-
-
-
-
-
-
-
- paragraph
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0x460B
-
-
-
-
-
-
-
-
rtf:sprmPIlfo
-
-
-
-
-
-
-
- paragraph
-
-
-
-
-
-
-
diff --git a/writerfilter/source/ooxml/model.xml
b/writerfilter/source/ooxml/model.xml
index 562a6d8..058b761 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -22307,8 +22307,8 @@
-
-
+
+
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 5773981..c6f5a999 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3169,7 +3169,7 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword,
int nParam)
}
break;
case RTF_ILVL:
-lcl_putNestedSprm(m_aStates.top().aParagraphSprms,
NS_ooxml::LN_CT_PPrBase_numPr, NS_sprm::LN_PIlvl, pIntValue);
+lcl_putNestedSprm(m_aStates.top().aParagraphSprms,
NS_ooxml::LN_CT_PPrBase_numPr, NS_ooxml::LN_CT_NumPr_ilvl, pIntValue);
break;
case RTF_LISTTEMPLATEID:
// This one is not referenced anywhere, so it's pointless to store
it at the moment.
@@ -3187,7 +3187,7 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword,
int nParam)
if (m_aStates.top().nDestinationState ==
DESTINATION_LISTOVERRIDEENTRY)
m_aStates.top().aTableAttributes.set(NS_ooxml::LN_CT_AbstractNum_nsid,
pIntValue);
else
-lcl_putNestedSprm(m_aStates.top().aParagraphSprms,
NS_ooxml::LN_CT_PPrBase_tabs, NS_sprm::LN_PIlfo, pIntValue);
+lcl_putNestedSprm(m_aStates.top().aParagraphSprms,
NS_ooxml::LN_CT_PPrBase_tabs, NS_ooxml::LN_CT_NumPr_numId, pIntValue);
}
break;
case RTF_UC:
@@ -4730,8 +4730,8 @@ int RTFDocumentImpl::popState()
Mapper().table(NS_ooxml::LN_NUMBERING, pTable);
// Use it
-lcl_putNestedSprm(m_aStates.top().aParagraphSprm
[Libreoffice-commits] core.git: sw/source
sw/source/core/docnode/swthreadmanager.cxx |2 sw/source/core/docnode/threadlistener.cxx |2 sw/source/core/docnode/threadmanager.cxx|2 sw/source/core/frmedt/feshview.cxx |4 - sw/source/core/inc/ifinishedthreadlistener.hxx |2 sw/source/core/inc/ithreadlistenerowner.hxx |2 sw/source/core/inc/layfrm.hxx |2 sw/source/core/inc/observablethread.hxx |6 - sw/source/core/inc/retrievedinputstreamdata.hxx |2 sw/source/core/inc/retrieveinputstream.hxx |2 sw/source/core/inc/rootfrm.hxx |2 sw/source/core/inc/setmapvirtdev.hxx|2 sw/source/core/inc/swthreadjoiner.hxx |5 - sw/source/core/inc/threadlistener.hxx |2 sw/source/core/inc/threadmanager.hxx| 10 -- sw/source/core/inc/txtfrm.hxx |8 -- sw/source/core/layout/anchoreddrawobject.cxx| 12 --- sw/source/core/layout/anchoredobject.cxx| 40 -- sw/source/core/layout/atrfrm.cxx|4 - sw/source/core/layout/findfrm.cxx |8 -- sw/source/core/layout/flowfrm.cxx | 12 --- sw/source/core/layout/fly.cxx |4 - sw/source/core/layout/frmtool.cxx |6 - sw/source/core/layout/ftnfrm.cxx|2 sw/source/core/layout/objectformatter.cxx | 20 - sw/source/core/layout/objectformatterlayfrm.cxx |2 sw/source/core/layout/objectformatterlayfrm.hxx |2 sw/source/core/layout/paintfrm.cxx | 22 - sw/source/core/layout/virtoutp.cxx |2 sw/source/core/objectpositioning/anchoredobjectposition.cxx | 29 --- sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx | 39 + sw/source/core/objectpositioning/environmentofanchoredobject.cxx|8 -- sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx |5 - sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx | 10 -- sw/source/core/text/frmcrsr.cxx |2 sw/source/core/text/porlay.hxx |2 36 files changed, 16 insertions(+), 270 deletions(-) New commits: commit 13dffbb750ef65bfb06f0f9f96bce2e40512539f Author: Philipp Riemer Date: Sat Feb 15 21:50:52 2014 +0100 fdo#51304: Remove @author annotation in sw/source/core Change-Id: I4d4eb9758e1aebcdd37fe38671d60f1713487119 diff --git a/sw/source/core/docnode/swthreadmanager.cxx b/sw/source/core/docnode/swthreadmanager.cxx index d96daea..365a8f6 100644 --- a/sw/source/core/docnode/swthreadmanager.cxx +++ b/sw/source/core/docnode/swthreadmanager.cxx @@ -25,8 +25,6 @@ /** class to manage threads in Writer - it conforms the singleton pattern #i73788# - -@author OD */ bool SwThreadManager::mbThreadManagerInstantiated = false; diff --git a/sw/source/core/docnode/threadlistener.cxx b/sw/source/core/docnode/threadlistener.cxx index be1b514..6f82a83 100644 --- a/sw/source/core/docnode/threadlistener.cxx +++ b/sw/source/core/docnode/threadlistener.cxx @@ -21,8 +21,6 @@ /** helper class to observe threads #i73788# - -@author OD */ ThreadListener::ThreadListener( IThreadListenerOwner& rThreadListenerOwner ) : IFinishedThreadListener(), diff --git a/sw/source/core/docnode/threadmanager.cxx b/sw/source/core/docnode/threadmanager.cxx index d963206..2f43f77 100644 --- a/sw/source/core/docnode/threadmanager.cxx +++ b/sw/source/core/docnode/threadmanager.cxx @@ -25,8 +25,6 @@ using namespace ::com::sun::star; /** class to manage threads #i73788# - -@author OD */ const std::deque< ThreadManager::tThreadData >::size_type ThreadManager::mnStartedSize = 10; diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx index 1e0311c..6cc5150 100644 --- a/sw/source/core/frmedt/feshview.cxx +++ b/sw/source/core/frmedt/feshview.cxx @@ -3022,8 +3022,6 @@ long SwFEShell::GetSectionWidth( SwFmt& rFmt ) const color COL_BLACK (default color on constructing object of class Color) is returned. -@author OD - @returns an object of class Color */ const Color SwFEShell::GetShapeBackgrd() const @@ -3071,8 +3069,6 @@ const Color SwFEShell::GetShapeBackgrd() const horizontal text di
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Björn Michaelsen changed: What|Removed |Added Depends on||74979 --- Comment #92 from Björn Michaelsen --- nominating 74979: seems to corrupt ~all sxc files on either load or safe, regression, 2 downstream dupes, one fdo dupe. -- 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 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 --- Comment #93 from Kohei Yoshida --- (In reply to comment #92) > nominating 74979: seems to corrupt ~all sxc files on either load or safe, > regression, 2 downstream dupes, one fdo dupe. sxc export has been removed on master, it's an ancient format superceded by .ods. Is this really worth a MAB? I think not. -- 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 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Kohei Yoshida changed: What|Removed |Added Depends on|74979 | -- 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 41883] MinGW port Most Annoying Bugs
https://bugs.freedesktop.org/show_bug.cgi?id=41883 Bug 41883 depends on bug 63669, which changed state. Bug 63669 Summary: MinGW: Tinderbox @7 does not deliver 4.1 Master builds https://bugs.freedesktop.org/show_bug.cgi?id=63669 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WONTFIX -- 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 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Bug 54157 depends on bug 40594, which changed state. Bug 40594 Summary: FILEOPEN .docx (MSO2010) does not show CHART object https://bugs.freedesktop.org/show_bug.cgi?id=40594 What|Removed |Added Status|VERIFIED|REOPENED Resolution|FIXED |--- -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/chart-opengl' - 3 commits - chart2/source
chart2/source/view/inc/DummyXShape.hxx |7 +++
chart2/source/view/main/DummyXShape.cxx| 49 ++---
chart2/source/view/main/OpenGLRender.cxx |9 +++-
chart2/source/view/main/OpenGLRender.hxx |2 +
chart2/source/view/main/OpenglShapeFactory.cxx |2 -
5 files changed, 60 insertions(+), 9 deletions(-)
New commits:
commit 6d08e1f572b364d4174ba9d663708b7f9ec26139
Author: Markus Mohrhard
Date: Sun Feb 16 02:53:17 2014 +0100
text position for legend improvements
Change-Id: I06d8baf8cfe5cd6b417fc6e70c1bd6eede27
diff --git a/chart2/source/view/inc/DummyXShape.hxx
b/chart2/source/view/inc/DummyXShape.hxx
index 3a9dccb..45f6dc4 100644
--- a/chart2/source/view/inc/DummyXShape.hxx
+++ b/chart2/source/view/inc/DummyXShape.hxx
@@ -332,13 +332,18 @@ class DummyText : public DummyXShape
{
public:
DummyText(const OUString& rText, const tNameSequence& rNames,
-const tAnySequence& rValues, const uno::Any& rTrans );
+const tAnySequence& rValues, const uno::Any& rTrans,
com::sun::star::uno::Reference<
+com::sun::star::drawing::XShapes > xTarget);
virtual void render() SAL_OVERRIDE;
virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName,
const ::com::sun::star::uno::Any& aValue )
throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::beans::PropertyVetoException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
+virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point&
aPosition ) throw(::com::sun::star::uno::RuntimeException);
+
private:
+void setTransformatAsProperty(const
com::sun::star::drawing::HomogenMatrix3& rMatrix);
+
OUString maText;
uno::Any maTrans;
BitmapEx maBitmap;
diff --git a/chart2/source/view/main/DummyXShape.cxx
b/chart2/source/view/main/DummyXShape.cxx
index f71db06..88b6ad9 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -714,7 +714,7 @@ private:
}
DummyText::DummyText(const OUString& rText, const tNameSequence& rNames,
-const tAnySequence& rValues, const uno::Any& rTrans ):
+const tAnySequence& rValues, const uno::Any& rTrans, uno::Reference<
drawing::XShapes > xTarget ):
maText(rText),
maTrans(rTrans)
{
@@ -744,12 +744,25 @@ DummyText::DummyText(const OUString& rText, const
tNameSequence& rNames,
setPosition(awt::Point(aTrans.Line1.Column3, aTrans.Line2.Column3));
aTrans.Line1.Column1 = 20 * bmpWidth;
aTrans.Line2.Column2 = 20 * bmpHeight;
-uno::Any aNewTrans;
-aNewTrans <<= aTrans;
-setPropertyValue("Transformation", aNewTrans);
+setTransformatAsProperty(aTrans);
}
else
+{
setSize(awt::Size(20*bmpWidth, 20*bmpHeight));
+uno::Reference< drawing::XShape > xTargetShape(xTarget,
uno::UNO_QUERY);
+drawing::HomogenMatrix3 aTrans;
+aTrans.Line1.Column1 = 20 * bmpWidth;
+aTrans.Line2.Column2 = 20 * bmpHeight;
+aTrans.Line3.Column3 = 1;
+if(xTargetShape.is())
+{
+const awt::Point rPoint = xTargetShape->getPosition();
+setPosition(rPoint);
+aTrans.Line1.Column3 = rPoint.X;
+aTrans.Line2.Column3 = rPoint.Y;
+}
+setTransformatAsProperty(aTrans);
+}
}
void DummyText::render()
@@ -788,6 +801,34 @@ void DummyText::setPropertyValue( const OUString& rName,
const uno::Any& rValue)
DummyXShape::setPropertyValue(rName, rValue);
}
+void DummyText::setPosition(const awt::Point& rPosition )
+throw(uno::RuntimeException)
+{
+DummyXShape::setPosition(rPosition);
+if(maTrans.hasValue())
+return;
+
+std::map::const_iterator itr =
+maProperties.find("Transformation");
+if(itr != maProperties.end())
+{
+if(itr->second.hasValue())
+{
+drawing::HomogenMatrix3 aTrans =
itr->second.get();
+aTrans.Line1.Column3 = rPosition.X;
+aTrans.Line2.Column3 = rPosition.Y;
+setTransformatAsProperty(aTrans);
+}
+}
+}
+
+void DummyText::setTransformatAsProperty(const drawing::HomogenMatrix3&
rMatrix)
+{
+uno::Any aNewTrans;
+aNewTrans <<= rMatrix;
+setPropertyValue("Transformation", aNewTrans);
+}
+
DummyFormattedText::DummyFormattedText(uno::Sequence< uno::Reference<
chart2::XFormattedString > >& rFormattedString):
maFormattedString(rFormattedString)
diff --git a/chart2/source/view/main/OpenglShapeFactory.cxx
b/chart2/source/view/main/OpenglShapeFactory.cxx
index c2ae65d..5b19a5b 100644
--- a/chart2/source/view/main/OpenglShapeFactory.cxx
+++ b/chart2/source/view/main/OpenglShapeFactory.cxx
@@ -401,7 +401,7 @@ uno::Reference< drawing::XShape >
, const uno::Any& rATransf
[Libreoffice-commits] core.git: 3 commits - chart2/source
chart2/source/view/inc/DummyXShape.hxx |7 +++
chart2/source/view/main/DummyXShape.cxx| 49 ++---
chart2/source/view/main/OpenGLRender.cxx |9 +++-
chart2/source/view/main/OpenGLRender.hxx |2 +
chart2/source/view/main/OpenglShapeFactory.cxx |2 -
5 files changed, 60 insertions(+), 9 deletions(-)
New commits:
commit 24f51d315cd75715cb57709a86c7470c42dbb595
Author: Markus Mohrhard
Date: Sun Feb 16 02:53:17 2014 +0100
text position for legend improvements
Change-Id: I06d8baf8cfe5cd6b417fc6e70c1bd6eede27
diff --git a/chart2/source/view/inc/DummyXShape.hxx
b/chart2/source/view/inc/DummyXShape.hxx
index 3a9dccb..45f6dc4 100644
--- a/chart2/source/view/inc/DummyXShape.hxx
+++ b/chart2/source/view/inc/DummyXShape.hxx
@@ -332,13 +332,18 @@ class DummyText : public DummyXShape
{
public:
DummyText(const OUString& rText, const tNameSequence& rNames,
-const tAnySequence& rValues, const uno::Any& rTrans );
+const tAnySequence& rValues, const uno::Any& rTrans,
com::sun::star::uno::Reference<
+com::sun::star::drawing::XShapes > xTarget);
virtual void render() SAL_OVERRIDE;
virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName,
const ::com::sun::star::uno::Any& aValue )
throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::beans::PropertyVetoException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
+virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point&
aPosition ) throw(::com::sun::star::uno::RuntimeException);
+
private:
+void setTransformatAsProperty(const
com::sun::star::drawing::HomogenMatrix3& rMatrix);
+
OUString maText;
uno::Any maTrans;
BitmapEx maBitmap;
diff --git a/chart2/source/view/main/DummyXShape.cxx
b/chart2/source/view/main/DummyXShape.cxx
index 478226c..134d6cc 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -714,7 +714,7 @@ private:
}
DummyText::DummyText(const OUString& rText, const tNameSequence& rNames,
-const tAnySequence& rValues, const uno::Any& rTrans ):
+const tAnySequence& rValues, const uno::Any& rTrans, uno::Reference<
drawing::XShapes > xTarget ):
maText(rText),
maTrans(rTrans)
{
@@ -744,12 +744,25 @@ DummyText::DummyText(const OUString& rText, const
tNameSequence& rNames,
setPosition(awt::Point(aTrans.Line1.Column3, aTrans.Line2.Column3));
aTrans.Line1.Column1 = 20 * bmpWidth;
aTrans.Line2.Column2 = 20 * bmpHeight;
-uno::Any aNewTrans;
-aNewTrans <<= aTrans;
-setPropertyValue("Transformation", aNewTrans);
+setTransformatAsProperty(aTrans);
}
else
+{
setSize(awt::Size(20*bmpWidth, 20*bmpHeight));
+uno::Reference< drawing::XShape > xTargetShape(xTarget,
uno::UNO_QUERY);
+drawing::HomogenMatrix3 aTrans;
+aTrans.Line1.Column1 = 20 * bmpWidth;
+aTrans.Line2.Column2 = 20 * bmpHeight;
+aTrans.Line3.Column3 = 1;
+if(xTargetShape.is())
+{
+const awt::Point rPoint = xTargetShape->getPosition();
+setPosition(rPoint);
+aTrans.Line1.Column3 = rPoint.X;
+aTrans.Line2.Column3 = rPoint.Y;
+}
+setTransformatAsProperty(aTrans);
+}
}
void DummyText::render()
@@ -788,6 +801,34 @@ void DummyText::setPropertyValue( const OUString& rName,
const uno::Any& rValue)
DummyXShape::setPropertyValue(rName, rValue);
}
+void DummyText::setPosition(const awt::Point& rPosition )
+throw(uno::RuntimeException)
+{
+DummyXShape::setPosition(rPosition);
+if(maTrans.hasValue())
+return;
+
+std::map::const_iterator itr =
+maProperties.find("Transformation");
+if(itr != maProperties.end())
+{
+if(itr->second.hasValue())
+{
+drawing::HomogenMatrix3 aTrans =
itr->second.get();
+aTrans.Line1.Column3 = rPosition.X;
+aTrans.Line2.Column3 = rPosition.Y;
+setTransformatAsProperty(aTrans);
+}
+}
+}
+
+void DummyText::setTransformatAsProperty(const drawing::HomogenMatrix3&
rMatrix)
+{
+uno::Any aNewTrans;
+aNewTrans <<= rMatrix;
+setPropertyValue("Transformation", aNewTrans);
+}
+
DummyFormattedText::DummyFormattedText(uno::Sequence< uno::Reference<
chart2::XFormattedString > >& rFormattedString):
maFormattedString(rFormattedString)
diff --git a/chart2/source/view/main/OpenglShapeFactory.cxx
b/chart2/source/view/main/OpenglShapeFactory.cxx
index c2ae65d..5b19a5b 100644
--- a/chart2/source/view/main/OpenglShapeFactory.cxx
+++ b/chart2/source/view/main/OpenglShapeFactory.cxx
@@ -401,7 +401,7 @@ uno::Reference< drawing::XShape >
, const uno::Any& rATransf
[Libreoffice-commits] core.git: chart2/source
chart2/source/view/inc/DummyXShape.hxx |2 -
chart2/source/view/main/DummyXShape.cxx | 64 +++-
2 files changed, 64 insertions(+), 2 deletions(-)
New commits:
commit 6454bb693413f4fbf5a1d309c67a78e1ea3f59c4
Author: Markus Mohrhard
Date: Sun Feb 16 04:30:43 2014 +0100
fix crash when dumping OpenGL dummy shapes
CTRL + F12 is working now partly for the OpenGL shapes
Change-Id: Ia4d0499d0df683202d9e2f56de96b22abcd9e367
diff --git a/chart2/source/view/inc/DummyXShape.hxx
b/chart2/source/view/inc/DummyXShape.hxx
index 45f6dc4..4783cf6 100644
--- a/chart2/source/view/inc/DummyXShape.hxx
+++ b/chart2/source/view/inc/DummyXShape.hxx
@@ -109,7 +109,7 @@ public:
DummyXShape();
// XNamed
-virtual OUString SAL_CALL getName( )
throw(::com::sun::star::uno::RuntimeException);
+virtual OUString SAL_CALL getName()
throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setName( const OUString& aName )
throw(::com::sun::star::uno::RuntimeException);
// XShape
diff --git a/chart2/source/view/main/DummyXShape.cxx
b/chart2/source/view/main/DummyXShape.cxx
index 134d6cc..44f1476 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -27,6 +27,7 @@
#include
#include
#include
+#include
#include
#include
@@ -35,6 +36,8 @@
#include
#include
+#include
+
#define ENABLE_DEBUG_PROPERTIES 0
using namespace com::sun::star;
@@ -45,6 +48,64 @@ namespace chart {
namespace dummy {
+class DummyPropertySetInfo : public cppu::WeakImplHelper1<
+com::sun::star::beans::XPropertySetInfo >
+{
+public:
+DummyPropertySetInfo(const std::map& rProps ):
+mrProperties(rProps) {}
+
+virtual sal_Bool hasPropertyByName( const OUString& rName )
+throw(uno::RuntimeException);
+
+virtual beans::Property getPropertyByName( const OUString& rName )
+throw(uno::RuntimeException, beans::UnknownPropertyException);
+
+virtual uno::Sequence< beans::Property > getProperties()
+throw(uno::RuntimeException);
+
+private:
+const std::map& mrProperties;
+};
+
+sal_Bool DummyPropertySetInfo::hasPropertyByName( const OUString& rName )
+throw(uno::RuntimeException)
+{
+return mrProperties.find(rName) != mrProperties.end();
+}
+
+beans::Property DummyPropertySetInfo::getPropertyByName( const OUString& rName
)
+throw(uno::RuntimeException, beans::UnknownPropertyException)
+{
+beans::Property aRet;
+if(mrProperties.find(rName) == mrProperties.end())
+throw beans::UnknownPropertyException();
+
+std::map::const_iterator itr =
mrProperties.find(rName);
+aRet.Name = rName;
+aRet.Type = itr->second.getValueType();
+
+return aRet;
+}
+
+uno::Sequence< beans::Property > DummyPropertySetInfo::getProperties()
+throw(uno::RuntimeException)
+{
+uno::Sequence< beans::Property > aRet(mrProperties.size());
+
+size_t i = 0;
+for(std::map::const_iterator itr =
mrProperties.begin(),
+itrEnd = mrProperties.end(); itr != itrEnd; ++itr, ++i)
+{
+beans::Property aProp;
+
+aProp.Name = itr->first;
+aProp.Type = itr->second.getValueType();
+aRet[i] = aProp;
+}
+return aRet;
+}
+
namespace {
struct PrintProperties
@@ -117,7 +178,7 @@ OUString DummyXShape::getShapeType()
uno::Reference< beans::XPropertySetInfo > DummyXShape::getPropertySetInfo()
throw(uno::RuntimeException)
{
-return uno::Reference< beans::XPropertySetInfo >();
+return new DummyPropertySetInfo(maProperties);
}
void DummyXShape::setPropertyValue( const OUString& rName, const uno::Any&
rValue)
@@ -798,6 +859,7 @@ void DummyText::setPropertyValue( const OUString& rName,
const uno::Any& rValue)
uno::RuntimeException)
{
SAL_WARN("chart2.opengl", "property value set after image has been
created");
+SAL_WARN("chart2.opengl", rName);
DummyXShape::setPropertyValue(rName, rValue);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
LibreOffice Gerrit News for core on 2014-02-16
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + fdo#63154 Remove unused solar.h reference in sw. in https://gerrit.libreoffice.org/8067 from Alexandre Vicenzi about module sw + fdo#74111 3D Rotation is wrong after Round trip for pie chart in https://gerrit.libreoffice.org/7718 from Priyanka Gaikwad about module chart2, oox End of freshness + Change semantics of GetGraphics in https://gerrit.libreoffice.org/8070 from Chris Sherlock about module vcl + Translate German comments in https://gerrit.libreoffice.org/8076 from Alexander Wilms about module chart2, sc, sw + fdo#72042: Fix for "Font names are not localized (Mac OS X)" in https://gerrit.libreoffice.org/8071 from Tomofumi Yagi about module vcl * Merged changes on master for project core changed in the last 25 hours: + fdo#63154 Remove unused solar.h reference in sd. in https://gerrit.libreoffice.org/8063 from Alexandre Vicenzi + fdo#74137: Fix for courruption of Pie chart after roundtrip. in https://gerrit.libreoffice.org/7910 from Rohit Deshmukh + fdo#63154 Remove unused solar.h reference in sc. in https://gerrit.libreoffice.org/8061 from Alexandre Vicenzi * Abandoned changes on master for project core changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: + sw/docx export: fix handling of document with header and section(s) in https://gerrit.libreoffice.org/6248 from Pierre-Eric Pelloux-Prayer + fdo#51525 Fix duplicate "Paste Special" entries in Calc. in https://gerrit.libreoffice.org/7784 from Andrzej Hunt + fdo#72661: Check ‘Hyphenation active’ automatically in https://gerrit.libreoffice.org/7291 from Jiwoong Youn + sa/l add release_assert() and assert that stay even in release code in https://gerrit.libreoffice.org/7625 from Norbert Thiebaud + fdo#69407: On transparent frames, shadows are painted in foreground. in https://gerrit.libreoffice.org/7070 from Mohamed-Ali BEN MANSOUR + add a header to provide posix compatible wrapper for platform lacking in https://gerrit.libreoffice.org/6837 from Norbert Thiebaud + upgrade liborcus in https://gerrit.libreoffice.org/7310 from Markus Mohrhard + WIP fdo#72987 Use firebird backup format for .odb in https://gerrit.libreoffice.org/7299 from Andrzej Hunt + Export CoreText-related SPI stuff in https://gerrit.libreoffice.org/7143 from Douglas Mencken + fdo#60698: Merge animcore into sd and slideshow in https://gerrit.libreoffice.org/7108 from Marcos Souza + sw/export docx: add unit test for document with header and section(s) in https://gerrit.libreoffice.org/6249 from Pierre-Eric Pelloux-Prayer + fix for exporting of text watermark to DOCX in https://gerrit.libreoffice.org/5568 from Adam CloudOn + WIP: fdo#33980 Preserve selection across all slide sorters. in https://gerrit.libreoffice.org/6633 from Andrzej Hunt + fdo#71043 - Use STACK lint tool to clean code in https://gerrit.libreoffice.org/6529 from José Guilherme Vanz + Increase number of remembered recent documents from 10 to 25 in https://gerrit.libreoffice.org/6101 from Krisztian Pinter + startcenter: Make SC open faster by timeouting thumbnails in https://gerrit.libreoffice.org/6102 from Krisztian Pinter + Simplify oslThreadIdentifier on Linux 32. in https://gerrit.libreoffice.org/5553 from Arnaud Versini + fdo#36791 : fix for import of greeting card in https://gerrit.libreoffice.org/4240 from Adam CloudOn + Positional Tab additions in https://gerrit.libreoffice.org/5387 from Adam CloudOn Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
