Re: --enable/disable-mathmldtd autogen option
Hi, On Sun, Sep 02, 2012 at 08:31:48AM +0200, Lionel Elie Mamane wrote: > scp2/source/math/file_math.scp:#ifndef WITHOUT_MATHMLDTD > scp2/source/math/file_math.scp-File gid_File_Html_W3c_Ipr > scp2/source/math/file_math.scp-TXT_FILE_BODY; > scp2/source/math/file_math.scp-Styles = (PACKED); > scp2/source/math/file_math.scp-Dir = gid_Dir_Share_Dtd_Math_1_01; > scp2/source/math/file_math.scp-Name = "w3c_ipr_software_notice.html"; > scp2/source/math/file_math.scp-End > scp2/source/math/file_math.scp- > scp2/source/math/file_math.scp-#endif > > > So it like it *only* installs the file w3c_ipr_software_notice.html, > and not the file MathMLDTD/math.dtd, like it looks like it is supposed > to. > > Or I misunderstand how our install/packaging process works: I assume > Dir = "gid_Dir_Share_Dtd_Math_1_01" only creates the directory, not > installs its whole contents that is populated by Makefiles. > > In the other case, maybe this is a duplicate because > MathMLDTD/Package_bin.mk has: > > $(eval $(call gb_Package_add_file,MathMLDTD_bin,bin/math.dtd,math.dtd)) > $(eval $(call > gb_Package_add_file,MathMLDTD_bin,bin/w3c_ipr_software_notice.html,w3c_ipr_software_notice.html)) > > which looks like it would install both or none. You are underestimating the baroque complexity of our installation system :-) It works like this: 0. (not part of installation) The makefiles are "configuration" for gbuild: what to build and where to put the results. The built files are put into the solver (or $(OUTDIR) in gbuild terminology). 1. The scp files in scp2 define installation set(s), i.e., what files (if I simplify it) are in the _installed_ product and where. It contains definitions of all files (directive File) and directories (directive Directory); each of them has a parent directory (Dir). 2. Then there is _another_ configuration in instsetoo_native that tells the installation set creator (an abominable perl script) _where_ to look for the files to put into the installation set (a list of paths in solver; it works like include paths in C preprocessor). (3. There is yet another configuration in setup_native that specifies how the installation is split into native packages (rpms, debs), but that has no bearing to the present discussion...) > > > 3) If this all works, it installs --- k!! a *modified* MathML >DTD. So either we need the modified DTD and this should be enabled >by default, or we don't need the modified DTD (we are OK with the >pristine W3C DTD) and then why optionally install a modified one? >We should *maybe* optionally install the *pristine* one. I can >imagine we'd like to bundle it at least on platforms where it is >not already available? > >Anybody has any info on that? Commit c12f405260d8620ccafe9d46d7883cc7519ff285 contains the modifications. The added namespace prefix looks entirely bogus to me (but I have not used DTDs for a looong time, so maybe I just do not remember why it might be needed). The removed references for ISO entities make some sense, because LibreOffice does never write entities and it would mean we need to include these DTDs in the installation too, otherwise the validation would still fail on the platforms where they are not already available. Of course, that does not answer the question why should we bother installing the math.dtd at all, because AFAIK we do not do any validation by default. D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: --enable-evolution2 in distro-configs/
> > Shall I just add it to distro-configs/LibreOfficeLinux.conf ? > I *think* that the distro-configs/LibreOfficeLinux.conf is supposed to be used only for the official TDF build for generic Linux, and not by individual LO developers. After all, it says "--with-vendor=The Document Foundation" So probably it's best to let those who handle that build take care of this file. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: CTL Default
Right now is it associated with locale or with language selection (or are these the same, I honestly don't use these features at all)? If it's not associated with language selection maybe we should make it so. Otherwise, maybe putting the option in a more obvious location is a good idea. I can do this just need some guidance on where to place it. I'll reply to the user, I'm not sure why he sent me a personal email about this instead of sending it out to the mailing list or even commenting on fdo. Best Regards, Joel On 09/02/2012 10:57 AM, Rainer Bielefeld wrote: Nathan Wells schrieb: Yes, some locales have CTL enabled as the default. Hi, yes, of course. The question is whether e-mail writer has had activated a Locale where that's not required. Where not, CTL (Complex Text Layout) should be disabled. It offers an additional Dialog for CTL fonts and lot's of other frills users really only need for CTL, so I think it should be disabled for languages where it is not required. Best regards Rainer ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: CTL Default
Hello, If the locale had it enabled by default it most likely needs it. But even if not needed, having it on shouldn't cause any issues - see https://bugs.freedesktop.org/show_bug.cgi?id=47969 -Nathan Rainer Bielefeld wrote: >Nathan Wells schrieb: >> Yes, some locales have CTL enabled as the default. > > >Hi, > >yes, of course. The question is whether e-mail writer has had activated >a Locale where that's not required. Where not, CTL (Complex Text Layout) >should be disabled. It offers an additional Dialog for CTL fonts and >lot's of other frills users really only need for CTL, so I think it >should be disabled for languages where it is not required. > >Best regards > > >Rainer ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 --- Comment #366 from Adriano Afonso 2012-09-02 21:56:16 UTC --- Bug Proposal - Calc is too slow to open and work with big datasheet file Since I can't find any related bug so far, is there any bug open for this problem? The problem is simple, the file as 30,5Mb and almost 150,000 lines, with data from the last two years. It takes a lot to open and its very frustrating working this the filters (it takes to long just to open the menu). This has been reported to me since OOo 2.1 and only now I had access to a so large file at the enterprise I work. I want to start to migrate some office suites, but this bug is pulling the project out. I can prepare a file to share if needed. -- 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
Adjusting an Array Range in Calc
Hello, I have a working plugin for Quantlib. Scalar results of the library (single numbers) are working fine. If I have a Matrix result (array range formula) than it is not possible to change the size of the array. What happens if I try to change the array range: the name of the formula changes from upper-case to lower-case (this is simply an indication that the function is not known) and an error message appears (error 508). Help appreciated. Regards, Lars ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/acmplwrd.hxx | 16 -
sw/source/core/doc/acmplwrd.cxx | 44 -
sw/source/ui/docvw/edtwin.cxx | 126 +---
3 files changed, 160 insertions(+), 26 deletions(-)
New commits:
commit 51f9e894f46e718200a14bcd61e9e44c64bc5396
Author: Nico Weyand
Date: Sun Sep 2 22:09:38 2012 +0200
Improved usage of the auto-complete tree structure.
Auto-complete lookup structure remembers as-you-type the character
position in a word. Currently the whole word was always looked up
which was not necessary. This patch improves this.
Change-Id: I7dced25707979377ae3f696a5987956d2308aeec
diff --git a/sw/inc/acmplwrd.hxx b/sw/inc/acmplwrd.hxx
index 72421c3..8e0dd75 100644
--- a/sw/inc/acmplwrd.hxx
+++ b/sw/inc/acmplwrd.hxx
@@ -79,7 +79,21 @@ public:
void CheckChangedList(const editeng::SortedAutoCompleteStrings& rNewLst);
-bool GetWordsMatching(String aMatch, std::vector& aWords) const;
+// Resets the current position within the tree to its root node.
+void returnToRoot();
+
+// Advances to a given node within the AutoComplete tree.
+void gotoNode(OUString sNode);
+
+// Advances from the current position towards the node keyed with cKey.
+void advance(const sal_Unicode cKey);
+
+// Goes back one char within the tree, except if the current node is
already the root node.
+void goBack();
+
+// Returns all words matching a given prefix aMatch. If bIgnoreCurrentPos
is set, the current
+// position within the tree is ignored and replaced by aMatch.
+bool GetWordsMatching(String aMatch, std::vector& aWords, sal_Bool
bIgnoreCurrentPos) const;
};
diff --git a/sw/source/core/doc/acmplwrd.cxx b/sw/source/core/doc/acmplwrd.cxx
index d569e16..65ce21a 100644
--- a/sw/source/core/doc/acmplwrd.cxx
+++ b/sw/source/core/doc/acmplwrd.cxx
@@ -355,18 +355,52 @@ void SwAutoCompleteWord::SetMinWordLen( sal_uInt16 n )
nMinWrdLen = n;
}
-bool SwAutoCompleteWord::GetWordsMatching(String aMatch, std::vector&
aWords) const
+// Resets the current position within the tree to its root node.
+void SwAutoCompleteWord::returnToRoot()
{
-OUString aStringRoot = OUString(aMatch);
-m_LookupTree->gotoNode( aStringRoot );
+m_LookupTree->returnToRoot();
+}
+
+// Advances to a given node within the AutoComplete tree.
+void SwAutoCompleteWord::gotoNode(OUString sNode)
+{
+m_LookupTree->gotoNode( sNode );
+}
+
+// Advances from the current position towards the node keyed with cKey.
+void SwAutoCompleteWord::advance(const sal_Unicode cKey)
+{
+m_LookupTree->advance( cKey );
+}
+
+// Goes back one char within the tree, except if the current node is already
the root node.
+void SwAutoCompleteWord::goBack()
+{
+m_LookupTree->goBack();
+}
+
+// Returns all words matching a given prefix aMatch. If bIgnoreCurrentPos is
set, the current
+// position within the tree is ignored and replaced by aMatch.
+bool SwAutoCompleteWord::GetWordsMatching(String aMatch, std::vector&
aWords, sal_Bool bIgnoreCurrentPos) const
+{
+OUString aStringRoot = OUString( aMatch );
+
+// The lookup tree already contains the information about the root keyword
in most cases. Only if we don't trust that
+// information (e.g. if we need some autocompletion for a place other than
the main writing area), the location within
+// the tree needs to be refreshed.
+if (bIgnoreCurrentPos)
+{
+m_LookupTree->gotoNode( aStringRoot );
+}
+
OUString aAutocompleteWord = m_LookupTree->suggestAutoCompletion();
if (aAutocompleteWord.isEmpty())
+{
return false;
+}
OUString aCompleteWord = aStringRoot + aAutocompleteWord;
-
aWords.push_back( String(aCompleteWord) );
-
return true;
}
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 812d7bd..1ccb7fb 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -314,7 +314,9 @@ struct QuickHelpData
if( 0 == nCurArrPos-- )
nCurArrPos = (bEndLess && !m_bIsAutoText ) ?
m_aHelpStrings.size()-1 : 0;
}
-void FillStrArr( SwWrtShell& rSh, const String& rWord );
+
+// Fills internal structures with hopefully helpful information.
+void FillStrArr( SwWrtShell& rSh, const String& rWord, sal_Bool
bIgnoreCurrentPos );
void SortAndFilter();
};
@@ -1519,6 +1521,19 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt)
sal_Bool bStopKeyInputTimer = sal_True;
String sFmlEntry;
+enum SW_AutoCompleteAction { ACA_NoOp,// No maintenance
operation required for AutoComplete tree
+ ACA_ReturnToRoot,// Input of a char
marking the end of a word, like '.', ' ', etc.
+ ACA_SingleCharInput,
+ ACA_SingleBackspace,
+ ACA_Refresh }; // Refresh AutoComplete
information
Re: Switch Windows to MinGW [was: Minutes of the ESC call 2012-08-30]
On 02.09.2012 09:38, Lionel Elie Mamane wrote: * QA update (Rainer) > + HardHacks: > 32948 Linux Libreoffice/Database(?) - Address Book Data Source >Wizard fails with message "No SDBC driver was found" Sent back to QA after more analysis. This one is related to the decision of Debian/Ubuntu maintainers to disable LO's mozilla integration in their distro. With mozilla disabled the mesage above is the expected behaviour. As always with open source you have more then one work around here: 1. Compile LO yourself on Debian/Ubuntu. Don't forget to enable mozilla as it currently disabled per default. 2. Watch ongoing efforts to provide alternative (not mozilla based) mork driver implementation, or ... better help out there ;-) https://bugs.freedesktop.org/show_bug.cgi?id=51004 3. If all above fail for your change your distribution. Regards David ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: CTL Default
Nathan Wells schrieb: Yes, some locales have CTL enabled as the default. Hi, yes, of course. The question is whether e-mail writer has had activated a Locale where that's not required. Where not, CTL (Complex Text Layout) should be disabled. It offers an additional Dialog for CTL fonts and lot's of other frills users really only need for CTL, so I think it should be disabled for languages where it is not required. Best regards Rainer ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Horst changed: What|Removed |Added Depends on||45893 --- Comment #365 from Horst 2012-09-02 16:56:59 UTC --- Bug 45893 CHART printing directly is amissing feature which is included in Excel and in Lotus 123 for around 20 years. The workaround to export the chart to PDF and then print from there is working but a total mess and waste of time to get it right ( changing page properties, changing chart window and alot trial and error). -- 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 --- Comment #104 from Horst 2012-09-02 16:50:59 UTC --- Bug 45893 CHART printing directly is amissing feature which is included in Excel and in Lotus 123 for around 20 years. The workaround to export the chart to PDF and then print from there is working but a total mess and waste of time to get it right ( changing page properties, changing chart window and alot trial and error). -- 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 Horst changed: What|Removed |Added Depends on||45893 -- 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: CTL Default
Yes, some locales have CTL enabled as the default. -Nathan On Sun, Sep 2, 2012 at 11:32 PM, Joel Madero wrote: > Hi All, > > I received a personal email today from a user saying that for them CTL is > enabled by default for 3.6. Did I miss something? Is it enabled by default > for some locales? I want to give him the right information, thanks all. > > > Joel > > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/libreoffice > > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
CTL Default
Hi All, I received a personal email today from a user saying that for them CTL is enabled by default for 3.6. Did I miss something? Is it enabled by default for some locales? I want to give him the right information, thanks all. Joel ___ 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 V.K. changed: What|Removed |Added CC||v-k-...@yandex.ru Depends on||40594 --- Comment #103 from V.K. 2012-09-02 16:05:34 UTC --- Add bug 40594 – Charts embedded in docx are completely absent. It is critical bug for many people. -- 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
[PATCH] Cleanup in basctl (raw pointers)
>From János Uray : János Uray has uploaded a new change for review. Change subject: Cleanup in basctl (raw pointers) .. Cleanup in basctl (raw pointers) Lots of raw pointers have been converted to boost::scoped_ptr to reduce the number of 'delete's and the possibility of memory leaks. Some pointers have been converted to references, to reduce the needless checking for nullptrs, and so simplifying the code. Also some #define-s have been converted to C++ constants or enumerations. Change-Id: Ifbeb78f744bac7a96c8a446ff4db90dedf85fe26 --- M basctl/source/accessibility/accessibledialogcontrolshape.cxx M basctl/source/accessibility/accessibledialogwindow.cxx M basctl/source/basicide/basdoc.cxx M basctl/source/basicide/basdoc.hxx M basctl/source/basicide/baside2.cxx M basctl/source/basicide/baside2.hxx M basctl/source/basicide/baside2b.cxx M basctl/source/basicide/baside3.cxx M basctl/source/basicide/basidectrlr.cxx M basctl/source/basicide/basides3.cxx M basctl/source/basicide/basidesh.cxx M basctl/source/basicide/basobj2.cxx M basctl/source/basicide/basobj3.cxx M basctl/source/basicide/bastype2.hxx M basctl/source/basicide/bastypes.cxx M basctl/source/basicide/doceventnotifier.cxx M basctl/source/basicide/docsignature.cxx M basctl/source/basicide/localizationmgr.cxx M basctl/source/basicide/macrodlg.cxx M basctl/source/basicide/macrodlg.hxx M basctl/source/basicide/moduldl2.cxx M basctl/source/basicide/moduldlg.cxx M basctl/source/basicide/moduldlg.hxx M basctl/source/dlged/dlged.cxx M basctl/source/dlged/dlgedfunc.cxx M basctl/source/dlged/dlgedlist.cxx M basctl/source/dlged/dlgedobj.cxx M basctl/source/dlged/dlgedpage.cxx M basctl/source/dlged/dlgedview.cxx M basctl/source/dlged/propbrw.cxx M basctl/source/inc/baside3.hxx M basctl/source/inc/basidesh.hxx M basctl/source/inc/dlged.hxx M basctl/source/inc/dlgeddef.hxx M basctl/source/inc/dlgedfunc.hxx M basctl/source/inc/dlgedlist.hxx M basctl/source/inc/dlgedobj.hxx M basctl/source/inc/dlgedpage.hxx M basctl/source/inc/dlgedview.hxx M basctl/source/inc/doceventnotifier.hxx M basctl/source/inc/docsignature.hxx M basctl/source/inc/iderid.hxx M basctl/source/inc/localizationmgr.hxx 43 files changed, 1,085 insertions(+), 1,262 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/29/529/1 -- To view, visit https://gerrit.libreoffice.org/529 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifbeb78f744bac7a96c8a446ff4db90dedf85fe26 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: János Uray ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: svtools/source vcl/inc vcl/source
svtools/source/graphic/grfmgr2.cxx | 726 ++---
vcl/inc/vcl/bitmap.hxx | 18
vcl/inc/vcl/bitmapex.hxx |5
vcl/source/gdi/bitmap3.cxx | 233 ---
vcl/source/gdi/bitmapex.cxx| 56 --
5 files changed, 613 insertions(+), 425 deletions(-)
New commits:
commit 4b161067d46ddd48b4602ccdcc4d1b2545e2ac83
Author: Tomaž Vajngerl
Date: Sun Sep 2 17:23:03 2012 +0200
Stepwise rebuild bitmap rendering from scratch to avoid rendering bugs.
Bitmap rendering was rebuild from the original state and checked for
rendering bugs at every change. Currently the implementation supports
scaling by averagin for RGB channels an for alpha channel in some
cases. For scaling factor > 0.6, the original bilinear scaling is
used. Implementation is currently still in "outdev2" but is decoupled
and will be moved to its proper place into "bitmap" and "bitmapex".
Change-Id: I6feb744712956a92d6140d079dc3a85ee8511930
diff --git a/svtools/source/graphic/grfmgr2.cxx
b/svtools/source/graphic/grfmgr2.cxx
index 2cc7ae3..299f883 100644
--- a/svtools/source/graphic/grfmgr2.cxx
+++ b/svtools/source/graphic/grfmgr2.cxx
@@ -46,6 +46,7 @@
#define WATERMARK_LUM_OFFSET50
#define WATERMARK_CON_OFFSET-70
+#define MAP( cVal0, cVal1, nFrac )
((sal_uInt8)long)(cVal0)<<20L)+nFrac*((long)(cVal1)-(cVal0)))>>20L))
// --
// - GraphicManager -
@@ -264,172 +265,659 @@ sal_Bool GraphicManager::ImplDraw( OutputDevice* pOut,
const Point& rPt,
return bRet;
}
-sal_Bool GraphicManager::ImplCreateOutput( OutputDevice* pOutputDevice,
- const Point& rPoint, const Size& rSize,
- const BitmapEx& rBitmapEx, const
GraphicAttr& rAttributes,
- const sal_uLong nFlags, BitmapEx*
pResultBitmapEx )
+sal_Bool ImplCreateRotatedScaled( const BitmapEx& rBmpEx, const GraphicAttr&
rAttributes,
+sal_uInt16 nRot10, const Size& rUnrotatedSzPix,
+long nStartX, long nEndX, long nStartY, long
nEndY,
+BitmapEx& rOutBmpEx )
{
-boolbRet = false;
+const long aUnrotatedWidth = rUnrotatedSzPix.Width();
+const long aUnrotatedHeight = rUnrotatedSzPix.Height();
+const long aBitmapWidth = rBmpEx.GetSizePixel().Width();
+const long aBitmapHeight = rBmpEx.GetSizePixel().Height();
-Point aUnrotatedPointInPixels( pOutputDevice->LogicToPixel( rPoint )
);
-SizeaUnrotatedSizeInPixels( pOutputDevice->LogicToPixel( rSize )
);
+longnX, nY, nTmpX, nTmpY, nTmpFX, nTmpFY, nTmp;
+double fTmp;
-if( aUnrotatedSizeInPixels.Width() <= 0 ||
aUnrotatedSizeInPixels.Height() <= 0)
-return false;
+boolbHMirr = ( rAttributes.GetMirrorFlags() & BMP_MIRROR_HORZ ) != 0;
+boolbVMirr = ( rAttributes.GetMirrorFlags() & BMP_MIRROR_VERT ) != 0;
+
+long* pMapIX = new long[ aUnrotatedWidth ];
+long* pMapFX = new long[ aUnrotatedWidth ];
+long* pMapIY = new long[ aUnrotatedHeight ];
+long* pMapFY = new long[ aUnrotatedHeight ];
+
+const double fScaleX = ( aUnrotatedWidth - 1 ) / (double) ( aBitmapWidth
- 1 );
+const double fScaleY = ( aUnrotatedHeight - 1 ) / (double) ( aBitmapHeight
- 1 );
-Point aOutPointInPixels;
-SizeaOutSizeInPixels;
-BitmapExaBitmapEx( rBitmapEx );
-int nRotation = rAttributes.GetRotation() % 3600;
+const double fRevScaleX = 1.0 / fScaleX;
+const double fRevScaleY = 1.0 / fScaleY;
-if( nRotation != 0 )
+int x,y;
+
+// create horizontal mapping table
+for( x = 0, nTmpX = aBitmapWidth - 1L, nTmp = aBitmapWidth - 2L; x <
aUnrotatedWidth; x++ )
{
-Polygon aPoly( Rectangle( rPoint, rSize ) );
-aPoly.Rotate( rPoint, nRotation );
-const Rectangle aRotationBoundRect( aPoly.GetBoundRect() );
-aOutPointInPixels = pOutputDevice->LogicToPixel(
aRotationBoundRect.TopLeft() );
-aOutSizeInPixels = pOutputDevice->LogicToPixel(
aRotationBoundRect.GetSize() );
+fTmp = x * fRevScaleX;
+
+if( bHMirr )
+fTmp = nTmpX - fTmp;
+
+pMapIX[ x ] = MinMax( fTmp, 0, nTmp );
+pMapFX[ x ] = (long) ( ( fTmp - pMapIX[ x ] ) * 1048576.0 );
}
-else
+
+// create vertical mapping table
+for( y = 0, nTmpY = aBitmapHeight - 1L, nTmp = aBitmapHeight - 2L; y <
aUnrotatedHeight; y++ )
{
-aOutPointInPixels = aUnrotatedPointInPixels;
-aOutSizeInPixels = aUnrotatedSizeInPixels;
+fTmp = y * fRevScaleY;
+
+if( bVMirr )
+fTmp = nTmpY - fTmp;
+
+pMapIY[ y ] = MinMax( fTmp, 0, nTmp );
+pMapFY[ y ] = (long) ( ( fTmp - pMapIY[ y ] ) * 1048576.0 );
}
-Point aOutPoint;
-Size
[Libreoffice-commits] .: 2 commits - starmath/source sw/inc sw/source
starmath/source/cursor.cxx | 23 +--
sw/inc/editsh.hxx | 17 ++---
sw/source/core/edit/edws.cxx| 14 +-
sw/source/ui/docvw/edtwin.cxx | 10 +-
sw/source/ui/shells/basesh.cxx |2 +-
sw/source/ui/uiview/viewmdi.cxx |4 ++--
sw/source/ui/wrtsh/delete.cxx | 18 +-
sw/source/ui/wrtsh/move.cxx |2 +-
sw/source/ui/wrtsh/select.cxx | 26 +-
sw/source/ui/wrtsh/wrtsh1.cxx |8
10 files changed, 59 insertions(+), 65 deletions(-)
New commits:
commit 35e13d1f5403076c752879ecbe17b2f451b188d9
Author: Ivan Timofeev
Date: Sun Sep 2 16:05:21 2012 +0400
expand ACT_KONTEXT and MV_KONTEXT macros, rename kontext to context
Change-Id: I7783e60cc048dfbd99976881afca317ad1326d66
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 0122900..58d8bef 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -968,26 +968,21 @@ inline const sfx2::LinkManager&
SwEditShell::GetLinkManager() const
{ return ((SwEditShell*)this)->GetLinkManager(); }
/// Class for automated call of Start- and EndAction().
-class SwActKontext {
+class SwActContext {
SwEditShell *pSh;
public:
-SwActKontext(SwEditShell *pShell);
-~SwActKontext();
+SwActContext(SwEditShell *pShell);
+~SwActContext();
};
-#define ACT_KONTEXT(x) SwActKontext _aActKontext_(x)
-
/// Class for automated call of Start- and EndCrsrMove().
-class SwMvKontext {
+class SwMvContext {
SwEditShell *pSh;
public:
-SwMvKontext(SwEditShell *pShell );
-~SwMvKontext();
+SwMvContext(SwEditShell *pShell);
+~SwMvContext();
};
-#define MV_KONTEXT(x) SwMvKontext _aMvKontext_(x)
-
-
#endif
diff --git a/sw/source/core/edit/edws.cxx b/sw/source/core/edit/edws.cxx
index 4f267fe..018e275 100644
--- a/sw/source/core/edit/edws.cxx
+++ b/sw/source/core/edit/edws.cxx
@@ -206,31 +206,27 @@ sal_Bool SwEditShell::HasOtherCnt() const
**/
-SwActKontext::SwActKontext(SwEditShell *pShell)
+SwActContext::SwActContext(SwEditShell *pShell)
: pSh(pShell)
{
pSh->StartAction();
}
-SwActKontext::~SwActKontext()
+SwActContext::~SwActContext()
{
pSh->EndAction();
}
-/**
- * Klasse fuer den automatisierten Aufruf von Start- und
- * EndCrsrMove();
-
**/
-
-SwMvKontext::SwMvKontext(SwEditShell *pShell ) : pSh(pShell)
+SwMvContext::SwMvContext(SwEditShell *pShell)
+: pSh(pShell)
{
pSh->SttCrsrMove();
}
-SwMvKontext::~SwMvKontext()
+SwMvContext::~SwMvContext()
{
pSh->EndCrsrMove();
}
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 777f072..812d7bd 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -3435,7 +3435,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
{ // only temporary generate Move-Kontext because
otherwise
// the query to the content form doesn't work!!!
-MV_KONTEXT( &rSh );
+SwMvContext aMvContext( &rSh );
nTmpSetCrsr = rSh.SetCursor(&aDocPos, bOnlyText);
bValidCrsrPos = !(CRSR_POSCHG & nTmpSetCrsr);
bCallBase = sal_False;
@@ -3459,7 +3459,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
nSelType & nsSelectionType::SEL_GRF ||
rSh.IsObjSelectable( aDocPos ) )
{
-MV_KONTEXT( &rSh );
+SwMvContext aMvContext( &rSh );
if( !rSh.IsFrmSelected() )
rSh.GotoNextFly();
rSh.EnterSelFrmMode();
@@ -4210,7 +4210,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
bNoInterrupt = sal_False;
{ // create only temporary move context because otherwise
// the query to the content form doesn't work!!!
-MV_KONTEXT( &rSh );
+SwMvContext aMvContext( &rSh );
const Point aDocPos( PixelToLogic( aStartPos ) );
bValidCrsrPos = !(CRSR_POSCHG &
rSh.SetCursor(&aDocPos, false));
}
@@ -5402,7 +5402,7 @@ sal_Bool SwEditWin::SelectMenuPosition(SwWrtShell& rSh,
const Point& rMousePos )
{
{ // create only temporary move context because otherwise
// the query against the content form doesn't work!!!
-MV_KONTEXT( &rSh );
+SwMvContext aMvContext( &rSh );
rSh.SetCursor(&aDocPos,
[Libreoffice-commits] .: sdext/source
sdext/source/pdfimport/filterdet.cxx |5 ++--
sdext/source/pdfimport/pdfparse/pdfentries.cxx | 27 -
sdext/source/pdfimport/pdfparse/pdfparse.cxx |4 +--
3 files changed, 19 insertions(+), 17 deletions(-)
New commits:
commit 1f08711bd154d0502e5653088dc87575d4c372a7
Author: Arnaud Versini
Date: Sun Sep 2 13:44:33 2012 +0200
Replace usage of rtl/memory.h in PDF Import with equivalent from string.h
Change-Id: I13f88bdfa6fc7d2b39fb2fd6a686b5364c20d6b5
diff --git a/sdext/source/pdfimport/filterdet.cxx
b/sdext/source/pdfimport/filterdet.cxx
index 0629718..52a855d 100644
--- a/sdext/source/pdfimport/filterdet.cxx
+++ b/sdext/source/pdfimport/filterdet.cxx
@@ -49,6 +49,7 @@
#include
#include
+#include
using namespace com::sun::star;
@@ -256,7 +257,7 @@ bool FileEmitContext::write( const void* pBuf, unsigned int
nLen )
return false;
uno::Sequence< sal_Int8 > aSeq( nLen );
-rtl_copyMemory( aSeq.getArray(), pBuf, nLen );
+memcpy( aSeq.getArray(), pBuf, nLen );
m_xOut->writeBytes( aSeq );
return true;
}
@@ -560,7 +561,7 @@ bool checkDocChecksum( const rtl::OUString& rInPDFFileURL,
// open file and calculate actual checksum up to index nBytes
sal_uInt8 nActualChecksum[ RTL_DIGEST_LENGTH_MD5 ];
-rtl_zeroMemory( nActualChecksum, sizeof(nActualChecksum) );
+memset( nActualChecksum, 0, sizeof(nActualChecksum) );
rtlDigest aActualDigest = rtl_digest_createMD5();
oslFileHandle aRead = NULL;
oslFileError aErr = osl_File_E_None;
diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx
b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
index 04d5022..259d700 100644
--- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
@@ -46,6 +46,7 @@
#include
#include
+#include
using ::rtl::OUString;
using ::rtl::OString;
@@ -1059,9 +1060,9 @@ struct PDFFileImplData
m_aCipher( NULL ),
m_aDigest( NULL )
{
-rtl_zeroMemory( m_aOEntry, sizeof( m_aOEntry ) );
-rtl_zeroMemory( m_aUEntry, sizeof( m_aUEntry ) );
-rtl_zeroMemory( m_aDecryptionKey, sizeof( m_aDecryptionKey ) );
+memset( m_aOEntry, 0, sizeof( m_aOEntry ) );
+memset( m_aUEntry, 0, sizeof( m_aUEntry ) );
+memset( m_aDecryptionKey, 0, sizeof( m_aDecryptionKey ) );
}
~PDFFileImplData()
@@ -1132,7 +1133,7 @@ static void pad_or_truncate_to_32( const OString& rStr,
sal_Char* pBuffer )
if( nLen > 32 )
nLen = 32;
const sal_Char* pStr = rStr.getStr();
-rtl_copyMemory( pBuffer, pStr, nLen );
+memcpy( pBuffer, pStr, nLen );
int i = 0;
while( nLen < 32 )
pBuffer[nLen++] = nPadString[i++];
@@ -1170,7 +1171,7 @@ static sal_uInt32 password_to_key( const OString& rPwd,
sal_uInt8* pOutKey, PDFF
sal_uInt32 nLen = pData->m_nKeyLength;
if( nLen > RTL_DIGEST_LENGTH_MD5 )
nLen = RTL_DIGEST_LENGTH_MD5;
-rtl_copyMemory( pOutKey, nSum, nLen );
+memcpy( pOutKey, nSum, nLen );
return nLen;
}
@@ -1180,10 +1181,10 @@ static bool check_user_password( const OString& rPwd,
PDFFileImplData* pData )
bool bValid = false;
sal_uInt8 aKey[ENCRYPTION_KEY_LEN];
sal_uInt8 nEncryptedEntry[ENCRYPTION_BUF_LEN];
-rtl_zeroMemory( nEncryptedEntry, sizeof(nEncryptedEntry) );
+memset( nEncryptedEntry, 0, sizeof(nEncryptedEntry) );
sal_uInt32 nKeyLen = password_to_key( rPwd, aKey, pData, false );
// save (at this time potential) decryption key for later use
-rtl_copyMemory( pData->m_aDecryptionKey, aKey, nKeyLen );
+memcpy( pData->m_aDecryptionKey, aKey, nKeyLen );
if( pData->m_nStandardRevision == 2 )
{
// see PDF reference 1.4 Algorithm 3.4
@@ -1193,7 +1194,7 @@ static bool check_user_password( const OString& rPwd,
PDFFileImplData* pData )
NULL, 0 );
rtl_cipher_encodeARCFOUR( pData->m_aCipher, nPadString, sizeof(
nPadString ),
nEncryptedEntry, sizeof( nEncryptedEntry ) );
-bValid = (rtl_compareMemory( nEncryptedEntry, pData->m_aUEntry, 32 )
== 0);
+bValid = (memcmp( nEncryptedEntry, pData->m_aUEntry, 32 ) == 0);
}
else if( pData->m_nStandardRevision == 3 )
{
@@ -1218,7 +1219,7 @@ static bool check_user_password( const OString& rPwd,
PDFFileImplData* pData )
nEncryptedEntry, 16,
nEncryptedEntry, 16 ); // encrypt in
place
}
-bValid = (rtl_compareMemory( nEncryptedEntry, pData->m_aUEntry, 16 )
== 0);
+bValid = (memcmp( nEncryptedEntry, pData->m_aUEntry, 16 ) == 0);
}
return bValid;
}
@@ -1250,7 +1251,7 @@ bool PDFFile::setupDecryptionData( const OString& rPwd )
const
// see PDF reference 1.4 Algorithm 3.7
sal_uInt8 aKey[ENCRYPTION_KEY_LEN];
sal_uInt8 n
[PATCH] fdo#35079: EDITING: Drawing element completely in mouse selection frame not selected
This is the second attempt to fix this. The last one prevented the presentation from working, because all hiddengeometries didn't exhibit BoundRects. I am sorry for that. This time, I just deleted the disturbing object from all customshapes. I found it nowhere missing. greetings - Lennard Wasserthal Disclaimer: I put all my contributions to LibreOffice under the GNU Lesser General Public License (LGPLv3). >From 2dcf69e228ed36ccaf8730eff6e92fa0c96abf91 Mon Sep 17 00:00:00 2001 From: Lennard Date: Sun, 2 Sep 2012 10:49:56 +0200 Subject: [PATCH] next attempt to fix bug #35079. Removes the hidden frame. That frame really doesn't seem to be needed, not even for exporting, though. Change-Id: I3e506668fe775278400290d5bdc483c41ccabba9 Signed-off-by: Lennard Wasserthal --- .../sdr/contact/viewcontactofsdrobjcustomshape.cxx |4 1 file changed, 4 deletions(-) diff --git a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx index 669403c..d5bd015 100644 --- a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx @@ -235,10 +235,6 @@ namespace sdr aObjectBound.Left(), aObjectBound.Top(), aObjectBound.Right(), aObjectBound.Bottom()); - drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(xRetval, -drawinglayer::primitive2d::createHiddenGeometryPrimitives2D( -false, aObjectRange)); - return xRetval; } } // end of namespace contact -- 1.7.9.5 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Modifying comments to meet doxygen standards
>From Norbert Thiebaud : Norbert Thiebaud has submitted this change and it was merged. Change subject: Modifying comments to meet doxygen standards .. Modifying comments to meet doxygen standards Change-Id: I4c82b7e543ec74cec3d4eb2985a3e4ec68c16b11 --- M sw/inc/docary.hxx M sw/inc/docfac.hxx M sw/inc/docsh.hxx M sw/inc/docstyle.hxx M sw/inc/docufld.hxx M sw/inc/drawdoc.hxx M sw/inc/edglbldc.hxx M sw/inc/editsh.hxx M sw/inc/expfld.hxx M sw/inc/fchrfmt.hxx M sw/inc/fesh.hxx M sw/inc/fldbas.hxx M sw/inc/flyenum.hxx M sw/inc/flypos.hxx M sw/inc/fmtanchr.hxx M sw/inc/fmtautofmt.hxx M sw/inc/fmtclbl.hxx M sw/inc/fmtclds.hxx M sw/inc/fmtcnct.hxx M sw/inc/fmtcntnt.hxx M sw/inc/fmtcol.hxx M sw/inc/fmteiro.hxx M sw/inc/fmtflcnt.hxx M sw/inc/fmtfld.hxx M sw/inc/fmtfollowtextflow.hxx M sw/inc/fmtfordr.hxx M sw/inc/fmtfsize.hxx M sw/inc/fmtftn.hxx M sw/inc/fmtftntx.hxx M sw/inc/fmthdft.hxx M sw/inc/fmtinfmt.hxx M sw/inc/fmtline.hxx M sw/inc/fmtlsplt.hxx M sw/inc/fmtmeta.hxx M sw/inc/fmtornt.hxx M sw/inc/fmtpdsc.hxx 36 files changed, 715 insertions(+), 716 deletions(-) Approvals: Norbert Thiebaud: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/496 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iaf83b7119767cf0b953cab62d141e8e154bb Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: abdulmajeed ahmed Gerrit-Reviewer: Norbert Thiebaud Gerrit-Reviewer: abdulmajeed ahmed ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
--enable-evolution2 in distro-configs/
--enable-evolution2 is not in any of our distro-configs (except OxygenOffice). Any known reason for that? Shall I just add it to distro-configs/LibreOfficeLinux.conf ? -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Switch Windows to MinGW [was: Minutes of the ESC call 2012-08-30]
On Sat, Sep 01, 2012 at 11:20:49PM +0200, Thorsten Behrens wrote: > * Pending Action Items > + 4.0 issues (Everyone) > + everyone interested in cleanups - claim your work until next ESC! > + http://wiki.documentfoundation.org/Development/LibreOffice4 > * review: Windows release binaries produced using MinGW Generally, as a developer, I'd love that, because more familiar tools, etc. With my "Base developer" hat on, I'd say we'd need to fix this MinGW MAB, or check it doesn't affect master: https://bugs.freedesktop.org/show_bug.cgi?id=43298 Best done by a Windows expert; I'll be available for help. This one also looks nasty: https://bugs.freedesktop.org/show_bug.cgi?id=43315 > * QA update (Rainer) > + HardHacks: > 32948 Linux Libreoffice/Database(?) - Address Book Data Source >Wizard fails with message "No SDBC driver was found" > + 32948 Lionel? Sent back to QA after more analysis. -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
--enable/disable-mathmldtd autogen option
I noticed that the default state of the --enable-mathmldtd option is *off*, but the help text suggests it is *on* by default: --disable-mathmldtd Disable mathmldtd (useful for distributions that want to avoid packaging it). In the process of correcting that, I thought it deserved a better help text, so I looked at what this option does, and I noticed: 1) None of distro-configs/* enable it 2) I'm not sure it does much, because: $ git grep -A10 -B5 MATHMLDTD configure.in-dnl === configure.in-AC_MSG_CHECKING([whether to include MathMLDTD]) configure.in-if test -n "$enable_mathmldtd"; then configure.in-if test "$enable_mathmldtd" = "no"; then configure.in-AC_MSG_RESULT([no]) configure.in:SCPDEFS="$SCPDEFS -DWITHOUT_MATHMLDTD" configure.in-else configure.in-AC_MSG_RESULT([yes]) configure.in:BUILD_TYPE="$BUILD_TYPE MATHMLDTD" configure.in-fi configure.in-else configure.in-AC_MSG_RESULT([no]) configure.in:SCPDEFS="$SCPDEFS -DWITHOUT_MATHMLDTD" configure.in-fi -- scp2/source/math/file_math.scp:#ifndef WITHOUT_MATHMLDTD scp2/source/math/file_math.scp-File gid_File_Html_W3c_Ipr scp2/source/math/file_math.scp-TXT_FILE_BODY; scp2/source/math/file_math.scp-Styles = (PACKED); scp2/source/math/file_math.scp-Dir = gid_Dir_Share_Dtd_Math_1_01; scp2/source/math/file_math.scp-Name = "w3c_ipr_software_notice.html"; scp2/source/math/file_math.scp-End scp2/source/math/file_math.scp- scp2/source/math/file_math.scp-#endif So it like it *only* installs the file w3c_ipr_software_notice.html, and not the file MathMLDTD/math.dtd, like it looks like it is supposed to. Or I misunderstand how our install/packaging process works: I assume Dir = "gid_Dir_Share_Dtd_Math_1_01" only creates the directory, not installs its whole contents that is populated by Makefiles. In the other case, maybe this is a duplicate because MathMLDTD/Package_bin.mk has: $(eval $(call gb_Package_add_file,MathMLDTD_bin,bin/math.dtd,math.dtd)) $(eval $(call gb_Package_add_file,MathMLDTD_bin,bin/w3c_ipr_software_notice.html,w3c_ipr_software_notice.html)) which looks like it would install both or none. 3) If this all works, it installs --- k!! a *modified* MathML DTD. So either we need the modified DTD and this should be enabled by default, or we don't need the modified DTD (we are OK with the pristine W3C DTD) and then why optionally install a modified one? We should *maybe* optionally install the *pristine* one. I can imagine we'd like to bundle it at least on platforms where it is not already available? Anybody has any info on that? -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[REVIEW:3-5] fdo#53557: use metadata's idea of column count to allocate a...
On Fri, Aug 31, 2012 at 04:16:58PM +, Gerrit wrote: > Lionel Elie Mamane has uploaded a new change for review. > Change subject: fdo#53557: use metadata's idea of column count to allocate a > row > .. > fdo#53557: use metadata's idea of column count to allocate a row > m_pColumnNames contains only the columns that come straight from a table, not > calculated columns > Change-Id: I2706790e8c1447d1c4e144bbdef773deeca3e2e8 > git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/22/522/1 I realised that the erroneous code is also in libreoffice-3-5; please also apply to libreoffice-3-5. -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Lionel Elie Mamane changed: What|Removed |Added Depends on||53557 --- Comment #364 from Lionel Elie Mamane 2012-09-02 03:43:15 UTC --- bug 53557, base crasher on any calculated field -- 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
