[PUSHED] migrate check_index test from Java to Python
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4310 Approvals: David Ostrovsky: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/4310 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5080cb0c3ca4b28d197137407da0d5f5b3d6c6d7 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Xiaoli Duan duan19002...@gmail.com Gerrit-Reviewer: David Ostrovsky david.ostrov...@gmx.de ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/PythonTest_sw_python.mk sw/qa
sw/PythonTest_sw_python.mk |1 sw/qa/python/check_index.py | 97 2 files changed, 98 insertions(+) New commits: commit 99eee227ac5a96a2657e26d64b8fbf228fd10bf2 Author: Xiaoli duan19002...@gmail.com Date: Sun Jun 16 17:13:43 2013 +0200 migrate check_index test from Java to Python Change-Id: I5080cb0c3ca4b28d197137407da0d5f5b3d6c6d7 Reviewed-on: https://gerrit.libreoffice.org/4310 Reviewed-by: David Ostrovsky david.ostrov...@gmx.de Tested-by: David Ostrovsky david.ostrov...@gmx.de diff --git a/sw/PythonTest_sw_python.mk b/sw/PythonTest_sw_python.mk index cbddfc5..0b582a2 100644 --- a/sw/PythonTest_sw_python.mk +++ b/sw/PythonTest_sw_python.mk @@ -10,6 +10,7 @@ $(eval $(call gb_PythonTest_PythonTest,sw_python)) $(eval $(call gb_PythonTest_add_modules,sw_python,$(SRCDIR)/sw/qa/python,\ + check_index \ get_expression \ set_expression \ var_fields \ diff --git a/sw/qa/python/check_index.py b/sw/qa/python/check_index.py new file mode 100644 index 000..6ea5b0b --- /dev/null +++ b/sw/qa/python/check_index.py @@ -0,0 +1,97 @@ +import unittest +import unohelper +import os +from org.libreoffice.unotest import UnoInProcess +from com.sun.star.text.ControlCharacter import PARAGRAPH_BREAK +from com.sun.star.util import XRefreshListener + +class RefreshListener(XRefreshListener, unohelper.Base): + +def __init__(self): +self.m_bDisposed = False +self.m_bRefreshed = False + +def disposing(self, event): +self.m_bDisposed = True + +def refreshed(self, event): +self.m_bRefreshed = True + +def assertRefreshed(self): +assert(self.m_bRefreshed) +self.m_bRefreshed = False + +class CheckIndex(unittest.TestCase): +_uno = None +_xDoc = None + +@classmethod +def setUpClass(cls): +cls._uno = UnoInProcess() +cls._uno.setUp() +cls._xDoc = cls._uno.openEmptyWriterDoc() + +@classmethod +def tearDownClass(cls): +cls._uno.tearDown() + +def test_check_index(self): +xDoc = self.__class__._xDoc +xIndex = xDoc.createInstance(com.sun.star.text.ContentIndex) +xBodyText = xDoc.getText() +xCursor = xBodyText.createTextCursor() +xIndex.setPropertyValue(CreateFromOutline, True) +xBodyText.insertTextContent(xCursor, xIndex, True) + +# register listener +listener = RefreshListener() +xIndex.addRefreshListener(listener) +self.assertFalse(listener.m_bRefreshed) +xIndex.refresh() +listener.assertRefreshed() + +# insert some heading +xCursor.gotoEnd(False) +xBodyText.insertControlCharacter(xCursor, PARAGRAPH_BREAK, False) +xCursor.gotoEnd(False) +test_string = a heading +xCursor.setString(test_string) +xCursor.gotoStartOfParagraph(True) +xCursor.setPropertyValue(ParaStyleName,Heading 1) + +# hope text is in last paragraph... +xIndex.refresh() +listener.assertRefreshed() +xCursor.gotoRange(xIndex.getAnchor().getEnd(), False) +xCursor.gotoStartOfParagraph(True) +text = xCursor.getString() +# check if we got text with 'test_string' +assert( text.find(test_string) = 0 ) + +# insert some more heading +xCursor.gotoEnd(False) +xBodyText.insertControlCharacter(xCursor, PARAGRAPH_BREAK, False) +xCursor.gotoEnd(False) +test_string = yet another heading +xCursor.setString(test_string) +xCursor.gotoStartOfParagraph(True) +xCursor.setPropertyValue(ParaStyleName,Heading 1) + +# try agian with update +xIndex.update() +listener.assertRefreshed() +xCursor.gotoRange(xIndex.getAnchor().getEnd(), False) +xCursor.gotoStartOfParagraph(True) +text = xCursor.getString() +# check if we got text with 'test_string' +assert( text.find(test_string) = 0 ) + +# dispose must call the listener +assert(not listener.m_bDisposed) +xIndex.dispose() +assert(listener.m_bDisposed) + +# close the document +xDoc.dispose() +if __name__ == __main__: +unittest.main() ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] fontsizedialog.ui widget
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4312
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/12/4312/1
fontsizedialog.ui widget
Change-Id: I1c91b4c621c5a2da11cebdd8e58a5e5d0d86bf6c
---
M starmath/UIConfig_smath.mk
M starmath/inc/dialog.hxx
M starmath/inc/starmath.hrc
M starmath/source/dialog.cxx
M starmath/source/smres.src
A starmath/uiconfig/smath/ui/fontsizedialog.ui
6 files changed, 399 insertions(+), 231 deletions(-)
diff --git a/starmath/UIConfig_smath.mk b/starmath/UIConfig_smath.mk
index d64abe8..bfdbb8a 100644
--- a/starmath/UIConfig_smath.mk
+++ b/starmath/UIConfig_smath.mk
@@ -26,6 +26,7 @@
$(eval $(call gb_UIConfig_add_uifiles,modules/smath,\
starmath/uiconfig/smath/ui/alignmentdialog \
starmath/uiconfig/smath/ui/catalogdialog \
+ starmath/uiconfig/smath/ui/fontsizedialog \
starmath/uiconfig/smath/ui/printeroptions \
starmath/uiconfig/smath/ui/savedefaultsdialog \
starmath/uiconfig/smath/ui/spacingdialog \
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index ca902b5..7704bcd 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -124,29 +124,20 @@
class SmFontSizeDialog : public ModalDialog
{
-FixedText aFixedText1;
-MetricField aBaseSize;
-FixedText aFixedText4;
-MetricField aTextSize;
-FixedText aFixedText5;
-MetricField aIndexSize;
-FixedText aFixedText6;
-MetricField aFunctionSize;
-FixedText aFixedText7;
-MetricField aOperatorSize;
-FixedText aFixedText8;
-MetricField aBorderSize;
-FixedLine aFixedLine1;
-OKButtonaOKButton1;
-HelpButton aHelpButton1;
-CancelButtonaCancelButton1;
-PushButton aDefaultButton;
+MetricField* m_pBaseSize;
+MetricField* m_pTextSize;
+MetricField* m_pIndexSize;
+MetricField* m_pFunctionSize;
+MetricField* m_pOperatorSize;
+MetricField* m_pBorderSize;
+HelpButton* m_pHelpButton1;
+PushButton* m_pDefaultButton;
DECL_LINK(DefaultButtonClickHdl, Button *);
DECL_LINK(HelpButtonClickHdl, Button *);
public:
-SmFontSizeDialog(Window *pParent, bool bFreeRes = true);
+SmFontSizeDialog(Window *pParent);
void ReadFrom(const SmFormat rFormat);
void WriteTo (SmFormat rFormat) const;
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index 3b2e902..6ab4654 100644
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -77,7 +77,6 @@
#define RID_FONTDIALOG (RID_APP_START + 2)
-#define RID_FONTSIZEDIALOG (RID_APP_START + 3)
#define RID_FONTTYPEDIALOG (RID_APP_START + 4)
#define RID_PRINTOPTIONPAGE (RID_APP_START + 7)
#define RID_SYMDEFINEDIALOG (RID_APP_START + 9)
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 86e2340..3495be9 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -450,62 +450,51 @@
Help* pHelp = Application::GetHelp();
if( pHelp )
{
-pHelp-Start( OUString( HID_SMA_FONTSIZEDIALOG ), aHelpButton1 );
+pHelp-Start( OUString( HID_SMA_FONTSIZEDIALOG ), m_pHelpButton1 );
}
return 0;
}
-SmFontSizeDialog::SmFontSizeDialog(Window * pParent, bool bFreeRes)
-: ModalDialog(pParent, SmResId(RID_FONTSIZEDIALOG)),
-aFixedText1(this, SmResId(1)),
-aBaseSize(this, SmResId(1)),
-aFixedText4(this, SmResId(4)),
-aTextSize(this, SmResId(4)),
-aFixedText5(this, SmResId(5)),
-aIndexSize(this, SmResId(5)),
-aFixedText6(this, SmResId(6)),
-aFunctionSize(this, SmResId(6)),
-aFixedText7(this, SmResId(7)),
-aOperatorSize(this, SmResId(7)),
-aFixedText8(this, SmResId(8)),
-aBorderSize(this, SmResId(8)),
-aFixedLine1(this, SmResId(1)),
-aOKButton1(this, SmResId(1)),
-aHelpButton1(this, SmResId(1)),
-aCancelButton1(this, SmResId(1)),
-aDefaultButton(this, SmResId(1))
+SmFontSizeDialog::SmFontSizeDialog(Window * pParent)
+: ModalDialog(pParent, FontSizeDialog,
modules/smath/ui/fontsizedialog.ui)
{
-if (bFreeRes)
-FreeResource();
+get(m_pTextSize, spinB_text);
+get(m_pIndexSize, spinB_index);
+get(m_pFunctionSize, spinB_function);
+get(m_pOperatorSize, spinB_operator);
+get(m_pBorderSize, spinB_limit);
+get(m_pBaseSize, spinB_baseSize);
+get(m_pHelpButton1, help);
+get(m_pDefaultButton, default);
-aDefaultButton.SetClickHdl(LINK(this, SmFontSizeDialog,
DefaultButtonClickHdl));
-aHelpButton1.SetClickHdl(LINK(this, SmFontSizeDialog, HelpButtonClickHdl));
+m_pDefaultButton-SetClickHdl(LINK(this, SmFontSizeDialog,
DefaultButtonClickHdl));
+m_pHelpButton1-SetClickHdl(LINK(this, SmFontSizeDialog,
HelpButtonClickHdl));
}
void SmFontSizeDialog::ReadFrom(const SmFormat rFormat)
{
//! aufpassen:
LibreOffice Gerrit News 2013-06-17
Moin! * Open changes on master for project core changed in the last 25 hours: fontsizedialog.ui widget in https://gerrit.libreoffice.org/4312 from Manal Alhassoun Migrate CheckFields unit test to python in https://gerrit.libreoffice.org/4294 from David Ostrovsky replace ShapeList::getNextShape with STL like iterator. in https://gerrit.libreoffice.org/4191 from mhofmann fdo#31525 Dialogues now have an appropriate background in OSX in https://gerrit.libreoffice.org/4287 from Jason Hulme handle missing dep files in concat-deps in https://gerrit.libreoffice.org/4302 from Björn Michaelsen Reduce the amount of calls of mkdir -p. in https://gerrit.libreoffice.org/4297 from Jan Holesovsky remove last uses of config 'GUI' variable in https://gerrit.libreoffice.org/4188 from Matúš Kukan Small (hopefully non-controversial) changes to the existing branding in https://gerrit.libreoffice.org/4308 from Stefan Knorr Template Manager: Use actual template icons if no thumbnail exists in https://gerrit.libreoffice.org/3278 from Stefan Knorr fdo#65456 - Provide visual clues in slidesorter for custom animation. in https://gerrit.libreoffice.org/4277 from Edmond Ciorba fdo#65108 clean-up headers(global/local) perl script in https://gerrit.libreoffice.org/4306 from Jelle van der Waa String to OUString (SfxStringItem and related) in https://gerrit.libreoffice.org/4280 from Matteo Casalin * Merged changes on master for project core changed in the last 25 hours: migrate check_index test from Java to Python in https://gerrit.libreoffice.org/4310 from Xiaoli Duan cppcheck: fix duplicateExpression in https://gerrit.libreoffice.org/4279 from Julien Nabet fdo#43460 use isEmpty() in https://gerrit.libreoffice.org/4307 from Jelle van der Waa Fix PDF export with fallback fonts in Core Text in https://gerrit.libreoffice.org/4299 from Khaled Hosny Simplify SwPaM::GetTxt in https://gerrit.libreoffice.org/4213 from Matteo Casalin Get rid of SalLayout::GetFallbackFontData() in https://gerrit.libreoffice.org/4285 from Khaled Hosny PyUno fixed crash in function isInstanceOfStructOrException() in https://gerrit.libreoffice.org/4309 from Xiaoli Duan Another try to fix python unit test on MSVC in https://gerrit.libreoffice.org/4303 from Michael Meeks * Abandoned changes on master for project core changed in the last 25 hours: daily wacking of Strings in https://gerrit.libreoffice.org/4242 from Norbert Thiebaud Sidebar conversion to .ui for sidebar_page_property in https://gerrit.libreoffice.org/4298 from Prashant Pandey * Open changes needing tweaks, but being untouched for more than a week: Remove unused icons after cleaning up Math zoom in https://gerrit.libreoffice.org/4117 from Rodolfo Ribeiro Gomes fdo#51296 Helptext added for hyperlinks, hlinks behave as in writer in https://gerrit.libreoffice.org/4051 from Akash Shetye fdo#44216 Prompt if objects from dropped slide should be fixed in aspect ra in https://gerrit.libreoffice.org/1348 from Rodolfo Ribeiro Gomes Bigger slide thumbnails in slidesorter. in https://gerrit.libreoffice.org/4052 from Thorsten Behrens remove unused code. in https://gerrit.libreoffice.org/3167 from navin patidar Change compareTo - == in dbaccess module in https://gerrit.libreoffice.org/3957 from Paulo Henrique Cuchi fdo#55582 writer, calc: insert shapes also when shapes selected in https://gerrit.libreoffice.org/1524 from Lennard Wasserthal show formula results of new formulas even if auto calc is disabled in https://gerrit.libreoffice.org/3625 from Markus Mohrhard Modified Insert-File... to Insert-Document... #fdo62097 in https://gerrit.libreoffice.org/3309 from Kesha Shah Resolved bug fdo#63766 in https://gerrit.libreoffice.org/3524 from gokul s Use OUString and sal_Int32 in GetNonMnemonicString() and GetCtrlTextWidth() in https://gerrit.libreoffice.org/3160 from Christina Roßmanith Disable database wizard's next-button if needed in
[Libreoffice-commits] core.git: fpicker/source
fpicker/source/win32/filepicker/WinFileOpenImpl.cxx | 16 +---
1 file changed, 5 insertions(+), 11 deletions(-)
New commits:
commit e9fd9c25269abe171e5f693a8c70b33ab5a01c85
Author: Julien Nabet serval2...@yahoo.fr
Date: Fri Jun 14 17:43:34 2013 +0200
Cleaning: remove use of old edt1 from dlg.h (Windows)
edt1 was used before cmb13 (used from Win2K version)
So use only cmb13 + tweaks associated comments
See
http://nabble.documentfoundation.org/Cppcheck-reassignment-of-edt1Id-because-isWin2000-has-been-removed-fpicker-module-td4061342.html
Change-Id: I9d56726508a9fbf2607c9d18b7b33eca340f1b9f
Reviewed-on: https://gerrit.libreoffice.org/4283
Tested-by: Andras Timar ati...@suse.com
Reviewed-by: Andras Timar ati...@suse.com
diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
index f672916..ee2760b 100644
--- a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
+++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
@@ -584,7 +584,7 @@ void SAL_CALL CWinFileOpenImpl::InitControlLabel(HWND hWnd)
// Our approach is to align all static text controls with the
// static text control File name of the FileOpen dialog,
// all checkboxes and all list/comboboxes will be left aligned with
-// the standard combobox edt1 (defined in MS platform sdk dlgs.h)
+// the standard combobox cmb13 (defined in MS platform sdk dlgs.h)
// and all push buttons will be left aligned with the standard
// OK button
//-
@@ -689,8 +689,6 @@ void CWinFileOpenImpl::EnlargeStdControlLabels() const
HWND hFilterBoxLabel = GetDlgItem(m_hwndFileOpenDlg, stc2);
HWND hFileNameBoxLabel = GetDlgItem(m_hwndFileOpenDlg, stc3);
HWND hFileNameBox = GetDlgItem(m_hwndFileOpenDlg, cmb13);
-if (!hFileNameBox)
-hFileNameBox = GetDlgItem(m_hwndFileOpenDlg, edt1); // under Win98 it
is edt1 instead of cmb13
HWND hFilterBox = GetDlgItem(m_hwndFileOpenDlg, cmb1);
HWND hOkButton = GetDlgItem(m_hwndFileOpenDlg, IDOK);
@@ -985,15 +983,11 @@ void SAL_CALL CWinFileOpenImpl::InitialSetDefaultName()
// open dialog (reason: see above setDefaultName)
if (m_bInitialSelChanged m_defaultName.getLength())
{
-sal_Int32 edt1Id = edt1;
-
-// under W2k the there is a combobox instead
+// from W2k there is a combobox instead
// of an edit field for the file name edit field
-// the control id of this box is cmb13 and not
-// edt1 as before so we must use this id
-edt1Id = cmb13;
-
-HWND hwndEdt1 = GetDlgItem(m_hwndFileOpenDlg, edt1Id);
+// So the control id of this box is cmb13 and not
+// edt1 as before
+HWND hwndEdt1 = GetDlgItem(m_hwndFileOpenDlg, cmb13);
SetWindowText(hwndEdt1,
reinterpret_castLPCTSTR(m_defaultName.getStr()));
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Cleaning: remove use of old edt1 from dlg.h (Windows)
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4283 Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/4283 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9d56726508a9fbf2607c9d18b7b33eca340f1b9f Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Julien Nabet serval2...@yahoo.fr Gerrit-Reviewer: Andras Timar ati...@suse.com Gerrit-Reviewer: Julien Nabet serval2...@yahoo.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: configure.ac
configure.ac |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d6e12ac8f04f4a3820ec07bd94cd5352f6f861ca
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Fri Jun 14 09:07:52 2013 +0200
WPX_SEEK_END needs libwpd = 0.9.5
Change-Id: I8f4e41d4f089d989a699e29bbb48a6fb749ff95a
diff --git a/configure.ac b/configure.ac
index 7d0ae76..6b51687 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7311,7 +7311,7 @@ libo_CHECK_SYSTEM_MODULE([libcmis],[CMIS],[libcmis-0.3 =
0.3.1])
dnl ===
dnl Check for system libwpd
dnl ===
-libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.9
libwpd-stream-0.9],[-I${WORKDIR}/UnpackedTarball/libwpd/inc],[-L${OUTDIR}/lib
-lwpdlib])
+libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.9 = 0.9.5 libwpd-stream-0.9
= 0.9.5],[-I${WORKDIR}/UnpackedTarball/libwpd/inc],[-L${OUTDIR}/lib
-lwpdlib])
dnl ===
dnl Check for system lcms2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/win
vcl/win/source/gdi/salbmp.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 0b27b03d03c94b86d5664c1e08941b0df97181a9
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Mon Jun 17 08:52:26 2013 +0200
min - std::min in order to unbreak windows build
Change-Id: I4b7b2acf0f1c3173393841ae1047240e991fb837
diff --git a/vcl/win/source/gdi/salbmp.cxx b/vcl/win/source/gdi/salbmp.cxx
index ac7162d..2173e16 100644
--- a/vcl/win/source/gdi/salbmp.cxx
+++ b/vcl/win/source/gdi/salbmp.cxx
@@ -808,7 +808,7 @@ HGLOBAL WinSalBitmap::ImplCreateDIB( const Size rSize,
sal_uInt16 nBits, const
if( nColors )
{
// copy the palette entries if any
-const sal_uInt16 nMinCount = min( nColors, rPal.GetEntryCount() );
+const sal_uInt16 nMinCount = std::min( nColors, rPal.GetEntryCount() );
if( nMinCount )
memcpy( pBI-bmiColors, rPal.ImplGetColorBuffer(), nMinCount *
sizeof(RGBQUAD) );
}
@@ -976,7 +976,7 @@ void WinSalBitmap::ReleaseBuffer( BitmapBuffer* pBuffer,
bool bReadOnly )
PBITMAPINFO pBI = (PBITMAPINFO) GlobalLock( mhDIB );
const sal_uInt16nCount =
pBuffer-maPalette.GetEntryCount();
const sal_uInt16nDIBColorCount = ImplGetDIBColorCount(
mhDIB );
-memcpy( pBI-bmiColors,
pBuffer-maPalette.ImplGetColorBuffer(), min( nDIBColorCount, nCount ) *
sizeof( RGBQUAD ) );
+memcpy( pBI-bmiColors,
pBuffer-maPalette.ImplGetColorBuffer(), std::min( nDIBColorCount, nCount ) *
sizeof( RGBQUAD ) );
GlobalUnlock( mhDIB );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/Module_sw.mk
sw/Module_sw.mk |2 ++ 1 file changed, 2 insertions(+) New commits: commit 6c7ae36a25a19d401d151dad932b14bd9c8248f3 Author: Stephan Bergmann sberg...@redhat.com Date: Mon Jun 17 09:04:14 2013 +0200 PythonTest still does not work on Windows Change-Id: I79e352efeb1ed3fe8dab53bfb31362ac2ce11b06 diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk index 7048d8e..202c67c 100755 --- a/sw/Module_sw.mk +++ b/sw/Module_sw.mk @@ -72,9 +72,11 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sw,\ endif ifneq ($(DISABLE_PYTHON),TRUE) +ifneq ($(OS),WNT) $(eval $(call gb_Module_add_subsequentcheck_targets,sw,\ PythonTest_sw_python \ )) endif +endif # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-3.6' - instsetoo_native/util solenv/inc
instsetoo_native/util/openoffice.lst |8
solenv/inc/minor.mk |4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit ab643cf17c5b7d24564cb02b326c61cc32f00fc5
Author: Andras Timar ati...@suse.com
Date: Mon Jun 17 09:39:52 2013 +0200
Bump for 3.6-28
Change-Id: I01a47f51a7bfb64284f5a57d784b176dae60b03f
diff --git a/instsetoo_native/util/openoffice.lst
b/instsetoo_native/util/openoffice.lst
index 33eedd5..9ad8e63 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -32,7 +32,7 @@ Globals
CREATE_MSP_INSTALLSET 1
UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
PACKAGEMAP package_names.txt,package_names_ext.txt
-WINDOWSPATCHLEVEL 27
+WINDOWSPATCHLEVEL 28
OOOVENDOR The Document Foundation
OOODOWNLOADNAME 1
BUILDIDCWS {buildidcws}
@@ -57,7 +57,7 @@ LibreOffice
BRANDPACKAGEVERSION 3.6
USERDIRPRODUCTVERSION 3
ABOUTBOXPRODUCTVERSION 3.6
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-527
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-528
BASEPRODUCTVERSION 3.6
PCPFILENAME libreoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php
@@ -110,7 +110,7 @@ LibreOffice_Dev
BRANDPACKAGEVERSION 3.6
USERDIRPRODUCTVERSION 3
ABOUTBOXPRODUCTVERSION 3.6
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-527
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-528
BASEPRODUCTVERSION 3.6
DEVELOPMENTPRODUCT 1
BASISPACKAGEPREFIX lodevbasis
@@ -380,7 +380,7 @@ OxygenOffice
BRANDPACKAGEVERSION 3.6
USERDIRPRODUCTVERSION 3
ABOUTBOXPRODUCTVERSION 3.6
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-527
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-528
BASEPRODUCTVERSION 3.6
PCPFILENAME openoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index c818fab..ff2685f 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,6 +1,6 @@
RSCVERSION=360
-RSCREVISION=360m1(Build:527)
-BUILD=527
+RSCREVISION=360m1(Build:528)
+BUILD=528
LAST_MINOR=m1
SOURCEVERSION=OOO360
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - i18npool/source icon-themes/galaxy icon-themes/hicontrast sfx2/source
i18npool/source/localedata/data/sid_ET.xml |2 +- icon-themes/galaxy/res/otg_48_8.png|binary icon-themes/galaxy/res/otp_48_8.png|binary icon-themes/galaxy/res/ots_16_8.png|binary icon-themes/galaxy/res/ots_32_8.png|binary icon-themes/galaxy/res/ots_48_8.png|binary icon-themes/galaxy/res/ott_16_8.png|binary icon-themes/galaxy/res/ott_32_8.png|binary icon-themes/galaxy/res/ott_48_8.png|binary icon-themes/hicontrast/res/otg_48_8.png|binary icon-themes/hicontrast/res/otp_48_8.png|binary icon-themes/hicontrast/res/ots_16_8.png|binary icon-themes/hicontrast/res/ots_32_8.png|binary icon-themes/hicontrast/res/ots_48_8.png|binary icon-themes/hicontrast/res/ott_16_8.png|binary icon-themes/hicontrast/res/ott_32_8.png|binary icon-themes/hicontrast/res/ott_48_8.png|binary sfx2/source/appl/sfx.src |8 18 files changed, 5 insertions(+), 5 deletions(-) New commits: commit 3d9e3cd2a2d07327427b70d4afe1c628793dee8e Author: Stefan Knorr heinzless...@gmail.com Date: Tue Apr 9 00:04:33 2013 +0200 Template Manager: Use actual template icons if no thumbnail exists Change-Id: Ie1ee86a180701355886a340ea97940303f527422 Reviewed-on: https://gerrit.libreoffice.org/3278 Reviewed-by: Bosdonnat Cedric cedric.bosdon...@free.fr Tested-by: Bosdonnat Cedric cedric.bosdon...@free.fr diff --git a/icon-themes/galaxy/res/otg_48_8.png b/icon-themes/galaxy/res/otg_48_8.png new file mode 100644 index 000..2b6cb31 Binary files /dev/null and b/icon-themes/galaxy/res/otg_48_8.png differ diff --git a/icon-themes/galaxy/res/otp_48_8.png b/icon-themes/galaxy/res/otp_48_8.png new file mode 100644 index 000..b605872 Binary files /dev/null and b/icon-themes/galaxy/res/otp_48_8.png differ diff --git a/icon-themes/galaxy/res/ots_16_8.png b/icon-themes/galaxy/res/ots_16_8.png index d5a4995..a2fda38 100644 Binary files a/icon-themes/galaxy/res/ots_16_8.png and b/icon-themes/galaxy/res/ots_16_8.png differ diff --git a/icon-themes/galaxy/res/ots_32_8.png b/icon-themes/galaxy/res/ots_32_8.png index 0b5604c..6d70b4b 100644 Binary files a/icon-themes/galaxy/res/ots_32_8.png and b/icon-themes/galaxy/res/ots_32_8.png differ diff --git a/icon-themes/galaxy/res/ots_48_8.png b/icon-themes/galaxy/res/ots_48_8.png index 950c965..1b5a09b 100644 Binary files a/icon-themes/galaxy/res/ots_48_8.png and b/icon-themes/galaxy/res/ots_48_8.png differ diff --git a/icon-themes/galaxy/res/ott_16_8.png b/icon-themes/galaxy/res/ott_16_8.png index 7b922f1..06d8c6e 100644 Binary files a/icon-themes/galaxy/res/ott_16_8.png and b/icon-themes/galaxy/res/ott_16_8.png differ diff --git a/icon-themes/galaxy/res/ott_32_8.png b/icon-themes/galaxy/res/ott_32_8.png index 501f8a2..421adc4 100644 Binary files a/icon-themes/galaxy/res/ott_32_8.png and b/icon-themes/galaxy/res/ott_32_8.png differ diff --git a/icon-themes/galaxy/res/ott_48_8.png b/icon-themes/galaxy/res/ott_48_8.png index 947edbf..58132d6 100644 Binary files a/icon-themes/galaxy/res/ott_48_8.png and b/icon-themes/galaxy/res/ott_48_8.png differ diff --git a/icon-themes/hicontrast/res/otg_48_8.png b/icon-themes/hicontrast/res/otg_48_8.png new file mode 100644 index 000..4ecb427 Binary files /dev/null and b/icon-themes/hicontrast/res/otg_48_8.png differ diff --git a/icon-themes/hicontrast/res/otp_48_8.png b/icon-themes/hicontrast/res/otp_48_8.png new file mode 100644 index 000..0e765ad Binary files /dev/null and b/icon-themes/hicontrast/res/otp_48_8.png differ diff --git a/icon-themes/hicontrast/res/ots_16_8.png b/icon-themes/hicontrast/res/ots_16_8.png new file mode 100644 index 000..bb6d613 Binary files /dev/null and b/icon-themes/hicontrast/res/ots_16_8.png differ diff --git a/icon-themes/hicontrast/res/ots_32_8.png b/icon-themes/hicontrast/res/ots_32_8.png new file mode 100644 index 000..42d9209 Binary files /dev/null and b/icon-themes/hicontrast/res/ots_32_8.png differ diff --git a/icon-themes/hicontrast/res/ots_48_8.png b/icon-themes/hicontrast/res/ots_48_8.png new file mode 100644 index 000..cc41af5 Binary files /dev/null and b/icon-themes/hicontrast/res/ots_48_8.png differ diff --git a/icon-themes/hicontrast/res/ott_16_8.png b/icon-themes/hicontrast/res/ott_16_8.png new file mode 100644 index 000..a432a8f Binary files /dev/null and b/icon-themes/hicontrast/res/ott_16_8.png differ diff --git a/icon-themes/hicontrast/res/ott_32_8.png b/icon-themes/hicontrast/res/ott_32_8.png new file mode 100644 index 000..1014748 Binary files /dev/null and b/icon-themes/hicontrast/res/ott_32_8.png differ diff --git a/icon-themes/hicontrast/res/ott_48_8.png b/icon-themes/hicontrast/res/ott_48_8.png new file mode 100644 index 000..5f7ba1d Binary files /dev/null and b/icon-themes/hicontrast/res/ott_48_8.png differ diff --git a/sfx2/source/appl/sfx.src b/sfx2/source/appl/sfx.src index fb58ee3..dce02d7 100644 ---
[PUSHED] Template Manager: Use actual template icons if no thumbnail ...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3278 Approvals: Bosdonnat Cedric: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3278 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie1ee86a180701355886a340ea97940303f527422 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Stefan Knorr heinzless...@gmail.com Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/win
vcl/win/source/gdi/salbmp.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 919684989da543d8884bb68d7d1c33c2cbe8a9b7
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Mon Jun 17 10:09:49 2013 +0200
Fixing the joy of MSVC preprocessor
Change-Id: I4e97f93de568b1704a58ab5e5c47e85e09327779
diff --git a/vcl/win/source/gdi/salbmp.cxx b/vcl/win/source/gdi/salbmp.cxx
index 2173e16..2094dc6 100644
--- a/vcl/win/source/gdi/salbmp.cxx
+++ b/vcl/win/source/gdi/salbmp.cxx
@@ -808,7 +808,7 @@ HGLOBAL WinSalBitmap::ImplCreateDIB( const Size rSize,
sal_uInt16 nBits, const
if( nColors )
{
// copy the palette entries if any
-const sal_uInt16 nMinCount = std::min( nColors, rPal.GetEntryCount() );
+const sal_uInt16 nMinCount = (std::min)( nColors, rPal.GetEntryCount()
);
if( nMinCount )
memcpy( pBI-bmiColors, rPal.ImplGetColorBuffer(), nMinCount *
sizeof(RGBQUAD) );
}
@@ -976,7 +976,7 @@ void WinSalBitmap::ReleaseBuffer( BitmapBuffer* pBuffer,
bool bReadOnly )
PBITMAPINFO pBI = (PBITMAPINFO) GlobalLock( mhDIB );
const sal_uInt16nCount =
pBuffer-maPalette.GetEntryCount();
const sal_uInt16nDIBColorCount = ImplGetDIBColorCount(
mhDIB );
-memcpy( pBI-bmiColors,
pBuffer-maPalette.ImplGetColorBuffer(), std::min( nDIBColorCount, nCount ) *
sizeof( RGBQUAD ) );
+memcpy( pBI-bmiColors,
pBuffer-maPalette.ImplGetColorBuffer(), (std::min)( nDIBColorCount, nCount ) *
sizeof( RGBQUAD ) );
GlobalUnlock( mhDIB );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Repository.mk
Repository.mk |6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) New commits: commit a074ee056a8b73fc14724522a5c0d1c34850c529 Author: Tor Lillqvist t...@iki.fi Date: Mon Jun 17 11:15:44 2013 +0300 Fix iOS cross-compilation No idea why the filter-out here was needed at some point in time, but at least now it broke cross-compilation for iOS. Change-Id: I6c4d3f6151ac2821db5f79c3e4113400b740f7f3 diff --git a/Repository.mk b/Repository.mk index 3473046..51089bb 100644 --- a/Repository.mk +++ b/Repository.mk @@ -119,10 +119,8 @@ $(eval $(call gb_Helper_register_executables,OOO, \ $(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\ $(if $(and $(SOLAR_JAVA),$(filter-out MACOSX WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),javaldx) \ - $(if $(filter-out IOS,$(OS)), \ - regmerge \ - regview \ - ) \ + regmerge \ + regview \ $(if $(filter DESKTOP,$(BUILD_TYPE)),uno) \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - f3/71f92c89d296207ef9a219518ba8caa481bcfe
f3/71f92c89d296207ef9a219518ba8caa481bcfe |1 + 1 file changed, 1 insertion(+) New commits: commit 949f2fec7fa960e52eb79508f012d9e9b55bcd80 Author: Caolán McNamara caol...@redhat.com Date: Mon Jun 17 09:24:07 2013 +0100 Notes added by 'git notes add' diff --git a/f3/71f92c89d296207ef9a219518ba8caa481bcfe b/f3/71f92c89d296207ef9a219518ba8caa481bcfe new file mode 100644 index 000..8af6869 --- /dev/null +++ b/f3/71f92c89d296207ef9a219518ba8caa481bcfe @@ -0,0 +1 @@ +merged as: d1310b7628a68fe13284818ba4a5d38eaef742c4 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - drawinglayer/Library_drawinglayer.mk drawinglayer/source include/drawinglayer svx/source sw/source
drawinglayer/Library_drawinglayer.mk |1
drawinglayer/source/processor2d/processor2dtools.cxx | 63
drawinglayer/source/processor2d/processorfromoutputdevice.cxx |4
drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx|4
drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx| 151 ++
drawinglayer/source/processor2d/vclpixelprocessor2d.cxx |2
drawinglayer/source/processor2d/vclpixelprocessor2d.hxx | 63
drawinglayer/source/processor2d/vclprocessor2d.cxx|2
drawinglayer/source/processor2d/vclprocessor2d.hxx| 134
drawinglayer/source/tools/converters.cxx | 112 ---
include/drawinglayer/processor2d/processor2dtools.hxx | 79 +
include/drawinglayer/processor2d/vclmetafileprocessor2d.hxx | 151 --
include/drawinglayer/processor2d/vclpixelprocessor2d.hxx | 63
include/drawinglayer/processor2d/vclprocessor2d.hxx | 134
include/drawinglayer/processor3d/defaultprocessor3d.hxx |2
include/drawinglayer/processor3d/zbufferprocessor3d.hxx |2
svx/source/sdr/contact/objectcontactofobjlistpainter.cxx |9
svx/source/sdr/contact/objectcontactofpageview.cxx|7
svx/source/sdr/overlay/overlaymanager.cxx | 10
svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx |2
svx/source/svdraw/svdedxv.cxx |6
sw/source/core/doc/notxtfrm.cxx |6
22 files changed, 582 insertions(+), 425 deletions(-)
New commits:
commit 881b79dc21560bbdb6bf0e9b50061d1507e5e165
Author: Armin Le Grand a...@apache.org
Date: Tue Apr 9 08:37:28 2013 +
Resolves: #i113080# added test code, cleaned up a small inconsistency
(cherry picked from commit d7fa73b25f75796291432496d9bb8d7c80e82c8b)
Conflicts:
drawinglayer/source/tools/converters.cxx
Change-Id: Ia8edda4ca2c79bfc9d4a0962f99d8db581622a7d
diff --git a/drawinglayer/source/tools/converters.cxx
b/drawinglayer/source/tools/converters.cxx
index 7571201..76f37d5 100644
--- a/drawinglayer/source/tools/converters.cxx
+++ b/drawinglayer/source/tools/converters.cxx
@@ -44,6 +44,9 @@ namespace drawinglayer
sal_uInt32 nMaxQuadratPixels)
{
BitmapEx aRetval;
+#ifdef DBG_UTIL
+static bool bDoSaveForVisualControl(false);
+#endif
if(rSeq.hasElements() nDiscreteWidth nDiscreteHeight)
{
@@ -75,13 +78,14 @@ namespace drawinglayer
// prepare vdev
maContent.SetOutputSizePixel(aSizePixel, false);
maContent.SetMapMode(aMapModePixel);
-maContent.SetAntialiasing(true);
// set to all white
maContent.SetBackground(Wallpaper(Color(COL_WHITE)));
maContent.Erase();
-// create pixel processor
+// create pixel processor, also already takes care of AAing and
+// checking the getOptionsDrawinglayer().IsAntiAliasing()
switch. If
+// not wanted, change after this call as needed
processor2d::BaseProcessor2D* pContentProcessor =
processor2d::createPixelProcessor2DFromOutputDevice(
maContent,
aViewInformation2D);
@@ -95,21 +99,29 @@ namespace drawinglayer
maContent.EnableMapMode(false);
const Bitmap aContent(maContent.GetBitmap(aEmptyPoint,
aSizePixel));
+#ifdef DBG_UTIL
+if(bDoSaveForVisualControl)
+{
+SvFileStream aNew(OUString(c:\\test_content.png),
STREAM_WRITE|STREAM_TRUNC);
+::vcl::PNGWriter aPNGWriter(aContent);
+aPNGWriter.Write(aNew);
+}
+#endif
// prepare for mask creation
maContent.SetMapMode(aMapModePixel);
-maContent.SetAntialiasing(true);
// set alpha to all white (fully transparent)
maContent.Erase();
// embed primitives to paint them black
+static basegfx::BColorModifyMode aMode =
basegfx::BCOLORMODIFYMODE_REPLACE;
const primitive2d::Primitive2DReference xRef(
new primitive2d::ModifiedColorPrimitive2D(
aSequence,
basegfx::BColorModifier(
basegfx::BColor(0.0, 0.0, 0.0),
0.5,
-basegfx::BCOLORMODIFYMODE_REPLACE)));
+aMode)));
const primitive2d::Primitive2DSequence xSeq(xRef, 1);
// render
@@
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - d7/fa73b25f75796291432496d9bb8d7c80e82c8b
d7/fa73b25f75796291432496d9bb8d7c80e82c8b |1 + 1 file changed, 1 insertion(+) New commits: commit 17f2c31b2e1fffac7a728fd2f1dc12945543f2ff Author: Caolán McNamara caol...@redhat.com Date: Mon Jun 17 09:23:46 2013 +0100 Notes added by 'git notes add' diff --git a/d7/fa73b25f75796291432496d9bb8d7c80e82c8b b/d7/fa73b25f75796291432496d9bb8d7c80e82c8b new file mode 100644 index 000..507aaea --- /dev/null +++ b/d7/fa73b25f75796291432496d9bb8d7c80e82c8b @@ -0,0 +1 @@ +merged as: 881b79dc21560bbdb6bf0e9b50061d1507e5e165 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 3b/d3ea81c8d54109950b435225c3aac011d56c3d a4/c602d9b5b17e220dbaa4dec2cef91d39945154
3b/d3ea81c8d54109950b435225c3aac011d56c3d |1 + a4/c602d9b5b17e220dbaa4dec2cef91d39945154 |1 + 2 files changed, 2 insertions(+) New commits: commit 56d065d335ecde249e6ad7f7e0c3f395cf8ceb80 Author: Caolán McNamara caol...@redhat.com Date: Mon Jun 17 09:24:50 2013 +0100 Notes added by 'git notes add' diff --git a/a4/c602d9b5b17e220dbaa4dec2cef91d39945154 b/a4/c602d9b5b17e220dbaa4dec2cef91d39945154 new file mode 100644 index 000..8af6869 --- /dev/null +++ b/a4/c602d9b5b17e220dbaa4dec2cef91d39945154 @@ -0,0 +1 @@ +merged as: d1310b7628a68fe13284818ba4a5d38eaef742c4 commit 0a6d3a79fa974e4ca8eb52a50f357d840baae9e1 Author: Caolán McNamara caol...@redhat.com Date: Mon Jun 17 09:24:42 2013 +0100 Notes added by 'git notes add' diff --git a/3b/d3ea81c8d54109950b435225c3aac011d56c3d b/3b/d3ea81c8d54109950b435225c3aac011d56c3d new file mode 100644 index 000..8af6869 --- /dev/null +++ b/3b/d3ea81c8d54109950b435225c3aac011d56c3d @@ -0,0 +1 @@ +merged as: d1310b7628a68fe13284818ba4a5d38eaef742c4 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - c7/3f0e910fcf3a940c24a639dba9b4ced2057399
c7/3f0e910fcf3a940c24a639dba9b4ced2057399 |1 + 1 file changed, 1 insertion(+) New commits: commit 94a39aba4e79cf2ee5c0f6ae9278a0beabc4774e Author: Caolán McNamara caol...@redhat.com Date: Mon Jun 17 09:42:33 2013 +0100 Notes added by 'git notes add' diff --git a/c7/3f0e910fcf3a940c24a639dba9b4ced2057399 b/c7/3f0e910fcf3a940c24a639dba9b4ced2057399 new file mode 100644 index 000..f4942c9 --- /dev/null +++ b/c7/3f0e910fcf3a940c24a639dba9b4ced2057399 @@ -0,0 +1 @@ +merged as: 0994eb59a1bd1a993c7b6650570454ecad6077b0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source sd/source sw/source
sc/source/ui/drawfunc/drawsh4.cxx | 12 ---
sc/source/ui/drawfunc/drtxtob2.cxx | 12 ---
sd/source/ui/view/drviews6.cxx | 11 --
sw/source/ui/shells/drawsh.cxx | 34 +++-
sw/source/ui/shells/drwtxtsh.cxx | 39 +
5 files changed, 71 insertions(+), 37 deletions(-)
New commits:
commit 0994eb59a1bd1a993c7b6650570454ecad6077b0
Author: Armin Le Grand a...@apache.org
Date: Tue Apr 9 11:22:48 2013 +
Resolves: #i121538# Disable FontWork dialog entries (slots)...
when CustomShapes are selected to avoid unwanted FontWork editing on these
shapes
(cherry picked from commit c73f0e910fcf3a940c24a639dba9b4ced2057399)
Conflicts:
sw/source/ui/shells/drawsh.cxx
sw/source/ui/shells/drwtxtsh.cxx
Change-Id: I6b702512c48e7b2376874b2e8184563d12d5c6e8
diff --git a/sc/source/ui/drawfunc/drawsh4.cxx
b/sc/source/ui/drawfunc/drawsh4.cxx
index b6bea362..ed48933 100644
--- a/sc/source/ui/drawfunc/drawsh4.cxx
+++ b/sc/source/ui/drawfunc/drawsh4.cxx
@@ -24,7 +24,7 @@
#include svx/xdef.hxx
#include sfx2/objsh.hxx
#include sfx2/viewfrm.hxx
-
+#include svx/svdoashp.hxx
#include drawsh.hxx
#include drawview.hxx
#include viewdata.hxx
@@ -49,8 +49,14 @@ void ScDrawShell::GetFormTextState(SfxItemSet rSet)
if ( rMarkList.GetMarkCount() == 1 )
pObj = rMarkList.GetMark(0)-GetMarkedSdrObj();
-if ( pObj == NULL || !pObj-ISA(SdrTextObj) ||
-!((SdrTextObj*) pObj)-HasText() )
+const SdrTextObj* pTextObj = dynamic_cast const SdrTextObj* (pObj);
+const bool bDeactivate(
+!pObj ||
+!pTextObj ||
+!pTextObj-HasText() ||
+dynamic_cast const SdrObjCustomShape* (pObj)); // #121538# no
FontWork for CustomShapes
+
+if(bDeactivate)
{
if ( pDlg )
pDlg-SetActive(false);
diff --git a/sc/source/ui/drawfunc/drtxtob2.cxx
b/sc/source/ui/drawfunc/drtxtob2.cxx
index dcf1b98..cb09ff1 100644
--- a/sc/source/ui/drawfunc/drtxtob2.cxx
+++ b/sc/source/ui/drawfunc/drtxtob2.cxx
@@ -33,7 +33,7 @@
#include sfx2/request.hxx
#include sot/formats.hxx
#include svl/whiter.hxx
-
+#include svx/svdoashp.hxx
#include sc.hrc
#include drtxtob.hxx
#include viewdata.hxx
@@ -236,8 +236,14 @@ void ScDrawTextObjectBar::GetFormTextState(SfxItemSet
rSet)
if ( rMarkList.GetMarkCount() == 1 )
pObj = rMarkList.GetMark(0)-GetMarkedSdrObj();
-if ( pObj == NULL || !pObj-ISA(SdrTextObj) ||
-!((SdrTextObj*) pObj)-HasText() )
+const SdrTextObj* pTextObj = dynamic_cast const SdrTextObj* (pObj);
+const bool bDeactivate(
+!pObj ||
+!pTextObj ||
+!pTextObj-HasText() ||
+dynamic_cast const SdrObjCustomShape* (pObj)); // #121538# no
FontWork for CustomShapes
+
+if(bDeactivate)
{
if ( pDlg )
pDlg-SetActive(false);
diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx
index a4b0c2e..8b9f5dd 100644
--- a/sd/source/ui/view/drviews6.cxx
+++ b/sd/source/ui/view/drviews6.cxx
@@ -54,6 +54,7 @@
#include DrawDocShell.hxx
#include sdabstdlg.hxx
#include framework/FrameworkHelper.hxx
+#include svx/svdoashp.hxx
namespace sd {
@@ -122,8 +123,14 @@ void DrawViewShell::GetFormTextState(SfxItemSet rSet)
if ( rMarkList.GetMarkCount() == 1 )
pObj = rMarkList.GetMark(0)-GetMarkedSdrObj();
-if ( pObj == NULL || !pObj-ISA(SdrTextObj) ||
-!((SdrTextObj*) pObj)-HasText() )
+const SdrTextObj* pTextObj = dynamic_cast const SdrTextObj* (pObj);
+const bool bDeactivate(
+!pObj ||
+!pTextObj ||
+!pTextObj-HasText() ||
+dynamic_cast const SdrObjCustomShape* (pObj)); // #121538# no
FontWork for CustomShapes
+
+if(bDeactivate)
{
// automatic open/close the FontWork-Dialog; first deactivate it
diff --git a/sw/source/ui/shells/drawsh.cxx b/sw/source/ui/shells/drawsh.cxx
index a7627c6..4694ec2 100644
--- a/sw/source/ui/shells/drawsh.cxx
+++ b/sw/source/ui/shells/drawsh.cxx
@@ -42,9 +42,9 @@
#include comphelper/processfactory.hxx
#include com/sun/star/ui/dialogs/XSLTFilterDialog.hpp
+#include svx/svdoashp.hxx
#include svx/xtable.hxx
#include sfx2/sidebar/EnumContext.hxx
-#include svx/svdoashp.hxx
#include swundo.hxx
#include wrtsh.hxx
@@ -442,19 +442,27 @@ void SwDrawShell::GetFormTextState(SfxItemSet rSet)
if ( rMarkList.GetMarkCount() == 1 )
pObj = rMarkList.GetMark(0)-GetMarkedSdrObj();
-if ( pObj == NULL || !pObj-ISA(SdrTextObj) ||
-!((SdrTextObj*) pObj)-HasText() )
+const SdrTextObj* pTextObj = dynamic_cast const SdrTextObj* (pObj);
+const bool bDeactivate(
+!pObj ||
+!pTextObj ||
+!pTextObj-HasText() ||
+dynamic_cast const SdrObjCustomShape* (pObj)); // #121538# no
FontWork for CustomShapes
+
+if(bDeactivate)
{
-#define XATTR_ANZ 12
-static const
[Libreoffice-commits] core.git: RepositoryExternal.mk
RepositoryExternal.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 94b6882b80c91d2daf5e317e9d79d3d2a1c6572b Author: Matúš Kukan matus.ku...@gmail.com Date: Mon Jun 17 10:41:18 2013 +0200 fix gengal dependencies Regression from 9555b5bdb9ce2251bb8c4f967f20ed1b13eecf5e Change-Id: I91a7efb207209020acef751ad4f766328dc92c57 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 81e1b71..e818cb4 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2794,7 +2794,7 @@ endef # Better duplication with gb_Gallery__UNO_COMPONENTS than nothing. # This is used to determine what we need for 'build' platform. define gb_Executable__register_gengal -$(call gb_Executable_add_runtime_dependencies,$(1),\ +$(call gb_Executable_add_runtime_dependencies,gengal,\ $(foreach component, \ comphelper/util/comphelp \ configmgr/source/configmgr \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: build failure in [build GAL] arrows
Hi, On 17 June 2013 03:19, Terrence Enger ten...@iseries-guru.com wrote: Hi, I have two successive failures building master, each at the step [build GAL] arrows. The first was an incremental build of commit 843735f pulled today (Sunday) around 00:45 UCT, which failed with ... ... Among recent commits, 9555b5b Add gengal to RepositoryFixes and autoinstall it. catches my eye because it shares the string gengal with the first error message. Indeed, sorry for this, there was missing dependency hopefully fixed with http://cgit.freedesktop.org/libreoffice/core/commit/?id=94b6882b80c91d2daf5e317e9d79d3d2a1c6572bfix gengal dependencies Best, Matus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: GSOC report week 0,1
On 16/06/13 19:54, Gergő Mocsi wrote: Hi all, this is my GSOC weekly (now, two week) report. Unfortunately, I could work a few due to some other matters. sorry to hear you were sick Here's what I've got: Accordig to the arrangement, I've started to investigate, how BASIC handles variable delarations (as I wrote in the email), and I've tried to do the same as it does in VBA mode. Now, it allows variable of any type to be declared, and does not complain about it (in experimental mode). Further, I've introduced reflection, so it checks if that interface exists, eg: Dim aPicker As com.sun.star.ui.dialogs.XFilePicker will be treated as a valid type, and Dim aVar As com.sun.star.foo.Foo will be an invalid one. cool, this is this is the real keystone patch, somewhere down the line we can think improvements to this e.g. perhaps being able to accept just the leaf name ( XFilePicker ) or even ( like vba does ) accept all variant of the name e.g. ( dialogs.XFilePicker, ui.dialogs.XFilePicker etc. ) but.. anyway I think that is more cosmetic issue that can be looked into when we have actually something working Also, i've moved further to find the function whick checks for newly declared subroutines in the IDE when writing the code. so, any more luck with that ?, probably it is done in basic module ( and not the IDE module ) IIRC I saw where this was done at some point when we made the IDE accept run from cursor ( might be you could find it from there ) e.g. If you have a number of macros defined in a module and from the ide you place the cursor in a macro and press the 'Run' button on the toolbar (or press F5) then the IDE will try and invoke the procedure the cursor is in is run. I recall that when you are typing basic tracks any procedures that are defined ( and the line numbers that the procedure occupies ) This is needed to connect these two things together, but I've notices that the object inspector does not shows the declared variables, and maybe this is needed (another idea to solve :D ). This function is called void TreeListBox::ImpCreateLibSubEntries() and it's located in file basctl/source/basicide/bastype2.cxx in line 325. This is what I've done. hmm, that's the not the object inspector but the browser ( that shows the modules and procedures ) Its surely related as it displays the SbMethod instances that represent the procedures we are interested in. Finding where those are created will eventually point to where the pre-parsing for that happens Noel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - i18npool/CustomTarget_collator.mk i18npool/source
i18npool/CustomTarget_collator.mk |1 +
i18npool/source/collator/collator_unicode.cxx |6 +-
2 files changed, 6 insertions(+), 1 deletion(-)
New commits:
commit b93107f3d510f19faa2e62dc965aea9f1b46898d
Author: Andras Timar ati...@suse.com
Date: Mon Jun 17 09:24:47 2013 +0200
typo fix, use ja_charset for Japanese
Change-Id: I29b7db952a8cc9e0670e03dd79204486332aabe9
diff --git a/i18npool/source/collator/collator_unicode.cxx
b/i18npool/source/collator/collator_unicode.cxx
index 45f63c7..89bfa05 100644
--- a/i18npool/source/collator/collator_unicode.cxx
+++ b/i18npool/source/collator/collator_unicode.cxx
@@ -165,7 +165,7 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString
rAlgorithm, const lang::
func = get_collator_data_hu_charset;
} else if ( rLocale.Language == ja ) {
if ( rAlgorithm == charset )
-func = get_collator_data_hu_charset;
+func = get_collator_data_ja_charset;
else if ( rAlgorithm == phonetic (alphanumeric first) )
func = get_collator_data_ja_phonetic_alphanumeric_first;
else if ( rAlgorithm == phonetic (alphanumeric last) )
commit fb4542f3427c0b37463c5fa6bb5602ce423510d9
Author: Andras Timar ati...@suse.com
Date: Mon Jun 17 09:23:38 2013 +0200
fdo#65809 Sidama (sit-ET) collation data
Change-Id: Icc68dcc44678f4151ff5d4a25dd8868218363341
diff --git a/i18npool/CustomTarget_collator.mk
b/i18npool/CustomTarget_collator.mk
index 22b24ad..04527bb 100644
--- a/i18npool/CustomTarget_collator.mk
+++ b/i18npool/CustomTarget_collator.mk
@@ -22,6 +22,7 @@ i18npool_COTXTS := \
ln_charset.txt \
my_dictionary.txt \
ne_charset.txt \
+sid_charset.txt \
zh_charset.txt \
zh_pinyin.txt \
zh_radical.txt \
diff --git a/i18npool/source/collator/collator_unicode.cxx
b/i18npool/source/collator/collator_unicode.cxx
index 5771e71..45f63c7 100644
--- a/i18npool/source/collator/collator_unicode.cxx
+++ b/i18npool/source/collator/collator_unicode.cxx
@@ -74,6 +74,7 @@ const sal_uInt8* get_collator_data_ku_alphanumeric();
const sal_uInt8* get_collator_data_ln_charset();
const sal_uInt8* get_collator_data_my_dictionary();
const sal_uInt8* get_collator_data_ne_charset();
+const sal_uInt8* get_collator_data_sid_charset();
const sal_uInt8* get_collator_data_zh_TW_charset();
const sal_uInt8* get_collator_data_zh_TW_radical();
const sal_uInt8* get_collator_data_zh_TW_stroke();
@@ -184,6 +185,9 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString
rAlgorithm, const lang::
} else if ( rLocale.Language == ne ) {
if ( rAlgorithm == charset )
func = get_collator_data_ne_charset;
+} else if ( rLocale.Language == sid ) {
+if ( rAlgorithm == charset )
+func = get_collator_data_sid_charset;
} else if ( rLocale.Language == zh (rLocale.Country == TW
|| rLocale.Country == HK || rLocale.Country == MO) ) {
if ( rAlgorithm == charset )
func = get_collator_data_zh_TW_charset;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Bonjour Service implementation on server end
(Sorry, I noticed now that I had forgotten to reply to this email... Please, let's have technical discusion like this in public on the LibreOffice development list.) On 12 June 2013 11:49, Siqi Liu m...@siqi.fr wrote: Now that I can get the remote end to connect to server with a manually setup ip address, I'm looking for a way to allow users to easily discover running server end on the local network automaticallywhich leads me to the Bonjour protocol. Yep, that is what we should use to find OS X Impress instances, I think. It seems that Bonjour has some great support for Mac and iOS device so I can search for running mac libreoffice instance on the local network. But I'm not sure if we have some nice c++ native support (and also are there any windows, linux support for Bonjour?) for that since libreoffice is supposed to work cross-platform. I think the implementation for Linux is called Avahi. Not sure about Windows. Do you have any experience around that? Sorry, nope. And where can I find the server end code in the libO repo? sd/source/ui/remotecontrol --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: MSI process
On 06/17/2013 12:35 AM, Mat M wrote: * layerlinks.cxx: handle creation of a ure-link file at root. this file is used to abstract URE path in code (mainly installation related, though). My question is: could we create this file during instsetoo and add it as a simple file in the MSI, so CustomAction could be removed ? = to keep for now The ure-link file on Windows is a remnant from a time when we split OOo installation sets into three layers (URE, basis, brand), and the tree layers, at least in principle and somewhat depending on platform, could be at arbitrary locations relative to each other. The basis/brand split is long gone again by now, and the URE is effectively always at a fixed location relative to the rest of the installation, esp. on Windows (in the URE directory). The most trivial fix would thus be to have the Windows-specific ure-link file as a normal file, with hardcoded content, instead of generating it via a custom action during installation. (I wasn't aware that was still the case.) (An almost as trivial fix should be to get rid of the ure-link file on Windows completely, though that might come at the expense of introducing platform-dependence into some hard-coded paths in the code. I'll look into that.) Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/svx sc/sdi sc/source sd/inc sd/sdi sd/source svx/sdi svx/source sw/inc sw/sdi sw/source
include/svx/dialogs.hrc| 29 --- include/svx/fontwork.hxx | 14 - include/svx/svdstr.hrc |1 include/svx/svxids.hrc |1 include/svx/unoshprp.hxx |1 include/svx/xdef.hxx |5 include/svx/xenum.hxx |5 include/svx/xtextit.hxx|1 sc/sdi/drawsh.sdi |1 sc/sdi/drtxtob.sdi |1 sc/source/ui/app/typemap.cxx |1 sc/source/ui/drawfunc/drawsh4.cxx |1 sc/source/ui/drawfunc/drawsh5.cxx | 22 -- sc/source/ui/drawfunc/drtxtob2.cxx | 22 -- sd/inc/pch/precompiled_sd.hxx |1 sd/sdi/_drvwsh.sdi |5 sd/source/core/typemap.cxx |1 sd/source/ui/view/drviews6.cxx | 27 --- svx/sdi/svx.sdi| 27 --- svx/sdi/xoitems.sdi|1 svx/source/dialog/fontwork.cxx | 305 - svx/source/dialog/fontwork.hrc |1 svx/source/dialog/fontwork.src | 141 + svx/source/svdraw/svdattr.cxx |1 svx/source/svdraw/svdibrow.cxx |4 svx/source/svdraw/svdstr.src |5 svx/source/xoutdev/xattr.cxx | 72 svx/source/xoutdev/xpool.cxx |2 sw/inc/pch/precompiled_sw.hxx |1 sw/sdi/drawsh.sdi |7 sw/sdi/drwtxtsh.sdi|7 sw/source/ui/shells/drawsh.cxx | 22 -- sw/source/ui/shells/drwtxtsh.cxx | 22 -- sw/source/ui/shells/slotadd.cxx|1 34 files changed, 32 insertions(+), 726 deletions(-) New commits: commit 573322e26b0244b27f70cfbc8989b3040a34f3d6 Author: Armin Le Grand a...@apache.org Date: Tue Apr 9 16:06:32 2013 + Resolves: #i121538# Removed old Fontwork dialogs preset box... and all dependencies (cherry picked from commit bcfee75544246db6788715d98efd6d33c12f933d) Conflicts: sd/inc/pch/precompiled_sd.hxx sd/source/core/typemap.cxx sd/source/ui/view/drviews6.cxx svx/Package_inc.mk svx/inc/svx/dialogs.hrc svx/inc/svx/fontwork.hxx svx/inc/svx/svdstr.hrc svx/inc/svx/svxcommands.h svx/inc/svx/svxids.hrc svx/inc/svx/unoshprp.hxx svx/inc/svx/xdef.hxx svx/inc/svx/xenum.hxx svx/inc/svx/xtextit.hxx svx/source/dialog/fontwork.cxx svx/source/dialog/fontwork.hrc svx/source/dialog/fontwork.src svx/source/xoutdev/xattr.cxx sw/inc/pch/precompiled_sw.hxx Change-Id: I3718285d38444d3862ca382fe020a4e0a083a677 diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc index fa3c869..8ba1b2d 100644 --- a/include/svx/dialogs.hrc +++ b/include/svx/dialogs.hrc @@ -203,20 +203,6 @@ // FontWork dialog #define RID_SVXDLG_FONTWORK (RID_SVX_START + 93) -// FontWork ValueSet bitmaps -#define RID_SVXBMP_FONTWORK_FORM1 (RID_SVX_START + 94) -#define RID_SVXBMP_FONTWORK_FORM2 (RID_SVX_START + 95) -#define RID_SVXBMP_FONTWORK_FORM3 (RID_SVX_START + 96) -#define RID_SVXBMP_FONTWORK_FORM4 (RID_SVX_START + 97) -#define RID_SVXBMP_FONTWORK_FORM5 (RID_SVX_START + 98) -#define RID_SVXBMP_FONTWORK_FORM6 (RID_SVX_START + 99) -#define RID_SVXBMP_FONTWORK_FORM7 (RID_SVX_START + 100) -#define RID_SVXBMP_FONTWORK_FORM8 (RID_SVX_START + 101) -#define RID_SVXBMP_FONTWORK_FORM9 (RID_SVX_START + 102) -#define RID_SVXBMP_FONTWORK_FORM10 (RID_SVX_START + 103) -#define RID_SVXBMP_FONTWORK_FORM11 (RID_SVX_START + 104) -#define RID_SVXBMP_FONTWORK_FORM12 (RID_SVX_START + 105) - #define RID_SVXCTRL_COLOR (RID_SVX_START + 117) // for Toolbox-Control style @@ -322,21 +308,6 @@ // Close (in TabDialog line/aria) #define RID_SVXSTR_CLOSE(RID_SVX_START + 260) -// FontWork-ValueSet-Strings -#define RID_SVXSTR_FONTWORK_FORM1 (RID_SVX_START + 261) -#define RID_SVXSTR_FONTWORK_FORM2 (RID_SVX_START + 262) -#define RID_SVXSTR_FONTWORK_FORM3 (RID_SVX_START + 263) -#define RID_SVXSTR_FONTWORK_FORM4 (RID_SVX_START + 264) -#define RID_SVXSTR_FONTWORK_FORM5 (RID_SVX_START + 265) -#define RID_SVXSTR_FONTWORK_FORM6 (RID_SVX_START + 266) -#define RID_SVXSTR_FONTWORK_FORM7 (RID_SVX_START + 267) -#define RID_SVXSTR_FONTWORK_FORM8 (RID_SVX_START + 268) -#define RID_SVXSTR_FONTWORK_FORM9 (RID_SVX_START + 269) -#define RID_SVXSTR_FONTWORK_FORM10 (RID_SVX_START + 270) -#define RID_SVXSTR_FONTWORK_FORM11 (RID_SVX_START + 271) -#define RID_SVXSTR_FONTWORK_FORM12 (RID_SVX_START + 272) -#define RID_SVXSTR_FONTWORK_UNDOCREATE (RID_SVX_START + 273) - // Color strings #define RID_SVXSTR_BLACK(RID_SVX_START + 275) #define RID_SVXSTR_BLUE
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - bc/fee75544246db6788715d98efd6d33c12f933d
bc/fee75544246db6788715d98efd6d33c12f933d |1 + 1 file changed, 1 insertion(+) New commits: commit 74ba64d4df426700ec2ae34664bf05b7a673019f Author: Caolán McNamara caol...@redhat.com Date: Mon Jun 17 11:02:57 2013 +0100 Notes added by 'git notes add' diff --git a/bc/fee75544246db6788715d98efd6d33c12f933d b/bc/fee75544246db6788715d98efd6d33c12f933d new file mode 100644 index 000..c5cf9e0 --- /dev/null +++ b/bc/fee75544246db6788715d98efd6d33c12f933d @@ -0,0 +1 @@ +merged as: 573322e26b0244b27f70cfbc8989b3040a34f3d6 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: i18npool/source
i18npool/source/collator/data/sid_charset.txt | 18 ++ 1 file changed, 18 insertions(+) New commits: commit 217d39c412cba1360a0002d73ad2fa0ff4341209 Author: Andras Timar ati...@suse.com Date: Mon Jun 17 11:13:01 2013 +0200 forgot to git add sid_charset.txt Change-Id: I314c97d0421ed564c146cde4700ca23fe62347c1 diff --git a/i18npool/source/collator/data/sid_charset.txt b/i18npool/source/collator/data/sid_charset.txt new file mode 100644 index 000..c4c8da1 --- /dev/null +++ b/i18npool/source/collator/data/sid_charset.txt @@ -0,0 +1,18 @@ +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +# +# Collation of Sidama letters +# + c ch Ch CH + d dh Dh DH + n ny Ny NY + p ph Ph PH + s sh Sh SH + t ts Ts TS + z zh Zh ZH ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/inc
svx/inc/pch/precompiled_svxcore.hxx |2 -- 1 file changed, 2 deletions(-) New commits: commit 5acbffd03f5943354832f10e1bd2232c4774d8fb Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Mon Jun 17 12:19:20 2013 +0200 Blind fix for Windows tinderbox Change-Id: I3815c2605c9936716a2afda4f98e13f425e3f486 diff --git a/svx/inc/pch/precompiled_svxcore.hxx b/svx/inc/pch/precompiled_svxcore.hxx index 9d31aeb..1cf9262 100644 --- a/svx/inc/pch/precompiled_svxcore.hxx +++ b/svx/inc/pch/precompiled_svxcore.hxx @@ -372,8 +372,6 @@ #include drawinglayer/processor2d/objectinfoextractor2d.hxx #include drawinglayer/processor2d/processorfromoutputdevice.hxx #include drawinglayer/processor2d/textaspolygonextractor2d.hxx -#include drawinglayer/processor2d/vclpixelprocessor2d.hxx -#include drawinglayer/processor2d/vclprocessor2d.hxx #include drawinglayer/processor3d/baseprocessor3d.hxx #include drawinglayer/processor3d/cutfindprocessor3d.hxx #include editeng/adjustitem.hxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: MSI process
On Mon, Jun 17, 2013 at 12:35 AM, Mat M m...@gmx.fr wrote: CAs (Custom Action) outside shellextensions are fine. Well, the job of regactivex/regpatchactivex should be done by normal actions, custom action is for this is a hack. About shellextensions ones, here is my status: * checkdirectory.cxx : was like this from start. So always useless :) = to be removed OK. * completeinstallpath.cxx : handle the first level directories : I don't think we upgrade OOo 3.0, OOo 3.1 or OOo 3.2 , so this is useless, but please test it, before removing. * vistaspecial.cxx: i#94560 . = To keep. This is a dirty hack. I wonder if the original bug that it solves, is reproducible with our installer. If not, remove it. * startmenuicon.cxx: was used to have a special icon on start menu folder. Disabled since vista. = to be removed Please keep it, we still support Windows XP. * upgrade.cxx: i#43855 [1]. Not sure we want to reproduce use case from comment 6. = to confirm User installation (as opposed to system wide installation) is generally unsupported. I mean it may not work at all, and IMHO it makes little sense. * checkpatches.cxx: used for upgrades (differential msi). Check if previous patches have been applied. = to keep, hoping for the return of .msp :) You can keep it, however, I don't know how it is supposed to work. * layerlinks.cxx: handle creation of a ure-link file at root. this file is used to abstract URE path in code (mainly installation related, though). My question is: could we create this file during instsetoo and add it as a simple file in the MSI, so CustomAction could be removed ? = to keep for now See Stephan's mail. * migrateinstallpath.cxx: used to emulate upgrade pahse with 2 MSI with no upgradecode inside. = to keep for now. OK. Thanks, Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Changes to 'feature/gsoc-basic-ide-completion-and-other-bits'
New branch 'feature/gsoc-basic-ide-completion-and-other-bits' available with the following commits: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Java mapping error on OSX with DB reports
Hi all, On my recent build of master on OSX, I keep getting the following error message when I try to open a report in an embedded hsqldb ODB file javaloader error - no mapping to C++ There seems to be a synchronicity problem between LO detecting the JVM and launching the report opening. The only way I have found around this is to force a JVM recognition update in the Preferences menu, reload the ODB file and then I can opne the Report, but this JVM recognition is lost when LO is shut down again and released from memory. Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: l10ntools/source
l10ntools/source/cfgmerge.cxx |6 +++---
l10ntools/source/export.cxx |2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 47a23789b7aed7fed8da2cf737bc4dd1070e32bf
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date: Mon Jun 17 11:44:23 2013 +0200
l10ntools: getLength() - isEmpty()
Change-Id: I9272c244e22d87fbd2547f4fcb6b94493ffaad3a
diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx
index 98778a7..63f4a8f 100644
--- a/l10ntools/source/cfgmerge.cxx
+++ b/l10ntools/source/cfgmerge.cxx
@@ -356,7 +356,7 @@ CfgExport::~CfgExport()
void CfgExport::WorkOnResourceEnd()
{
if ( bLocalize ) {
-if (
pStackData-sText[OString(RTL_CONSTASCII_STRINGPARAM(en-US))].getLength() )
+if ( !pStackData-sText[en-US].isEmpty() )
{
OString sXComment =
pStackData-sText[OString(RTL_CONSTASCII_STRINGPARAM(x-comment))];
OString sLocalId = pStackData-sIdentifier;
@@ -385,7 +385,7 @@ void CfgExport::WorkOnText(
const OString rIsoLang
)
{
-if( rIsoLang.getLength() ) rText = helper::UnQuotHTML( rText );
+if( !rIsoLang.isEmpty() ) rText = helper::UnQuotHTML( rText );
}
@@ -409,7 +409,7 @@ CfgMerge::CfgMerge(
std::exit(EXIT_FAILURE);
}
-if (rMergeSource.getLength())
+if (!rMergeSource.isEmpty())
{
pMergeDataFile = new MergeDataFile(
rMergeSource, global::inputPathname, true );
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index c15d81f..4b0106d 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -931,7 +931,7 @@ sal_Bool Export::WriteExportList(ResData *pResData,
ExportList *pExportList,
else {
sGID += .;
sGID += pResData-sId;
-while (sGID.getLength() != 0 sGID[sGID.getLength() - 1] == '.') {
+while (!sGID.isEmpty() sGID[sGID.getLength() - 1] == '.') {
sGID = sGID.copy(0, sGID.getLength() - 1);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Why not to use Gerrit patch set verification? -- was build failure in [build GAL] arrows
On 17 June 2013, Matú Kukan wrote: Indeed, sorry for this, there was missing dependency hopefully fixed with [...] it was broken for me too, while it was easy to fix with --without-galleries option, i wonder why you don't use Gerrit? Note: mmeeks knows how to schedule a build now and is waiting that someone ask him to schedule a build ;-) ... and there are a lot of others on the IRC channel with the ACL too. So every one has a choice now (until we have enough hardware to scale): Scenario I: 1. upload a patch to Gerrit 2. ask for some one to schedule a build for it Note: that step will be replaced with a simple click the Schedule button, once we have a Schedule button on the Gerrit change screen (Current patch set action panel) 3. find out that it is broken on platform `foo` or `bar` without hurting other folks. This is a tricky part here, but basically your change is on a virtual git branch in Gerrit, and nobody cares that it is broken, compared to master 4. correct it 5. upload a new patch set to Gerrit 6. let re-schedule a new build for it (just click the Schedule button later) 7. submit the sane change to master Scenario II: 1. commit your changes direct to master 2. break it 3. wait until other folks find it out and blame you 4. (hopefully) correct it (or may be not?) 5. write Indeed i broke it, sorry for this mail ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: iOS does not compile
Current master fails to compile on iOS ( It built for me some hour ago (after one fix, that I pushed). Why don't we have daily build for iOS like all other platforms? Because nobody is running a such tinderbox script? (I used to, for a while, but got demotivated.) I doubt it would make much sense to *upload* builds for iOS; we don't need people to test it, we need developers who are capable of building themselves to work on it. And of course, for iOS devices, you can't run builds on arbitrary devices anyway, only on specifically listed ones that the developer doing the build adds ad-hoc provisioning for, or whatever the terminology is. (We definitely don't want to encourage jailbreaking.) iOS build bots would just be used to catch build errors being introduced. Note that tinderbox build bots are not managed in a top-down fashion; there is no cabal deciding what platforms/configurations to run tinderbox build bots for and then handing out the tasks to manage them. It's quite the opposite. If it just a matter of setting it up, I will gladly do it if someone can point me how. See https://wiki.documentfoundation.org/Development/Tinderbox . --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/gsoc-basic-ide-completion-and-other-bits' - basic/source
basic/source/comp/dim.cxx | 40 ++--
basic/source/inc/parser.hxx |1 +
2 files changed, 39 insertions(+), 2 deletions(-)
New commits:
commit 809edacfabfbb5b6cc0bac335aa8f62367948b4b
Author: Gergo Mocsi gmocs...@gmail.com
Date: Mon Jun 17 13:07:05 2013 +0200
GSOC work week 0-1, allowing BASIC to recognize UNO interfaces
Introduced a new function calles IsUnoInterface in SbiParser to determine,
if
a variable is a type of an UNO interface. It uses reflection.CoreReflection
to
do that, on success it returs true otherwise false.
Change-Id: I18895127bcbd92dc7a25feb5d82a7d1343bde851
diff --git a/basic/source/comp/dim.cxx b/basic/source/comp/dim.cxx
index 81f6eff..6094369 100644
--- a/basic/source/comp/dim.cxx
+++ b/basic/source/comp/dim.cxx
@@ -20,7 +20,17 @@
#include basic/sbx.hxx
#include sbcomp.hxx
#include sbunoobj.hxx
-
+#include svtools/miscopt.hxx
+#include com/sun/star/reflection/XIdlReflection.hpp
+#include comphelper/namedvaluecollection.hxx
+#include comphelper/processfactory.hxx
+#include comphelper/configurationhelper.hxx
+#include com/sun/star/reflection/XInterfaceMemberTypeDescription.hpp
+#include com/sun/star/reflection/XIdlMethod.hpp
+#include com/sun/star/uno/Exception.hpp
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::uno;
SbxObject* cloneTypeObjectImpl( const SbxObject rTypeObj );
@@ -197,6 +207,7 @@ void SbiParser::DefVar( SbiOpcode eOp, bool bStatic )
bool bSwitchPool = false;
bool bPersistantGlobal = false;
SbiToken eFirstTok = eCurTok;
+SvtMiscOptions aMiscOptions;
if( pProc ( eCurTok == GLOBAL || eCurTok == PUBLIC || eCurTok ==
PRIVATE ) )
Error( SbERR_NOT_IN_SUBR, eCurTok );
if( eCurTok == PUBLIC || eCurTok == GLOBAL )
@@ -391,7 +402,7 @@ void SbiParser::DefVar( SbiOpcode eOp, bool bStatic )
if( !bCompatible !pDef-IsNew() )
{
OUString aTypeName( aGblStrings.Find( pDef-GetTypeId() ) );
-if( rTypeArray-Find( aTypeName, SbxCLASS_OBJECT ) == NULL )
+if( rTypeArray-Find( aTypeName, SbxCLASS_OBJECT ) == NULL
(aMiscOptions.IsExperimentalMode() !IsUnoInterface(aTypeName)))
{
Error( SbERR_UNDEF_TYPE, aTypeName );
}
@@ -1311,4 +1322,29 @@ void SbiParser::DefStatic( bool bPrivate )
}
}
+bool SbiParser::IsUnoInterface(const OUString sTypeName)
+{
+try
+{
+Reference lang::XMultiServiceFactory xFactory(
comphelper::getProcessServiceFactory(), UNO_SET_THROW );
+Reference reflection::XIdlReflection xRefl(
xFactory-createInstance(com.sun.star.reflection.CoreReflection),
UNO_QUERY_THROW );
+//DBG_ASSERT(xRefl.Is(), No reflection class!); ???
+if( !xRefl.is() )
+{
+return false;
+}
+Reference reflection::XIdlClass xClass = xRefl-forName(sTypeName);
+if( xClass != NULL )
+{
+return true;
+}
+return false;
+}
+catch(const Exception ex)
+{
+OSL_FAIL(Could not create reflection.CoreReflection.);
+}
+return false;
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/inc/parser.hxx b/basic/source/inc/parser.hxx
index d6c14a6..0ab6bcb 100644
--- a/basic/source/inc/parser.hxx
+++ b/basic/source/inc/parser.hxx
@@ -57,6 +57,7 @@ class SbiParser : public SbiTokenizer
void DefEnum( bool bPrivate ); // Parse enum declaration
void DefDeclare( bool bPrivate );
void EnableCompatibility();
+bool IsUnoInterface(const OUString sTypeName);
public:
SbxArrayRef rTypeArray;
SbxArrayRef rEnumArray;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Java mapping error on OSX with DB reports
Le 17/06/13 13:08, Alexander Thurgood a écrit : Hmm, further to the above, if I keep the Advanced properties dialog opened and try to open my report at the same time, I get a total hang of the app - race condition ? Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - writerfilter/source
writerfilter/source/dmapper/StyleSheetTable.cxx |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit d7acb5ba0924f848f1ae96eceab50a0169d18445 Author: Cédric Bosdonnat cedric.bosdon...@free.fr Date: Mon Jun 17 13:42:34 2013 +0200 n#820504: default color hidden by Default style in writerfilter Setting the font color of the default paragraph style to Auto makes the color set in the Writer defaults (from rPrDefault) ignored. Change-Id: I1dcd92bcd0774f5229785373242899a492ab7b7c diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index 19a5796..bba895e 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -772,8 +772,7 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr rFontTable ) pEntry-pProperties-Insert(PROP_PARA_ORPHANS, true, aTwo, false); // Left-to-right direction if not already set pEntry-pProperties-Insert(PROP_WRITING_MODE, true, uno::makeAny( sal_Int16(text::WritingMode_LR_TB) ), false); -// font color COL_AUTO if not already set -pEntry-pProperties-Insert(PROP_CHAR_COLOR, true, uno::makeAny( sal_Int32(0x) ), false); +// Don't set font color to Auto if not already set: this could hide the default font color setting } uno::Sequence beans::PropertyValue aPropValues = pEntry-pProperties-GetPropertyValues(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: LibreOffice Gerrit News 2013-06-17
I'm not sure if it is only me, but those messages are hard to read, can we have new lines between different items (i.e. after the in https://; line)? or any other way to make it easier to tell which line belongs to which description? Regards, Khaled On Mon, Jun 17, 2013 at 06:00:02AM -, ger...@libreoffice.org wrote: Moin! * Open changes on master for project core changed in the last 25 hours: fontsizedialog.ui widget in https://gerrit.libreoffice.org/4312 from Manal Alhassoun Migrate CheckFields unit test to python in https://gerrit.libreoffice.org/4294 from David Ostrovsky replace ShapeList::getNextShape with STL like iterator. in https://gerrit.libreoffice.org/4191 from mhofmann fdo#31525 Dialogues now have an appropriate background in OSX in https://gerrit.libreoffice.org/4287 from Jason Hulme handle missing dep files in concat-deps in https://gerrit.libreoffice.org/4302 from Björn Michaelsen Reduce the amount of calls of mkdir -p. in https://gerrit.libreoffice.org/4297 from Jan Holesovsky remove last uses of config 'GUI' variable in https://gerrit.libreoffice.org/4188 from Matúš Kukan Small (hopefully non-controversial) changes to the existing branding in https://gerrit.libreoffice.org/4308 from Stefan Knorr Template Manager: Use actual template icons if no thumbnail exists in https://gerrit.libreoffice.org/3278 from Stefan Knorr fdo#65456 - Provide visual clues in slidesorter for custom animation. in https://gerrit.libreoffice.org/4277 from Edmond Ciorba fdo#65108 clean-up headers(global/local) perl script in https://gerrit.libreoffice.org/4306 from Jelle van der Waa String to OUString (SfxStringItem and related) in https://gerrit.libreoffice.org/4280 from Matteo Casalin * Merged changes on master for project core changed in the last 25 hours: migrate check_index test from Java to Python in https://gerrit.libreoffice.org/4310 from Xiaoli Duan cppcheck: fix duplicateExpression in https://gerrit.libreoffice.org/4279 from Julien Nabet fdo#43460 use isEmpty() in https://gerrit.libreoffice.org/4307 from Jelle van der Waa Fix PDF export with fallback fonts in Core Text in https://gerrit.libreoffice.org/4299 from Khaled Hosny Simplify SwPaM::GetTxt in https://gerrit.libreoffice.org/4213 from Matteo Casalin Get rid of SalLayout::GetFallbackFontData() in https://gerrit.libreoffice.org/4285 from Khaled Hosny PyUno fixed crash in function isInstanceOfStructOrException() in https://gerrit.libreoffice.org/4309 from Xiaoli Duan Another try to fix python unit test on MSVC in https://gerrit.libreoffice.org/4303 from Michael Meeks * Abandoned changes on master for project core changed in the last 25 hours: daily wacking of Strings in https://gerrit.libreoffice.org/4242 from Norbert Thiebaud Sidebar conversion to .ui for sidebar_page_property in https://gerrit.libreoffice.org/4298 from Prashant Pandey * Open changes needing tweaks, but being untouched for more than a week: Remove unused icons after cleaning up Math zoom in https://gerrit.libreoffice.org/4117 from Rodolfo Ribeiro Gomes fdo#51296 Helptext added for hyperlinks, hlinks behave as in writer in https://gerrit.libreoffice.org/4051 from Akash Shetye fdo#44216 Prompt if objects from dropped slide should be fixed in aspect ra in https://gerrit.libreoffice.org/1348 from Rodolfo Ribeiro Gomes Bigger slide thumbnails in slidesorter. in https://gerrit.libreoffice.org/4052 from Thorsten Behrens remove unused code. in https://gerrit.libreoffice.org/3167 from navin patidar Change compareTo - == in dbaccess module in https://gerrit.libreoffice.org/3957 from Paulo Henrique Cuchi fdo#55582 writer, calc: insert shapes also when shapes selected in https://gerrit.libreoffice.org/1524 from Lennard Wasserthal show formula results of new formulas even if auto calc is disabled in https://gerrit.libreoffice.org/3625 from Markus Mohrhard Modified Insert-File... to Insert-Document... #fdo62097 in
Re: Bonjour Service implementation on server end
Hi there, On 17/06/13 10:51, Tor Lillqvist wrote: It seems that Bonjour has some great support for Mac and iOS device so I can search for running mac libreoffice instance on the local network. But I'm not sure if we have some nice c++ native support (and also are there any windows, linux support for Bonjour?) for that since libreoffice is supposed to work cross-platform. I think the implementation for Linux is called Avahi. Not sure about Windows. Some notes from last year: -Initial plan was to use dns-sd/Bonjour/Avahi which seems to be well supported by most systems. -This was scrapped since Android doesn't work well with dns-sd (although newer versions, possibly from 4.0 do apparently have proper support). -Hence a custom discovery protocol was devised (multicast packets, see android/sdremote/src/org/libreoffice/impressremote/communication/ServerFinder.java for an example of the client end). For future use dns-sd is probably wisest -- especially if one assumes that Android support for dns-sd will be widespread (i.e. older incompatible versions no longer used). W.r.t to actual support for this, as far as I remember it was: - Bonjour for Mac - Avahi for Linux - Bonjour for Windows too, but would require shipping the Bonjour binary along with LO. Alternatively there are things like pyZeroConf and jmdns which coud offer simpler cross-platform support: I have no idea about how usable these are, but I gather jmdns is the library of choice for accessing dns-sd records from android (but as mentioned that doesn't work very well). (I'd be willing to look into the Linux and Windows implementations, although I probably won't have much time for that until I'm back home / end of June.) Cheers, Andrzej ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - 2 commits - i18npool/CustomTarget_collator.mk i18npool/source
i18npool/CustomTarget_collator.mk |1 +
i18npool/source/collator/collator_unicode.cxx |6 +-
i18npool/source/collator/data/sid_charset.txt | 18 ++
i18npool/source/localedata/data/sid_ET.xml|4 ++--
4 files changed, 26 insertions(+), 3 deletions(-)
New commits:
commit 965b1bc9f56b32d8a8630bad76f2033a5ee9dfd3
Author: Andras Timar ati...@suse.com
Date: Mon Jun 17 09:24:47 2013 +0200
typo fix, use ja_charset for Japanese
Change-Id: I29b7db952a8cc9e0670e03dd79204486332aabe9
diff --git a/i18npool/source/collator/collator_unicode.cxx
b/i18npool/source/collator/collator_unicode.cxx
index d4dde12..bcdef82 100644
--- a/i18npool/source/collator/collator_unicode.cxx
+++ b/i18npool/source/collator/collator_unicode.cxx
@@ -164,7 +164,7 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString
rAlgorithm, const lang::
func = get_collator_data_hu_charset;
} else if ( rLocale.Language == ja ) {
if ( rAlgorithm == charset )
-func = get_collator_data_hu_charset;
+func = get_collator_data_ja_charset;
else if ( rAlgorithm == phonetic (alphanumeric first) )
func = get_collator_data_ja_phonetic_alphanumeric_first;
else if ( rAlgorithm == phonetic (alphanumeric last) )
commit a5cdb78d797997c3b6f89b5d344d3a56d6d36348
Author: Andras Timar ati...@suse.com
Date: Mon Jun 17 09:12:35 2013 +0200
fdo#65809 Sidama (sit-ET) index sorting and collation data
Change-Id: I1781c94cc67d4a2fa47bcf126195309590016b14
diff --git a/i18npool/CustomTarget_collator.mk
b/i18npool/CustomTarget_collator.mk
index 22b24ad..04527bb 100644
--- a/i18npool/CustomTarget_collator.mk
+++ b/i18npool/CustomTarget_collator.mk
@@ -22,6 +22,7 @@ i18npool_COTXTS := \
ln_charset.txt \
my_dictionary.txt \
ne_charset.txt \
+sid_charset.txt \
zh_charset.txt \
zh_pinyin.txt \
zh_radical.txt \
diff --git a/i18npool/source/collator/collator_unicode.cxx
b/i18npool/source/collator/collator_unicode.cxx
index a7cf05b..d4dde12 100644
--- a/i18npool/source/collator/collator_unicode.cxx
+++ b/i18npool/source/collator/collator_unicode.cxx
@@ -74,6 +74,7 @@ const sal_uInt8* get_collator_data_ku_alphanumeric();
const sal_uInt8* get_collator_data_ln_charset();
const sal_uInt8* get_collator_data_my_dictionary();
const sal_uInt8* get_collator_data_ne_charset();
+const sal_uInt8* get_collator_data_sid_charset();
const sal_uInt8* get_collator_data_zh_TW_charset();
const sal_uInt8* get_collator_data_zh_TW_radical();
const sal_uInt8* get_collator_data_zh_TW_stroke();
@@ -183,6 +184,9 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString
rAlgorithm, const lang::
} else if ( rLocale.Language == ne ) {
if ( rAlgorithm == charset )
func = get_collator_data_ne_charset;
+} else if ( rLocale.Language == sid ) {
+if ( rAlgorithm == charset )
+func = get_collator_data_sid_charset;
} else if ( rLocale.Language == zh (rLocale.Country == TW
|| rLocale.Country == HK || rLocale.Country == MO) ) {
if ( rAlgorithm == charset )
func = get_collator_data_zh_TW_charset;
diff --git a/i18npool/source/collator/data/sid_charset.txt
b/i18npool/source/collator/data/sid_charset.txt
new file mode 100644
index 000..c4c8da1
--- /dev/null
+++ b/i18npool/source/collator/data/sid_charset.txt
@@ -0,0 +1,18 @@
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+#
+# Collation of Sidama letters
+#
+ c ch Ch CH
+ d dh Dh DH
+ n ny Ny NY
+ p ph Ph PH
+ s sh Sh SH
+ t ts Ts TS
+ z zh Zh ZH
diff --git a/i18npool/source/localedata/data/sid_ET.xml
b/i18npool/source/localedata/data/sid_ET.xml
index f5dc751..cdd5117 100644
--- a/i18npool/source/localedata/data/sid_ET.xml
+++ b/i18npool/source/localedata/data/sid_ET.xml
@@ -178,7 +178,7 @@
/FormatElement
/LC_FORMAT
LC_COLLATION
-Collator default=true unoid=alphanumeric/
+Collator default=true unoid=charset/
CollationOptions
TransliterationModulesIGNORE_CASE/TransliterationModules
/CollationOptions
@@ -189,7 +189,7 @@
/SearchOptions
/LC_SEARCH
LC_INDEX
-IndexKey phonetic=false default=true
unoid=alphanumericA-Z/IndexKey
+IndexKey phonetic=false default=true unoid=charsetA-C {Ch} D {Dh}
E-N {Ny} O P {Ph} Q-S {Sh} T {TS} U-Z {ZH}/IndexKey
UnicodeScript0/UnicodeScript
UnicodeScript1/UnicodeScript
FollowPageWordSTP/FollowPageWord
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
[Libreoffice-commits] core.git: i18npool/source
i18npool/source/localedata/data/sid_ET.xml |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 3a183e87421fdef3e8f7e7459d539ab28a6a2241
Author: Andras Timar ati...@suse.com
Date: Mon Jun 17 13:36:12 2013 +0200
sid has charset based collation rule
Change-Id: Id9eb0b59384223b6c47229bd0a3430e71e79e622
diff --git a/i18npool/source/localedata/data/sid_ET.xml
b/i18npool/source/localedata/data/sid_ET.xml
index 91ead08..cdd5117 100644
--- a/i18npool/source/localedata/data/sid_ET.xml
+++ b/i18npool/source/localedata/data/sid_ET.xml
@@ -178,7 +178,7 @@
/FormatElement
/LC_FORMAT
LC_COLLATION
-Collator default=true unoid=alphanumeric/
+Collator default=true unoid=charset/
CollationOptions
TransliterationModulesIGNORE_CASE/TransliterationModules
/CollationOptions
@@ -189,7 +189,7 @@
/SearchOptions
/LC_SEARCH
LC_INDEX
-IndexKey phonetic=false default=true unoid=alphanumericA-C {Ch} D
{Dh} E-N {Ny} O P {Ph} Q-S {Sh} T {TS} U-Z {ZH}/IndexKey
+IndexKey phonetic=false default=true unoid=charsetA-C {Ch} D {Dh}
E-N {Ny} O P {Ph} Q-S {Sh} T {TS} U-Z {ZH}/IndexKey
UnicodeScript0/UnicodeScript
UnicodeScript1/UnicodeScript
FollowPageWordSTP/FollowPageWord
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: LibreOffice Gerrit News 2013-06-17
On Mon, 17 Jun 2013 13:52:05 +0200, Khaled Hosny khaledho...@eglug.org wrote: I'm not sure if it is only me, but those messages are hard to read, can we have new lines between different items (i.e. after the in https://; line)? or any other way to make it easier to tell which line belongs to which description? Regards, Khaled I agree.. could be that list be formatted from actual: fontsizedialog.ui widget in https://gerrit.libreoffice.org/4312 from Manal Alhassoun Migrate CheckFields unit test to python in https://gerrit.libreoffice.org/4294 from David Ostrovsky replace ShapeList::getNextShape with STL like iterator. in https://gerrit.libreoffice.org/4191 from mhofmann etc. etc to something like this: fontsizedialog.ui widget in https://gerrit.libreoffice.org/4312 from Manal Alhassoun Migrate CheckFields unit test to python in https://gerrit.libreoffice.org/4294 from David Ostrovsky replace ShapeList::getNextShape with STL like iterator. in https://gerrit.libreoffice.org/4191 from mhofmann etc. etc IMHO some kind of separators would help readability of such long lists ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - config_host.mk.in configure.ac RepositoryExternal.mk sc/CppunitTest_sc_ucalc.mk sc/Library_sc.mk sc/source
RepositoryExternal.mk | 17
config_host.mk.in |3
configure.ac| 34 +
sc/CppunitTest_sc_ucalc.mk |3
sc/Library_sc.mk|8
sc/source/core/opencl/oclkernels.hxx| 116 +++
sc/source/core/opencl/openclwrapper.cxx | 1031
sc/source/core/opencl/openclwrapper.hxx | 172 +
sc/source/core/tool/interpr1.cxx|4
9 files changed, 1388 insertions(+)
New commits:
commit cab3e22562bcb5967f269524e1f9e285688bb121
Author: Michael Meeks michael.me...@suse.com
Date: Sun Jun 16 17:55:11 2013 +0100
OpenCL code cleanups
Change-Id: Iab75b11f13856a6e631587e22b5d76977b8c7448
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 1cbfa3c..16fd643 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -29,7 +29,7 @@
# External headers
-ifeq ($(ENABLE_OPENGCL),TRUE)
+ifeq ($(ENABLE_OPENCL),TRUE)
define gb_LinkTarget__use_opencl
$(call gb_LinkTarget_set_include,$(1),\
diff --git a/configure.ac b/configure.ac
index c4529f6..4efc4f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9756,8 +9756,8 @@ if test z$with_opencl_sdk = z; then
else
if test -d $with_opencl_sdk/include; then
ENABLE_OPENCL=TRUE
- OPENCL_CFLAGS=-I $with_opencl_sdk/include
- OPENCL_LIBS=-L $with_opencl_sdk/lib/x86 -lOpenCL
+ OPENCL_CFLAGS=-I$with_opencl_sdk/include
+ OPENCL_LIBS=-L$with_opencl_sdk/lib/x86 -lOpenCL
AC_MSG_RESULT([found at path $with_opencl_sdk])
else
AC_MSG_ERROR([no headers found found at
$with_opencl_sdk/include ])
diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk
index 0933cb5..68d6cb5 100644
--- a/sc/CppunitTest_sc_ucalc.mk
+++ b/sc/CppunitTest_sc_ucalc.mk
@@ -20,6 +20,9 @@ $(eval $(call gb_CppunitTest_use_library_objects,sc_ucalc,sc))
ifeq ($(ENABLE_TELEPATHY),TRUE)
$(eval $(call gb_CppunitTest_use_libraries,sc_ucalc,tubes))
endif
+ifeq ($(ENABLE_OPENCL),TRUE)
+$(eval $(call gb_CppunitTest_use_externals,sc_ucalc,opencl))
+endif
$(eval $(call gb_CppunitTest_use_externals,sc_ucalc,\
boost_headers \
diff --git a/sc/source/core/opencl/openclwrapper.cxx
b/sc/source/core/opencl/openclwrapper.cxx
index 05b169a..6c3935e 100644
--- a/sc/source/core/opencl/openclwrapper.cxx
+++ b/sc/source/core/opencl/openclwrapper.cxx
@@ -11,6 +11,7 @@
#include stdlib.h
#include string.h
+#include random.hxx
#include openclwrapper.hxx
#include oclkernels.hxx
@@ -1003,10 +1004,8 @@ double OclCalc::OclProcess(cl_kernel_function function,
double *data,
double OclCalc::OclTest() {
double data[NUM];
-srand((unsigned int) time(NULL));
-
for (int i = 0; i NUM; i++) {
-data[i] = rand() / (RAND_MAX + 1.0);
+data[i] = sc::rng::uniform();
fprintf(stderr, %f\t, data[i]);
}
OclProcess(OclFormulax, data, AVG);
commit f01985a22bc7d6d37a8c92e50b531e849705fd09
Author: Peng Gao p...@multicorewareinc.com
Date: Sun Jun 16 17:18:23 2013 +0100
Initial OpenCL pieces.
Change-Id: I3a52cb7085b2dd8b70863a346eca279444206be6
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index e818cb4..1cbfa3c 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -29,6 +29,23 @@
# External headers
+ifeq ($(ENABLE_OPENGCL),TRUE)
+
+define gb_LinkTarget__use_opencl
+$(call gb_LinkTarget_set_include,$(1),\
+ $$(INCLUDE) \
+$(OPENCL_CFLAGS) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(OPENCL_LIBS))
+
+endef
+
+else # ENABLE_OPENCL != TRUE
+
+gb_LinkTarget__use_opencl :=
+
+endif
+
ifeq ($(SYSTEM_MARIADB),YES)
define gb_LinkTarget__use_mariadb
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index dba982b..2ba1225 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -54,6 +54,14 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
))
endif
+ifeq ($(ENABLE_OPENCL),TRUE)
+$(eval $(call gb_Library_use_externals,sc,opencl))
+
+$(eval $(call gb_Library_add_exception_objects,sc,\
+ sc/source/core/opencl/openclwrapper \
+))
+endif
+
$(eval $(call gb_Library_use_libraries,sc,\
avmedia \
basegfx \
diff --git a/sc/source/core/opencl/oclkernels.hxx
b/sc/source/core/opencl/oclkernels.hxx
new file mode 100644
index 000..f9db447
--- /dev/null
+++ b/sc/source/core/opencl/oclkernels.hxx
@@ -0,0 +1,116 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef _OCL_KERNEL_H_
+#define _OCL_KERNEL_H_
+
+#ifndef USE_EXTERNAL_KERNEL
+#define KERNEL( ... )# __VA_ARGS__
+
Re: LibreOffice Gerrit News 2013-06-17
On 06/17/2013 01:52 PM, Khaled Hosny wrote: I'm not sure if it is only me, but those messages are hard to read, can we have new lines between different items (i.e. after the in https://; line)? or any other way to make it easier to tell which line belongs to which description? I find that hard to read, too, but I assume it is expected that one of us complainers fix that ourselves: On Mon, Jun 17, 2013 at 06:00:02AM -, ger...@libreoffice.org wrote: [...] 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 Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/Executable.mk |2 ++ 1 file changed, 2 insertions(+) New commits: commit 96204ecf7418eb1e94992869c3c1439359004adf Author: Matúš Kukan matus.ku...@gmail.com Date: Mon Jun 17 14:39:33 2013 +0200 do not copy executables into instdir yet (by default) It causes some weird problems with solenv/bin/linkoo. Change-Id: Ic1613394ec3f0fe508ca813c2600f9bc5439dce7 diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk index 7611ea3..d616e1c 100644 --- a/solenv/gbuild/Executable.mk +++ b/solenv/gbuild/Executable.mk @@ -70,7 +70,9 @@ $(call gb_Executable_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_tar $(call gb_Executable_get_clean_target,$(1)) : AUXTARGETS := $(call gb_Executable_get_install_target,$(1)) $(call gb_Executable_Executable_platform,$(1),$(2)) +ifneq ($(gb_RUNNABLE_INSTDIR),) $(call gb_Helper_install,Executable,$(1),$(call gb_LinkTarget_get_target,$(2))) +endif $$(eval $$(call gb_Module_register_target,$(call gb_Executable_get_target,$(1)),$(call gb_Executable_get_clean_target,$(1 $(call gb_Helper_make_userfriendly_targets,$(1),Executable) $(call gb_Deliver_add_deliverable,$(call gb_Executable_get_target,$(1)),$(call gb_LinkTarget_get_target,$(2)),$(1)) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0.3' - instsetoo_native/util solenv/inc
instsetoo_native/util/openoffice.lst | 22 +++---
solenv/inc/minor.mk |4 ++--
2 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit cef8a49429976d2dd191ca3548516c3a81af6d68
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Mon Jun 17 14:42:26 2013 +0200
bump product version to 4.0-5, release number to 305
Change-Id: If3bc13b3c318cfa6b1ec2ad14af44382ced4cb0b
diff --git a/instsetoo_native/util/openoffice.lst
b/instsetoo_native/util/openoffice.lst
index 591b430..80cfd03 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -50,13 +50,13 @@ LibreOffice
{
PRODUCTNAME LibreOffice
PRODUCTVERSION 4.0
-PRODUCTEXTENSION -4
+PRODUCTEXTENSION -5
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4.0
USERDIRPRODUCTVERSION 4
ABOUTBOXPRODUCTVERSION 4.0
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-304
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-305
BASEPRODUCTVERSION 4.0
PCPFILENAME libreoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php
@@ -100,14 +100,14 @@ LibreOffice_Dev
{
PRODUCTNAME LOdev
PRODUCTVERSION 4.0
-PRODUCTEXTENSION -4
+PRODUCTEXTENSION -5
UNIXBASISROOTNAME lodev4.0
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4.0
USERDIRPRODUCTVERSION 4
ABOUTBOXPRODUCTVERSION 4.0
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-304
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-305
BASEPRODUCTVERSION 4.0
DEVELOPMENTPRODUCT 1
BASISPACKAGEPREFIX lodevbasis
@@ -161,7 +161,7 @@ URE
PRODUCTVERSION 4.0
PACKAGEVERSION 4.0
PACKAGEREVISION 1
-PRODUCTEXTENSION -4
+PRODUCTEXTENSION -5
BRANDPACKAGEVERSION 4.0
LICENSENAME LGPL
NOVERSIONINDIRNAME 1
@@ -192,7 +192,7 @@ LibreOffice_SDK
{
PRODUCTNAME LibreOffice
PRODUCTVERSION 4.0
-PRODUCTEXTENSION -4
+PRODUCTEXTENSION -5
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 4.0
@@ -231,7 +231,7 @@ LibreOffice_Dev_SDK
{
PRODUCTNAME LOdev
PRODUCTVERSION 4.0
-PRODUCTEXTENSION -4
+PRODUCTEXTENSION -5
UNIXBASISROOTNAME lodev4.0
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
@@ -276,7 +276,7 @@ LibreOffice_Test
{
PRODUCTNAME LibreOffice
PRODUCTVERSION 4.0
-PRODUCTEXTENSION -4
+PRODUCTEXTENSION -5
POSTVERSIONEXTENSION TEST
POSTVERSIONEXTENSIONUNIX test
BRANDPACKAGEVERSION 4.0
@@ -315,7 +315,7 @@ LibreOffice_Dev_Test
{
PRODUCTNAME LOdev
PRODUCTVERSION 4.0
-PRODUCTEXTENSION -4
+PRODUCTEXTENSION -5
UNIXBASISROOTNAME lodev4.0
POSTVERSIONEXTENSION TEST
POSTVERSIONEXTENSIONUNIX test
@@ -359,13 +359,13 @@ OxygenOffice
{
PRODUCTNAME OxygenOffice
PRODUCTVERSION 4.0
-PRODUCTEXTENSION -4
+PRODUCTEXTENSION -5
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4.0
USERDIRPRODUCTVERSION 4
ABOUTBOXPRODUCTVERSION 4.0
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-304
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-305
BASEPRODUCTVERSION 4.0
PCPFILENAME openoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index f6260a6..5132f0b 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,6 +1,6 @@
RSCVERSION=400
-RSCREVISION=400m1(Build:304)
-BUILD=304
+RSCREVISION=400m1(Build:305)
+BUILD=305
LAST_MINOR=m0
SOURCEVERSION=OOO400
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - drawinglayer/source filter/source include/vcl scripting/source vcl/source
drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx | 29 +-
filter/source/svg/svgwriter.cxx| 152 -
include/vcl/graphictools.hxx | 28 ++
scripting/source/pyprov/mailmerge.py | 11
vcl/source/gdi/graphictools.cxx| 11
vcl/source/gdi/metaact.cxx | 14 +
6 files changed, 172 insertions(+), 73 deletions(-)
New commits:
commit 06f22f5ae0eafe094b280f03c770eebdbb33d403
Author: Caolán McNamara caol...@redhat.com
Date: Mon Jun 17 11:08:15 2013 +0100
Resolves: fdo#55411 python 2 vs 3 str/bytes encoding issues
Change-Id: Ic1aac1609f3a1fcbd0af9a1c9ecc07a735c8785a
diff --git a/scripting/source/pyprov/mailmerge.py
b/scripting/source/pyprov/mailmerge.py
index 18b476c..f70f034 100755
--- a/scripting/source/pyprov/mailmerge.py
+++ b/scripting/source/pyprov/mailmerge.py
@@ -239,11 +239,14 @@ class PyMailSMTPService(unohelper.Base, XSmtpService):
encode_base64(msgattachment)
fname = attachment.ReadableName
try:
- fname.encode('ascii')
+ msgattachment.add_header('Content-Disposition',
'attachment', \
+ filename=fname)
except:
- fname = ('utf-8','',fname.encode('utf-8'))
- msgattachment.add_header('Content-Disposition',
'attachment', \
- filename=fname)
+ msgattachment.add_header('Content-Disposition',
'attachment', \
+ filename=('utf-8','',fname))
+ if dbg:
+ print((PyMailSMTPService attachmentheader: ,
str(msgattachment)), file=dbgout)
+
msg.attach(msgattachment)
uniquer = {}
commit 64aed8554510ec3c288ccc247701cf048df59860
Author: Armin Le Grand a...@apache.org
Date: Wed Apr 24 16:26:20 2013 +
Resolves: #i122132# Some simple extensions to exporter
(cherry picked from commit 3454d18694e0ddcf9bc71661bf48c37450fa1fab)
Conflicts:
filter/source/svg/svgwriter.cxx
Change-Id: I2f9d96ffce0d51695a665b58a776807bab5d277e
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 59080d3..83238c0 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -402,6 +402,7 @@ namespace drawinglayer
if(rB2DPolygon.count() !mnSvtGraphicStrokeCount)
{
+basegfx::B2DPolygon aLocalPolygon(rB2DPolygon);
basegfx::BColor aStrokeColor;
basegfx::B2DPolyPolygon aStartArrow;
basegfx::B2DPolyPolygon aEndArrow;
@@ -419,29 +420,37 @@ namespace drawinglayer
// SvtGraphicStroke has NO entry for stroke color(!)
mpOutputDevice-SetLineColor(Color(aStrokeColor));
-if(!rB2DPolygon.isClosed())
+if(!aLocalPolygon.isClosed())
{
double fPolyLength(0.0);
+double fStart(0.0);
+double fEnd(0.0);
if(pStart pStart-isActive())
{
-fPolyLength = basegfx::tools::getLength(rB2DPolygon);
+fPolyLength = basegfx::tools::getLength(aLocalPolygon);
aStartArrow =
basegfx::tools::createAreaGeometryForLineStartEnd(
-rB2DPolygon, pStart-getB2DPolyPolygon(), true,
pStart-getWidth(),
-fPolyLength, pStart-isCentered() ? 0.5 : 0.0, 0);
+aLocalPolygon, pStart-getB2DPolyPolygon(), true,
pStart-getWidth(),
+fPolyLength, pStart-isCentered() ? 0.5 : 0.0,
fStart);
}
if(pEnd pEnd-isActive())
{
if(basegfx::fTools::equalZero(fPolyLength))
{
-fPolyLength =
basegfx::tools::getLength(rB2DPolygon);
+fPolyLength =
basegfx::tools::getLength(aLocalPolygon);
}
aEndArrow =
basegfx::tools::createAreaGeometryForLineStartEnd(
-rB2DPolygon, pEnd-getB2DPolyPolygon(), false,
pEnd-getWidth(),
-fPolyLength, pEnd-isCentered() ? 0.5 : 0.0, 0);
+aLocalPolygon, pEnd-getB2DPolyPolygon(), false,
pEnd-getWidth(),
+fPolyLength, pEnd-isCentered() ? 0.5 : 0.0,
fEnd);
+}
+
+
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 34/54d18694e0ddcf9bc71661bf48c37450fa1fab
34/54d18694e0ddcf9bc71661bf48c37450fa1fab |1 + 1 file changed, 1 insertion(+) New commits: commit af56cadddbe04ad3e589fc3111dc0efa99e33ef0 Author: Caolán McNamara caol...@redhat.com Date: Mon Jun 17 13:51:09 2013 +0100 Notes added by 'git notes add' diff --git a/34/54d18694e0ddcf9bc71661bf48c37450fa1fab b/34/54d18694e0ddcf9bc71661bf48c37450fa1fab new file mode 100644 index 000..6e08077 --- /dev/null +++ b/34/54d18694e0ddcf9bc71661bf48c37450fa1fab @@ -0,0 +1 @@ +merged as: 64aed8554510ec3c288ccc247701cf048df59860 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: LibreOffice Gerrit News 2013-06-17
On Mon, Jun 17, 2013 at 02:38:37PM +0200, Stephan Bergmann wrote: On Mon, Jun 17, 2013 at 06:00:02AM -, ger...@libreoffice.org wrote: [...] 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 I saw that after writing my message, but decided to send it anyway in case I'm the only one finding the lists hard to read. Regards, Khaled ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - c2/b5f0eedcc0fb7e0175e81b6f6127b99b8b7499
c2/b5f0eedcc0fb7e0175e81b6f6127b99b8b7499 |1 + 1 file changed, 1 insertion(+) New commits: commit 80fd18f6af7a09dafd0b60babbf22a6dfcc46882 Author: Caolán McNamara caol...@redhat.com Date: Mon Jun 17 14:05:56 2013 +0100 Notes added by 'git notes add' diff --git a/c2/b5f0eedcc0fb7e0175e81b6f6127b99b8b7499 b/c2/b5f0eedcc0fb7e0175e81b6f6127b99b8b7499 new file mode 100644 index 000..de5b334 --- /dev/null +++ b/c2/b5f0eedcc0fb7e0175e81b6f6127b99b8b7499 @@ -0,0 +1 @@ +merged as: 5f84a4cdcb9ae2b2fc002cefeccf349682f0a29d ___ 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 svgio/source
sc/inc/pch/precompiled_sc.hxx |1 -
svgio/source/svgreader/svgcharacternode.cxx | 14 --
2 files changed, 12 insertions(+), 3 deletions(-)
New commits:
commit c8b15ef45cd0916a0a42c2ede064e7a4bd4f06d9
Author: Caolán McNamara caol...@redhat.com
Date: Mon Jun 17 14:05:15 2013 +0100
don't include xftsfit.hxx anymore
Change-Id: I1d90bfaa4ea594fee2dbd42f936538950ca6662f
diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx
index a913837..2c9d432b 100644
--- a/sc/inc/pch/precompiled_sc.hxx
+++ b/sc/inc/pch/precompiled_sc.hxx
@@ -838,7 +838,6 @@
#include svx/xftdiit.hxx
#include svx/xftmrit.hxx
#include svx/xftouit.hxx
-#include svx/xftsfit.hxx
#include svx/xftshcit.hxx
#include svx/xftshit.hxx
#include svx/xftshxy.hxx
commit 5f84a4cdcb9ae2b2fc002cefeccf349682f0a29d
Author: Armin Le Grand a...@apache.org
Date: Thu May 16 14:53:56 2013 +
Resolves: #i122324# detect own re-import of EmbeddedFonts...
and correct font name
(cherry picked from commit c2b5f0eedcc0fb7e0175e81b6f6127b99b8b7499)
Conflicts:
svgio/source/svgreader/svgcharacternode.cxx
Change-Id: I437db7feccd31a653f1100b426b568278faee4cc
diff --git a/svgio/source/svgreader/svgcharacternode.cxx
b/svgio/source/svgreader/svgcharacternode.cxx
index e6a4a19..b154645 100644
--- a/svgio/source/svgreader/svgcharacternode.cxx
+++ b/svgio/source/svgreader/svgcharacternode.cxx
@@ -243,9 +243,19 @@ namespace svgio
if(nLength)
{
// prepare FontAttribute
-const OUString aFontFamily =
rSvgStyleAttributes.getFontFamily().empty() ?
-OUString(OUString::createFromAscii(Times New Roman)) :
+OUString aFontFamily =
rSvgStyleAttributes.getFontFamily().empty() ?
+OUString(Times New Roman) :
rSvgStyleAttributes.getFontFamily()[0];
+
+// #i122324# if the FontFamily name ends on ' embedded' it is
probably a re-import
+// of a SVG export with font embedding. Remove this to make
font matching work. This
+// is pretty safe since there should be no font family names
ending on ' embedded'.
+// Remove again when FontEmbedding is implemented in SVG import
+if(aFontFamily.endsWithAsciiL( embedded, 9))
+{
+aFontFamily = aFontFamily.copy(0, aFontFamily.getLength()
- 9);
+}
+
const ::FontWeight
nFontWeight(getVclFontWeight(rSvgStyleAttributes.getFontWeight()));
bool bSymbol(false);
bool bVertical(false);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Re: Rolf Hemmerling
Hi Rolf, On Sat, 2013-06-15 at 19:54 +0200, Rolf Hemmerling wrote: All of my past future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. Thanks for that - we only need one of these. http://cgit.freedesktop.org/libreoffice/core/plain/include/svx/svdmrkv.hxx to English, Great stuff - pushed to master; for the future: it's nice to have a mail subject: [PATCH] what it does for such mails. Anyhow - great to have your contribution ! hope you enjoyed the hackfest. All the best, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/suse-4.0-5'
Tag 'suse-4.0-5' created by Fridrich Å trba fridrich.st...@bluewin.ch at 2013-06-17 14:15 -0700 Tag suse-4.0-5 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.19 (GNU/Linux) iEYEABECAAYFAlG/C9cACgkQu9a1imXPdA9dcgCeNvw62W6nILKKuk786OsEAUTL TmsAn3ys1Ka4pxamv5wrorWGI6Cz//X1 =JS7a -END PGP SIGNATURE- Changes since suse-4.0-3-2: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter' - 3 commits - config_host.mk.in configure.ac RepositoryExternal.mk sc/CppunitTest_sc_ucalc.mk sc/Library_sc.mk sc/source
RepositoryExternal.mk | 17
config_host.mk.in |3
configure.ac| 34 +
sc/CppunitTest_sc_ucalc.mk |3
sc/Library_sc.mk|8
sc/source/core/opencl/oclkernels.hxx| 116 +++
sc/source/core/opencl/openclwrapper.cxx | 1031
sc/source/core/opencl/openclwrapper.hxx | 172 +
sc/source/core/tool/interpr1.cxx|4
9 files changed, 1388 insertions(+)
New commits:
commit d967e607006c063c36e0cc85e6a527366bd19d81
Author: Michael Meeks michael.me...@suse.com
Date: Sun Jun 16 17:55:11 2013 +0100
OpenCL code cleanups
Change-Id: Iab75b11f13856a6e631587e22b5d76977b8c7448
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 479c08b..2b3166b 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -38,7 +38,7 @@
# External headers
-ifeq ($(ENABLE_OPENGCL),TRUE)
+ifeq ($(ENABLE_OPENCL),TRUE)
define gb_LinkTarget__use_opencl
$(call gb_LinkTarget_set_include,$(1),\
diff --git a/configure.ac b/configure.ac
index f81ab47..821233d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9688,8 +9688,8 @@ if test z$with_opencl_sdk = z; then
else
if test -d $with_opencl_sdk/include; then
ENABLE_OPENCL=TRUE
- OPENCL_CFLAGS=-I $with_opencl_sdk/include
- OPENCL_LIBS=-L $with_opencl_sdk/lib/x86 -lOpenCL
+ OPENCL_CFLAGS=-I$with_opencl_sdk/include
+ OPENCL_LIBS=-L$with_opencl_sdk/lib/x86 -lOpenCL
AC_MSG_RESULT([found at path $with_opencl_sdk])
else
AC_MSG_ERROR([no headers found found at
$with_opencl_sdk/include ])
diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk
index acf7bdb..7ed41df 100644
--- a/sc/CppunitTest_sc_ucalc.mk
+++ b/sc/CppunitTest_sc_ucalc.mk
@@ -20,6 +20,9 @@ $(eval $(call gb_CppunitTest_use_library_objects,sc_ucalc,sc))
ifeq ($(ENABLE_TELEPATHY),TRUE)
$(eval $(call gb_CppunitTest_use_libraries,sc_ucalc,tubes))
endif
+ifeq ($(ENABLE_OPENCL),TRUE)
+$(eval $(call gb_CppunitTest_use_externals,sc_ucalc,opencl))
+endif
$(eval $(call gb_CppunitTest_use_externals,sc_ucalc,\
boost_headers \
diff --git a/sc/source/core/opencl/openclwrapper.cxx
b/sc/source/core/opencl/openclwrapper.cxx
index 05b169a..6c3935e 100644
--- a/sc/source/core/opencl/openclwrapper.cxx
+++ b/sc/source/core/opencl/openclwrapper.cxx
@@ -11,6 +11,7 @@
#include stdlib.h
#include string.h
+#include random.hxx
#include openclwrapper.hxx
#include oclkernels.hxx
@@ -1003,10 +1004,8 @@ double OclCalc::OclProcess(cl_kernel_function function,
double *data,
double OclCalc::OclTest() {
double data[NUM];
-srand((unsigned int) time(NULL));
-
for (int i = 0; i NUM; i++) {
-data[i] = rand() / (RAND_MAX + 1.0);
+data[i] = sc::rng::uniform();
fprintf(stderr, %f\t, data[i]);
}
OclProcess(OclFormulax, data, AVG);
commit c16b1dce36d530a7d4a21fc86596ada17e392c0b
Author: Peng Gao p...@multicorewareinc.com
Date: Sun Jun 16 17:18:23 2013 +0100
Initial OpenCL pieces.
Change-Id: I3a52cb7085b2dd8b70863a346eca279444206be6
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 2a58722..479c08b 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -38,6 +38,23 @@
# External headers
+ifeq ($(ENABLE_OPENGCL),TRUE)
+
+define gb_LinkTarget__use_opencl
+$(call gb_LinkTarget_set_include,$(1),\
+ $$(INCLUDE) \
+$(OPENCL_CFLAGS) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(OPENCL_LIBS))
+
+endef
+
+else # ENABLE_OPENCL != TRUE
+
+gb_LinkTarget__use_opencl :=
+
+endif
+
ifeq ($(SYSTEM_MARIADB),YES)
define gb_LinkTarget__use_mariadb
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index f4ed57d..7117349 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -49,6 +49,14 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
))
endif
+ifeq ($(ENABLE_OPENCL),TRUE)
+$(eval $(call gb_Library_use_externals,sc,opencl))
+
+$(eval $(call gb_Library_add_exception_objects,sc,\
+ sc/source/core/opencl/openclwrapper \
+))
+endif
+
$(eval $(call gb_Library_use_libraries,sc,\
avmedia \
basegfx \
diff --git a/sc/source/core/opencl/oclkernels.hxx
b/sc/source/core/opencl/oclkernels.hxx
new file mode 100644
index 000..f9db447
--- /dev/null
+++ b/sc/source/core/opencl/oclkernels.hxx
@@ -0,0 +1,116 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef _OCL_KERNEL_H_
+#define _OCL_KERNEL_H_
+
+#ifndef USE_EXTERNAL_KERNEL
+#define KERNEL( ... )# __VA_ARGS__
+
[PUSHED] Re: Rolf Hemmerling
On Sun, 2013-06-16 at 14:08 +0200, Rolf Hemmerling wrote: My 2nd. contribution: I translated the German comments of http://cgit.freedesktop.org/libreoffice/core/plain/sw/source/core/text/itrcrsr.cxx to English, Thanks for that - looks great; pushed ... There are of course plenty more where that came from :-) all contributions gratefully received. All the best, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Changes to 'refs/tags/suse-4.0-5'
Tag 'suse-4.0-5' created by Fridrich Å trba fridrich.st...@bluewin.ch at 2013-06-17 14:27 -0700 Tag suse-4.0-5 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.19 (GNU/Linux) iEYEABECAAYFAlG/DsgACgkQu9a1imXPdA/okQCfXmeZkyrz7LzFiIwjhQB4AOoK 7ikAnjl1h89tcD1dxHbqYvolJFVrD7eg =0McQ -END PGP SIGNATURE- Changes since suse-4.0-3-44: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sw/source vcl/qa
sw/source/core/text/itrcrsr.cxx | 100 +++-
vcl/qa/cppunit/complextext.cxx | 11
2 files changed, 59 insertions(+), 52 deletions(-)
New commits:
commit 821446a0be326c0065c827ffcd4670c113c78755
Author: Michael Meeks michael.me...@suse.com
Date: Mon Jun 17 14:27:03 2013 +0100
Use hex numbers for in-line Arabic / UTF-8 string.
Change-Id: I89d5420ad16e7dbfa1f3b6472d78162dffef59c4
diff --git a/vcl/qa/cppunit/complextext.cxx b/vcl/qa/cppunit/complextext.cxx
index 2519092..3f03d62 100644
--- a/vcl/qa/cppunit/complextext.cxx
+++ b/vcl/qa/cppunit/complextext.cxx
@@ -33,7 +33,16 @@ void VclComplexTextTest::testArabic()
#if !defined (LINUX)
return;
#else // only tested on Linux so far
-OUString aOneTwoThree( ÙاØÙد٠إثÙÙÙÙ Ø«Ùاثة٠);
+const unsigned char pOneTwoThreeUTF8[] = {
+0xd9, 0x88, 0xd8, 0xa7, 0xd8, 0xad, 0xd9, 0x90,
+0xd8, 0xaf, 0xd9, 0x92, 0x20, 0xd8, 0xa5, 0xd8,
+0xab, 0xd9, 0x8d, 0xd9, 0x86, 0xd9, 0x8a, 0xd9,
+0x86, 0x20, 0xd8, 0xab, 0xd9, 0x84, 0xd8, 0xa7,
+0xd8, 0xab, 0xd8, 0xa9, 0xd9, 0x8c, 0x00
+};
+OUString aOneTwoThree( (sal_Char *)pOneTwoThreeUTF8,
+ SAL_N_ELEMENTS( pOneTwoThreeUTF8 ) - 1,
+ RTL_TEXTENCODING_UTF8 );
Window* pWin = new WorkWindow( (Window *)NULL );
CPPUNIT_ASSERT( pWin != NULL );
commit 3f1fecdbc784ab2c98321b7de5edfedef690c77c
Author: Rolf Hemmerling hemmerl...@gmx.net
Date: Mon Jun 17 14:18:54 2013 +0100
Translate German comments.
Change-Id: Ic9cd2288ac25868949b7f2de8ce517c2cd03d1e4
diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx
index 5211ca5..a162a24 100644
--- a/sw/source/core/text/itrcrsr.cxx
+++ b/sw/source/core/text/itrcrsr.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include hintids.hxx
#include ndtxt.hxx
#include frmfmt.hxx
@@ -48,8 +47,8 @@
// #i111284#
#include numrule.hxx
-// Nicht reentrant !!!
-// wird in GetCharRect gesetzt und im UnitUp/Down ausgewertet.
+// Not reentrant !!!
+// is set in GetCharRect and is interpreted in UnitUp/Down.
sal_Bool SwTxtCursor::bRightMargin = sal_False;
@@ -234,7 +233,7 @@ void SwTxtMargin::CtorInitTxtMargin( SwTxtFrm *pNewFrm,
SwTxtSizeInfo *pNewInf )
!nLMWithNum ) )
{
nLeft = pFrm-Prt().Left() + pFrm-Frm().Left();
-if( nLeft = nRight ) // z.B. bei grossen Absatzeinzuegen in
schmalen Tabellenspalten
+if( nLeft = nRight ) // e.g. with large paragraph indentations in
slim table columns
nRight = nLeft + 1; // einen goennen wir uns immer
}
@@ -273,8 +272,8 @@ void SwTxtMargin::CtorInitTxtMargin( SwTxtFrm *pNewFrm,
SwTxtSizeInfo *pNewInf )
case SVX_INTER_LINE_SPACE_PROP:
{
long nTmp = pSpace-GetPropLineSpace();
-// 50% ist das Minimum, bei 0% schalten wir auf
-// den Defaultwert 100% um ...
+// 50% is the minimumm, at 0% we switch to
+// the default value 100% ...
if( nTmp 50 )
nTmp = nTmp ? 50 : 100;
@@ -375,15 +374,15 @@ void SwTxtMargin::DropInit()
*SwTxtMargin::GetLineStart()
*/
-// Unter Beruecksichtigung des Erstzeileneinzuges und der angebenen Breite.
+// The function is interpreting / observing / evaluating / keeping /
respecting the first line indention and the specified width.
SwTwips SwTxtMargin::GetLineStart() const
{
SwTwips nRet = GetLeftMargin();
if( GetAdjust() != SVX_ADJUST_LEFT
!pCurr-GetFirstPortion()-IsMarginPortion() )
{
-// Wenn die erste Portion ein Margin ist, dann wird das
-// Adjustment durch die Portions ausgedrueckt.
+// If the first portion is a Margin, then the
+// adjustment is expressed by the portions.
if( GetAdjust() == SVX_ADJUST_RIGHT )
nRet = Right() - CurrWidth();
else if( GetAdjust() == SVX_ADJUST_CENTER )
@@ -398,7 +397,7 @@ SwTwips SwTxtMargin::GetLineStart() const
void SwTxtCursor::CtorInitTxtCursor( SwTxtFrm *pNewFrm, SwTxtSizeInfo *pNewInf
)
{
CtorInitTxtMargin( pNewFrm, pNewInf );
-// 6096: Vorsicht, die Iteratoren sind abgeleitet!
+// 6096: Attention, the iterators are derived!
// GetInfo().SetOut( GetInfo().GetWin() );
}
@@ -406,21 +405,21 @@ void SwTxtCursor::CtorInitTxtCursor( SwTxtFrm *pNewFrm,
SwTxtSizeInfo *pNewInf )
* SwTxtCursor::GetEndCharRect()
*/
-// 1170: Antikbug: Shift-Ende vergisst das letzte Zeichen ...
+// 1170: Ancient bug: Shift-End forgets the last character ...
sal_Bool
Re: Bonjour Service implementation on server end
On Mon, 2013-06-17 at 13:16 +0100, Andrzej J. R. Hunt wrote: -Hence a custom discovery protocol was devised (multicast packets, see android/sdremote/src/org/libreoffice/impressremote/communication/ServerFinder.java for an example of the client end). My concern (perhaps based on ignorance) was that despite the multicast nature of mDNS - I suspect that we have to have a single app on each host owning the mDNS port - rather than allowing lots of separate apps to listen to that on the same machine. As such, that gives some interesting platform integration problems on Linux - whereby we have to attempt to integrate with whatever dameon / service is owning that port on the given platform - or bear the risk (if we get it) of screwing up whatever else wants to use that. Then of course, we disabled TCP/IP by default anyway concerned about security - and so this was less of a problem. W.r.t to actual support for this, as far as I remember it was: - Bonjour for Mac - Avahi for Linux - Bonjour for Windows too, but would require shipping the Bonjour binary along with LO. I guess that needs some license investigation; but sounds plausible Bonjour is IIRC ALv2. Wrt. integrating with Avahi - I guess we don't want hard linkage to that, in case it's not there - so that'd mean having a plugin of some kind: do-able but a bit more work (depending how Avahi's client functionality works). With an internal Bonjour on Windows, does that mean we join a bun-fight for who owns the mDNS port on Windows ? against anyone else that tries to have Bonjour support ? and/or would we have to ship a daemon there ? It'd be nice to know what version requirements we have for our base-line Mac build vs. the Bonjour API. Otherwise - it seems like this is the best way to get bluetooth-incapable iPhones working ? :-) so - lets go for it I guess. ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: drawinglayer/source include/drawinglayer svgio/inc svgio/source
drawinglayer/source/primitive2d/svggradientprimitive2d.cxx | 25 +
include/drawinglayer/primitive2d/svggradientprimitive2d.hxx |7
svgio/inc/svgio/svgreader/svgnode.hxx |5
svgio/source/svgreader/svggnode.cxx |2
svgio/source/svgreader/svgnode.cxx | 193 ++--
svgio/source/svgreader/svgstyleattributes.cxx | 17 -
6 files changed, 152 insertions(+), 97 deletions(-)
New commits:
commit b7a425aab6122b5848362815e5fe665c7e38da05
Author: Armin Le Grand a...@apache.org
Date: Wed May 15 08:47:52 2013 +
Resolves: #i121801# Corrected handling of gradient transformations
(cherry picked from commit 4f49f1d95e8d0be7df259ad1458441fd858be735)
Conflicts:
drawinglayer/inc/drawinglayer/primitive2d/svggradientprimitive2d.hxx
svgio/source/svgreader/svgnode.cxx
svgio/source/svgreader/svgstyleattributes.cxx
Change-Id: I155854692a9d1771826867d2666fc6174e2c9256
diff --git a/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx
b/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx
index 0328070..756f7b0 100644
--- a/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx
@@ -280,12 +280,14 @@ namespace drawinglayer
}
SvgGradientHelper::SvgGradientHelper(
+const basegfx::B2DHomMatrix rGradientTransform,
const basegfx::B2DPolyPolygon rPolyPolygon,
const SvgGradientEntryVector rGradientEntries,
const basegfx::B2DPoint rStart,
bool bUseUnitCoordinates,
SpreadMethod aSpreadMethod)
-: maPolyPolygon(rPolyPolygon),
+: maGradientTransform(rGradientTransform),
+maPolyPolygon(rPolyPolygon),
maGradientEntries(rGradientEntries),
maStart(rStart),
maSpreadMethod(aSpreadMethod),
@@ -301,7 +303,8 @@ namespace drawinglayer
{
const SvgGradientHelper rCompare = static_cast const
SvgGradientHelper (rSvgGradientHelper);
-return (getPolyPolygon() == rCompare.getPolyPolygon()
+return (getGradientTransform() == rCompare.getGradientTransform()
+ getPolyPolygon() == rCompare.getPolyPolygon()
getGradientEntries() == rCompare.getGradientEntries()
getStart() == rCompare.getStart()
getUseUnitCoordinates() == rCompare.getUseUnitCoordinates()
@@ -427,6 +430,11 @@ namespace drawinglayer
aUnitGradientToObject.translate(aStart.getX(),
aStart.getY());
}
+if(!getGradientTransform().isIdentity())
+{
+aUnitGradientToObject = getGradientTransform() *
aUnitGradientToObject;
+}
+
// create inverse from it
basegfx::B2DHomMatrix
aObjectToUnitGradient(aUnitGradientToObject);
aObjectToUnitGradient.invert();
@@ -545,6 +553,7 @@ namespace drawinglayer
}
SvgLinearGradientPrimitive2D::SvgLinearGradientPrimitive2D(
+const basegfx::B2DHomMatrix rGradientTransform,
const basegfx::B2DPolyPolygon rPolyPolygon,
const SvgGradientEntryVector rGradientEntries,
const basegfx::B2DPoint rStart,
@@ -552,7 +561,7 @@ namespace drawinglayer
bool bUseUnitCoordinates,
SpreadMethod aSpreadMethod)
: BufferedDecompositionPrimitive2D(),
-SvgGradientHelper(rPolyPolygon, rGradientEntries, rStart,
bUseUnitCoordinates, aSpreadMethod),
+SvgGradientHelper(rGradientTransform, rPolyPolygon,
rGradientEntries, rStart, bUseUnitCoordinates, aSpreadMethod),
maEnd(rEnd)
{
}
@@ -748,6 +757,8 @@ namespace drawinglayer
else
{
// interpret in object coordinate system - object aspect
ratio will not scale result
+// use X-Axis with radius, it was already made relative to
object width when coming from
+// SVG import
const double fRadius((aObjectTransform *
basegfx::B2DVector(getRadius(), 0.0)).getLength());
const basegfx::B2DPoint aStart(aObjectTransform *
getStart());
@@ -755,6 +766,11 @@ namespace drawinglayer
aUnitGradientToObject.translate(aStart.getX(),
aStart.getY());
}
+if(!getGradientTransform().isIdentity())
+{
+aUnitGradientToObject = getGradientTransform() *
aUnitGradientToObject;
+}
+
// create inverse from it
basegfx::B2DHomMatrix
aObjectToUnitGradient(aUnitGradientToObject);
aObjectToUnitGradient.invert();
@@ -822,6 +838,7 @@ namespace drawinglayer
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 4f/49f1d95e8d0be7df259ad1458441fd858be735
4f/49f1d95e8d0be7df259ad1458441fd858be735 |1 + 1 file changed, 1 insertion(+) New commits: commit ea385be7ed8002a0537e362c34df976ef3edeb6e Author: Caolán McNamara caol...@redhat.com Date: Mon Jun 17 14:43:40 2013 +0100 Notes added by 'git notes add' diff --git a/4f/49f1d95e8d0be7df259ad1458441fd858be735 b/4f/49f1d95e8d0be7df259ad1458441fd858be735 new file mode 100644 index 000..082b971 --- /dev/null +++ b/4f/49f1d95e8d0be7df259ad1458441fd858be735 @@ -0,0 +1 @@ +merged as: b7a425aab6122b5848362815e5fe665c7e38da05 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Fixes fdo#59642
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4314
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/14/4314/1
Fixes fdo#59642
By making just the one test, the most generic one, and not nesting strstr
functions calls.
Change-Id: I1b49e9faea6742594eaa900a87a03c4dd86c0b5c
---
M starmath/source/smdetect.cxx
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/starmath/source/smdetect.cxx b/starmath/source/smdetect.cxx
index e6a2ef8..7962f7a 100644
--- a/starmath/source/smdetect.cxx
+++ b/starmath/source/smdetect.cxx
@@ -317,8 +317,7 @@
sal_Char aBuffer2[200];
nBytesRead = pStrm-Read( aBuffer2,
sizeof(aBuffer2) - 1);
aBuffer2[nBytesRead] = 0;
-if (strstr( aBuffer2, math ) != NULL ||
-strstr( aBuffer2, math ) != NULL)
+if (strstr( aBuffer2, math ))
{
static const sal_Char sFltrNm_2[] =
MATHML_XML;
static const sal_Char sTypeNm_2[] =
math_MathML_XML_Math;
--
To view, visit https://gerrit.libreoffice.org/4314
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1b49e9faea6742594eaa900a87a03c4dd86c0b5c
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Marcos Souza marcos.souza@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: drawinglayer/source
drawinglayer/source/primitive2d/svggradientprimitive2d.cxx | 41 +++--
1 file changed, 24 insertions(+), 17 deletions(-)
New commits:
commit e0d8fb0cb157668dffa683fe81418304f8a843dd
Author: Armin Le Grand a...@apache.org
Date: Wed May 15 09:51:21 2013 +
Related: #i121801# Corrected objectBoundingBox case for GradientTransform
(cherry picked from commit f03ec4812cfe71f582c5290869f22eadd661b48a)
Change-Id: Icb3e2cefda2fd5fe9a2dcf501e5e07881961932e
diff --git a/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx
b/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx
index 756f7b0..66d21f0 100644
--- a/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx
@@ -408,15 +408,19 @@ namespace drawinglayer
// gradient vector defined by Start,End
const basegfx::B2DVector aVector(getEnd() - getStart());
const double fVectorLength(aVector.getLength());
-basegfx::B2DHomMatrix aUnitGradientToGradient;
-aUnitGradientToGradient.scale(fVectorLength, 1.0);
-aUnitGradientToGradient.rotate(atan2(aVector.getY(),
aVector.getX()));
-aUnitGradientToGradient.translate(getStart().getX(),
getStart().getY());
+aUnitGradientToObject.scale(fVectorLength, 1.0);
+aUnitGradientToObject.rotate(atan2(aVector.getY(),
aVector.getX()));
+aUnitGradientToObject.translate(getStart().getX(),
getStart().getY());
+
+if(!getGradientTransform().isIdentity())
+{
+aUnitGradientToObject = getGradientTransform() *
aUnitGradientToObject;
+}
// create full transform from unit gradient coordinates to
object coordinates
// including the SvgGradient transformation
-aUnitGradientToObject = aObjectTransform *
aUnitGradientToGradient;
+aUnitGradientToObject = aObjectTransform *
aUnitGradientToObject;
}
else
{
@@ -428,11 +432,11 @@ namespace drawinglayer
aUnitGradientToObject.scale(aVector.getLength(), 1.0);
aUnitGradientToObject.rotate(atan2(aVector.getY(),
aVector.getX()));
aUnitGradientToObject.translate(aStart.getX(),
aStart.getY());
-}
-if(!getGradientTransform().isIdentity())
-{
-aUnitGradientToObject = getGradientTransform() *
aUnitGradientToObject;
+if(!getGradientTransform().isIdentity())
+{
+aUnitGradientToObject = getGradientTransform() *
aUnitGradientToObject;
+}
}
// create inverse from it
@@ -745,14 +749,17 @@ namespace drawinglayer
{
// interpret in unit coordinate system - object aspect
ratio will scale result
// create unit transform from unit vector to given linear
gradient vector
-basegfx::B2DHomMatrix aUnitGradientToGradient;
+aUnitGradientToObject.scale(getRadius(), getRadius());
+aUnitGradientToObject.translate(getStart().getX(),
getStart().getY());
-aUnitGradientToGradient.scale(getRadius(), getRadius());
-aUnitGradientToGradient.translate(getStart().getX(),
getStart().getY());
+if(!getGradientTransform().isIdentity())
+{
+aUnitGradientToObject = getGradientTransform() *
aUnitGradientToObject;
+}
// create full transform from unit gradient coordinates to
object coordinates
// including the SvgGradient transformation
-aUnitGradientToObject = aObjectTransform *
aUnitGradientToGradient;
+aUnitGradientToObject = aObjectTransform *
aUnitGradientToObject;
}
else
{
@@ -764,11 +771,11 @@ namespace drawinglayer
aUnitGradientToObject.scale(fRadius, fRadius);
aUnitGradientToObject.translate(aStart.getX(),
aStart.getY());
-}
-if(!getGradientTransform().isIdentity())
-{
-aUnitGradientToObject = getGradientTransform() *
aUnitGradientToObject;
+if(!getGradientTransform().isIdentity())
+{
+aUnitGradientToObject = getGradientTransform() *
aUnitGradientToObject;
+}
}
// create inverse from it
___
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Michael Meeks michael.me...@novell.com changed: What|Removed |Added Status|UNCONFIRMED |NEW Ever confirmed|0 |1 --- Comment #2 from Michael Meeks michael.me...@novell.com --- Justin - most annoying bugs are something like blocker bugs; and enhancements like bug#60245 are not really appropriate unless this is cripplingly debilitating. Also - such bugs belong on the MAB list of the oldest version that they affect; thanks for filing though ! -- 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 'refs/notes/commits' - f0/3ec4812cfe71f582c5290869f22eadd661b48a
f0/3ec4812cfe71f582c5290869f22eadd661b48a |1 + 1 file changed, 1 insertion(+) New commits: commit edd43a1d886902bdd448ebf8a73aa3717cbd463d Author: Caolán McNamara caol...@redhat.com Date: Mon Jun 17 14:45:09 2013 +0100 Notes added by 'git notes add' diff --git a/f0/3ec4812cfe71f582c5290869f22eadd661b48a b/f0/3ec4812cfe71f582c5290869f22eadd661b48a new file mode 100644 index 000..9fc24f4 --- /dev/null +++ b/f0/3ec4812cfe71f582c5290869f22eadd661b48a @@ -0,0 +1 @@ +merged as: e0d8fb0cb157668dffa683fe81418304f8a843dd ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'feature/aboutconfig'
New branch 'feature/aboutconfig' available with the following commits: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 58/b44ad7c8d46904da750c4820f4bde675953fa9
58/b44ad7c8d46904da750c4820f4bde675953fa9 |1 + 1 file changed, 1 insertion(+) New commits: commit 3ffee7f620c57af2ae405fa7000b040cac32309f Author: Caolán McNamara caol...@redhat.com Date: Mon Jun 17 14:51:03 2013 +0100 Notes added by 'git notes add' diff --git a/58/b44ad7c8d46904da750c4820f4bde675953fa9 b/58/b44ad7c8d46904da750c4820f4bde675953fa9 new file mode 100644 index 000..ce0a3a8 --- /dev/null +++ b/58/b44ad7c8d46904da750c4820f4bde675953fa9 @@ -0,0 +1 @@ +merged as: e014694623b1516aa47f2012cc038e4c64ed7bea ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/svdraw/svdfmtf.cxx | 177 +-
1 file changed, 125 insertions(+), 52 deletions(-)
New commits:
commit e014694623b1516aa47f2012cc038e4c64ed7bea
Author: Armin Le Grand a...@apache.org
Date: Fri May 17 09:58:33 2013 +
Resolves: #i122326# added text clipping, corrected text box distances
(cherry picked from commit 58b44ad7c8d46904da750c4820f4bde675953fa9)
Conflicts:
svx/source/svdraw/svdfmtf.cxx
Change-Id: I313c2f50269b8ba97c32a24b92aafafb49f3ca70
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index 879e230..a6e27ff 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -68,6 +68,9 @@
#include svx/xflbmtit.hxx
#include svx/xflbstit.hxx
#include svx/svdpntv.hxx
+#include basegfx/polygon/b2dpolypolygontools.hxx
+#include svx/svditer.hxx
+#include svx/svdogrp.hxx
@@ -476,63 +479,130 @@ void ImpSdrGDIMetaFileImport::InsertObj(SdrObject* pObj,
bool bScale)
const SdrLayerID aOldLayer(pObj-GetLayer());
const SfxItemSet aOldItemSet(pObj-GetMergedItemSet());
const SdrGrafObj* pSdrGrafObj = dynamic_cast SdrGrafObj* (pObj);
-BitmapEx aBitmapEx;
+const SdrTextObj* pSdrTextObj = dynamic_cast SdrTextObj* (pObj);
-if(pSdrGrafObj)
+if(pSdrTextObj pSdrTextObj-HasText())
{
-aBitmapEx = pSdrGrafObj-GetGraphic().GetBitmapEx();
-}
+// all text objects are created from ImportText and have no line
or fill attributes, so
+// it is okay to concentrate on the text itself
+while(true)
+{
+const basegfx::B2DPolyPolygon
aTextContour(pSdrTextObj-TakeContour());
+const basegfx::B2DRange aTextRange(aTextContour.getB2DRange());
+const basegfx::B2DRange aClipRange(maClip.getB2DRange());
+
+// no overlap - completely outside
+if(!aClipRange.overlaps(aTextRange))
+{
+SdrObject::Free(pObj);
+break;
+}
+
+// when the clip is a rectangle fast check for inside is
possible
+if(basegfx::tools::isRectangle(maClip)
aClipRange.isInside(aTextRange))
+{
+// completely inside ClipRect
+break;
+}
-SdrObject::Free(pObj);
+// here text needs to be clipped; to do so, convert to
SdrObjects with polygons
+// and add these recursively. Delete original object, do not
add in this run
+SdrObject* pConverted = pSdrTextObj-ConvertToPolyObj(true,
true);
+SdrObject::Free(pObj);
-if(!aOldRange.isEmpty())
+if(pConverted)
+{
+// recursively add created conversion; per definition this
shall not
+// contain further SdrTextObjs. Visit only non-group
objects
+SdrObjListIter aIter(*pConverted, IM_DEEPNOGROUPS);
+
+// work with clones; the created conversion may contain
group objects
+// and when working with the original objects the loop
itself could
+// break and the cleanup later would be pretty complicated
(only delete group
+// objects, are these empty, ...?)
+while(aIter.IsMore())
+{
+SdrObject* pCandidate = aIter.Next();
+OSL_ENSURE(pCandidate 0 == dynamic_cast
SdrObjGroup* (pCandidate), SdrObjListIter with IM_DEEPNOGROUPS error (!));
+SdrObject* pNewClone = pCandidate-Clone();
+
+if(pNewClone)
+{
+InsertObj(pNewClone, false);
+}
+else
+{
+OSL_ENSURE(false, SdrObject::Clone() failed (!));
+}
+}
+
+// cleanup temporary conversion objects
+SdrObject::Free(pConverted);
+}
+
+break;
+}
+}
+else
{
-// clip against ClipRegion
-const basegfx::B2DPolyPolygon aNewPoly(
-basegfx::tools::clipPolyPolygonOnPolyPolygon(
-aPoly,
-maClip,
-true,
-aPoly.isClosed() ? false : true));
-const basegfx::B2DRange aNewRange(aNewPoly.getB2DRange());
-
-if(!aNewRange.isEmpty())
+BitmapEx aBitmapEx;
+
+if(pSdrGrafObj)
{
-pObj = new SdrPathObj(
-
[Libreoffice-commits] core.git: starmath/source
starmath/source/smdetect.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit ef4872f6c6a49878ea2fc6b3a4ea3cd9ad52de33
Author: Marcos Paulo de Souza marcos.souza@gmail.com
Date: Mon Jun 17 10:40:45 2013 -0300
Fixes fdo#59642
By adding one more test about mathml xml.
Change-Id: I1b49e9faea6742594eaa900a87a03c4dd86c0b5c
Reviewed-on: https://gerrit.libreoffice.org/4314
Reviewed-by: Michael Meeks michael.me...@suse.com
Tested-by: Michael Meeks michael.me...@suse.com
diff --git a/starmath/source/smdetect.cxx b/starmath/source/smdetect.cxx
index e6a2ef8..39b67b7 100644
--- a/starmath/source/smdetect.cxx
+++ b/starmath/source/smdetect.cxx
@@ -317,8 +317,9 @@ OUString SAL_CALL SmFilterDetect::detect( Sequence
PropertyValue lDescriptor
sal_Char aBuffer2[200];
nBytesRead = pStrm-Read( aBuffer2,
sizeof(aBuffer2) - 1);
aBuffer2[nBytesRead] = 0;
-if (strstr( aBuffer2, math ) != NULL ||
-strstr( aBuffer2, math ) != NULL)
+if (strstr( aBuffer2, math ) ||
+strstr( aBuffer2, math ) ||
+strstr( aBuffer2, math:math ))
{
static const sal_Char sFltrNm_2[] =
MATHML_XML;
static const sal_Char sTypeNm_2[] =
math_MathML_XML_Math;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Fixes fdo#59642
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4314 Approvals: Michael Meeks: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/4314 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1b49e9faea6742594eaa900a87a03c4dd86c0b5c Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Michael Meeks michael.me...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Resolved: build failure in [build GAL] arrows
On Mon, 2013-06-17 at 10:45 +0200, Matúš Kukan wrote: Hi, On 17 June 2013 03:19, Terrence Enger ten...@iseries-guru.com wrote: Hi, I have two successive failures building master, each at the step [build GAL] arrows. The first was an incremental build of commit 843735f pulled today (Sunday) around 00:45 UCT, which failed with ... ... Among recent commits, 9555b5b Add gengal to RepositoryFixes and autoinstall it. catches my eye because it shares the string gengal with the first error message. Indeed, sorry for this, there was missing dependency hopefully fixed with http://cgit.freedesktop.org/libreoffice/core/commit/?id=94b6882b80c91d2daf5e317e9d79d3d2a1c6572bfix gengal dependencies I have pulled again, and the build has progressed past the point of the previous failure. Thank you. Terry. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#43460 chart2: use isEmpty()
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4315
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/15/4315/1
fdo#43460 chart2: use isEmpty()
Change-Id: Ia74923ed8f00adfa3f7758edb4e5755fedb0ec8a
---
M chart2/source/tools/ObjectIdentifier.cxx
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/chart2/source/tools/ObjectIdentifier.cxx
b/chart2/source/tools/ObjectIdentifier.cxx
index 9dc31b1..2358057 100644
--- a/chart2/source/tools/ObjectIdentifier.cxx
+++ b/chart2/source/tools/ObjectIdentifier.cxx
@@ -1005,7 +1005,7 @@
{
OUStringBuffer aRet(rParticle);
-if( aRet.getLength() !rChildParticle.isEmpty() )
+if( !aRet.isEmpty() !rChildParticle.isEmpty() )
aRet.appendAscii(:);
if( !rChildParticle.isEmpty() )
aRet.append(rChildParticle);
@@ -1016,7 +1016,7 @@
OUString ObjectIdentifier::createChildParticleWithIndex( ObjectType
eObjectType, sal_Int32 nIndex )
{
OUStringBuffer aRet( getStringForType( eObjectType ) );
-if( aRet.getLength() )
+if( !aRet.isEmpty() )
{
aRet.appendAscii(=);
aRet.append(OUString::valueOf(nIndex));
--
To view, visit https://gerrit.libreoffice.org/4315
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia74923ed8f00adfa3f7758edb4e5755fedb0ec8a
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Jelle van der Waa je...@vdwaa.nl
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/ui/uiview/srcview.cxx |2 +-
sw/source/ui/uiview/view0.cxx| 21 +
sw/source/ui/uiview/view1.cxx| 21 ++---
sw/source/ui/uiview/viewdlg.cxx |6 +-
sw/source/ui/uiview/viewdlg2.cxx | 14 ++
sw/source/ui/uiview/viewdraw.cxx | 38 --
sw/source/ui/uiview/viewfunc.hxx |4 ++--
7 files changed, 45 insertions(+), 61 deletions(-)
New commits:
commit 0669c58d6016a6447317b0f10dad8896f6dd9f38
Author: Matthias Freund matti...@yahoo.de
Date: Sun Jun 16 00:52:54 2013 +0200
fdo#39468 Comment translation GER-ENG in sw/source/ui/uiview (Part 3)
And again translations and cleanups.
Change-Id: I13ebd6c9073af855f34a425cfda247155b634f34
Reviewed-on: https://gerrit.libreoffice.org/4296
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com
diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx
index 4092a2f..805847f 100644
--- a/sw/source/ui/uiview/srcview.cxx
+++ b/sw/source/ui/uiview/srcview.cxx
@@ -697,7 +697,7 @@ sal_Int32 SwSrcView::PrintSource(
String aTitle( GetViewFrame()-GetWindow().GetText() );
-sal_uInt16 nLineHeight = (sal_uInt16) pOutDev-GetTextHeight(); // etwas
mehr.
+sal_uInt16 nLineHeight = (sal_uInt16) pOutDev-GetTextHeight(); //
slightly more
sal_uInt16 nParaSpace = 10;
Size aPaperSz = pOutDev-GetOutputSize();
diff --git a/sw/source/ui/uiview/view0.cxx b/sw/source/ui/uiview/view0.cxx
index 73555a8..891680d 100644
--- a/sw/source/ui/uiview/view0.cxx
+++ b/sw/source/ui/uiview/view0.cxx
@@ -184,7 +184,7 @@ static void lcl_SetViewMetaChars( SwViewOption rVOpt,
sal_Bool bOn)
void SwView::RecheckBrowseMode()
{
-// OS: numerische Reihenfolge beachten!
+// OS: pay attention to numerical order!
static sal_uInt16 const aInva[] =
{
//SID_NEWWINDOW,/*5620*/
@@ -222,9 +222,8 @@ void SwView::RecheckBrowseMode()
InvalidateBorder();
}
-/*
-State of view options
- */
+// State of view options
+
void SwView::StateViewOptions(SfxItemSet rSet)
{
SfxWhichIter aIter(rSet);
@@ -335,9 +334,8 @@ void SwView::StateViewOptions(SfxItemSet rSet)
}
}
-/*
-execute view options
- */
+// execute view options
+
void SwView::ExecViewOptions(SfxRequest rReq)
{
SwViewOption* pOpt = new SwViewOption( *GetWrtShell().GetViewOptions() );
@@ -535,7 +533,7 @@ void SwView::ExecViewOptions(SfxRequest rReq)
return;
}
-// UserPrefs setzen Request als bearbeitet kennzeichnen
+// Set UserPrefs, mark request as modified
sal_Bool bWebView = 0 != dynamic_castconst SwWebView*(this);
SwWrtShell rSh = GetWrtShell();
rSh.StartAction();
@@ -549,13 +547,12 @@ void SwView::ExecViewOptions(SfxRequest rReq)
CheckVisArea();
}
-//Die UsrPref muessen als Modified gekennzeichnet werden.
-//call for initialization
+// The UsrPref must be marked as modified.
+// call for initialization
pModule-GetUsrPref(bWebView);
pModule-CheckSpellChanges( pOpt-IsOnlineSpell(), false, false, false
);
}
-//OS: Modified wieder zuruecksetzen, weil Ansicht/Felder
-// das Doc modified setzt.
+//OS: Set back modified again, because view/fields sets the Doc modified.
if( !bModified )
rSh.ResetModified();
diff --git a/sw/source/ui/uiview/view1.cxx b/sw/source/ui/uiview/view1.cxx
index c736e26..c97a4ae 100644
--- a/sw/source/ui/uiview/view1.cxx
+++ b/sw/source/ui/uiview/view1.cxx
@@ -49,17 +49,16 @@ void SwView::Activate(sal_Bool bMDIActivate)
m_pWrtShell-StartAction();
m_pWrtShell-EndAction( sal_True );
-// aktuelle View anmelden an der DocShell
-// die View bleibt solange an der DocShell
-// aktiv bis Sie zerstoert wird oder durch Activate eine
-// neue gesetzt wird
+// Register the current View at the DocShell.
+// The view remains active at the DocShell until it will
+// be destroyed or by Activate a new one will be set.
SwDocShell* pDocSh = GetDocShell();
if(pDocSh)
pDocSh-SetView(this);
SwModule* pSwMod = SW_MOD();
pSwMod-SetView(this);
-// Dokumentgroesse hat sich geaendert
+// Document size has changed.
if(!bDocSzUpdated)
DocSzChgd(m_aDocSz);
@@ -74,7 +73,7 @@ void SwView::Activate(sal_Bool bMDIActivate)
if ( bMDIActivate )
{
-m_pWrtShell-ShGetFcs(sal_False); // Selektionen sichtbar
+m_pWrtShell-ShGetFcs(sal_False); // Selections visible
if( m_sSwViewData.Len() )
{
@@ -84,14 +83,14 @@ void
Re: LibreOffice Android
Hi, I found this mail on the mailing list. However, I am not deep enough in the topic to provide helpful answers. All I found w.r.t. LibreOffice on Android is the following wiki page: https://wiki.documentfoundation.org/Android Is there any more information / report of progress available? It seems as if there exist some builds on a tinderbox but those are not even in an alpha state. So I would not suggest this to this particular (non-tech) user. If anyone has more information, I can act as translator. Here a translation of the mail: Hello! Unfortunately this is the only mail address I could find. I do not understand what are chats but I would like to tell you something, I hope this mail reaches those who are interested. It is obvious that the development of LibreOffice is currently rather slow... In addition, the plea for funding to the users in spring, for me is a warning sign of a close stagnation of a project. As soon as the developers come up with a cost-benefit thinking, the voluntary enthusiasm is mostly gone... Whatever. As the subject implies I talk about Android. I have a Samsung Galaxy S3 with a multimedia docking station. This thing rocks! Especially, that it can transform into a full PC and move like it in the internet when connected to a TV with Full HD is great! However I am missing my favorite (since Star Office 3.1 under Win3.1) office suite! I have litteraly thousands of documents that I would like to use without a laptop in future. But LibreOffice for Android does not pick up pace to publish a release or a simple installation file. For *me* (I am a physician and have no clue about compiling or programming) it would be enough to have a direct port of the current office suite on android. As far as I heard, this should be closed to being finished. Here is my idea as a enthusiastic Galaxy S3 dock user: Why do you not realize a special Android GUI as a simple extensioin for LibreOffice? One could try to make it like Samsung with its Mulit-Window mode where one can slide in the menu on the left side. It does not seem to hard to implement for me. Simply hide the normal menu bar, create a new one (than can be hidden),... This would have the advantage that in desktop mode all menus would be available, the original code does not need any changes and the menu implementation could be seperated from normal development, so to say in microcosm. As a first version you could have a starting screen where one could choose between the traditional and the Android GUI layout. So far to my idea... Now I have another question: How do I install daily builds? If I try to download the package with Android I get a .txt file which does not do anything. What I am looking for is an APK that I just click and then it installs LibreOffice on Android. Could you please help me? Sorry for writing German but my English is too bad and due to my job my time is limited so that I do not have time for digging for technical terms. This should not be offending! I would be truly grateful not having to carry my laptop with me anymore. Thank you for you attention! Respectfully of your special knowledge in my own cluelessness of the mentioned problems. Bernd --- Am 13. Juni 2013 00:23 schrieb Bernd Brüggemann brueggemannbe...@web.de: I will try my luck in German, because my English is to bad to say Schönen Guten Tag! Dies ist leider die einzige Mail Adresse, die ich finden konnte. Da ich keine Ahnung von chat oder was weiß ich habe, meine Ausführungen aber doch mehr als drei Sätze haben werden, hoffe ich, diese Mail erreicht jemanden, den es interessiert. Es ist nicht zu übersehen, dass es bei Libreoffice im Augenblich ein wenig langsamer vonstatten geht Auch der Aufruf im Frühling an die User, zu spenden, ist für mich immer ein Warnzeichen für den nahen Stillstand eines Projektes. Kommt bei den Programmierern erst der Kosten-Nutzen Gedanke auf, hat sich der ehrenamliche Enthusiasmus meist gelegt Egal. Nach der Überschrift, dreht es sich hier um Android. Ich habe ein Galaxy S3 von Samsung mit Multimedia Dockingstation. Das Teil ist einfach super! Vor allem, dass es plötzlich tatsächlich zum PC mutiert und sich auch so im Internet bewegt und nicht mehr als mobile device ist für einen Full HD Fernseher ganz große Klasse! Was mir noch fehlt ist mein bevorzugtes Office (seit Star Office 3.1 unter Windows 3.1)! Ich habe im wahrsten sinne des Wortes tausende an Dokumenten, die ich gerne in Zukunft ohne Laptop benutzen können möchte. LibreOffice Android kommt aber nicht in die Gänge ein fertiges Release oder eine einfache Installation herauszugeben. MIR würde schon genügen (und ich habe KEINE Ahnung von Compilieren oder Programmierenbin Arzt.), wenn es eine direkte Umsetzung des Office Paketes auf Android gäbe! Diese soll ja angeblich nahezu fertig sein! Nun also die Idee eines begeisterten Galaxy S3 dock Benutzers: warum realisiert man eine spezielle Android
[PUSHED] fdo#39468 Comment translation GER-ENG in sw/source/ui/uiview...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4296 Approvals: Noel Power: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/4296 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I13ebd6c9073af855f34a425cfda247155b634f34 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matthias Freund matti...@yahoo.de Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - drawinglayer/source include/drawinglayer include/svtools include/svx svtools/source svx/source
drawinglayer/source/primitive2d/cropprimitive2d.cxx |2
drawinglayer/source/primitive2d/graphicprimitive2d.cxx | 58 +---
include/drawinglayer/primitive2d/graphicprimitive2d.hxx |3
include/svtools/grfmgr.hxx | 11
include/svx/svdhdl.hxx | 36 ++
svtools/source/graphic/grfmgr.cxx | 107 ++--
svx/source/svdraw/svdhdl.cxx| 203 +++-
svx/source/svdraw/svdmrkv.cxx | 51
svx/source/unodraw/UnoGraphicExporter.cxx |3
9 files changed, 416 insertions(+), 58 deletions(-)
New commits:
commit 3a8dbb63197c5b9298015cbd5b15e607ec9a3705
Author: Armin Le Grand a...@apache.org
Date: Fri May 17 16:29:11 2013 +
Resolves: #i74211# Correct crop of bitmap data when...
logical size and MapMode do not match real pixel size
(cherry picked from commit a24965371f7e881671182bc51432c08cbf667b56)
Conflicts:
svtools/inc/svtools/grfmgr.hxx
svtools/source/graphic/grfmgr.cxx
svx/inc/svx/svdhdl.hxx
svx/inc/svx/svdograf.hxx
svx/source/svdraw/svdhdl.cxx
Change-Id: Icfb9091b55e50081e8daf697c9f00f5b5a10531a
diff --git a/drawinglayer/source/primitive2d/cropprimitive2d.cxx
b/drawinglayer/source/primitive2d/cropprimitive2d.cxx
index 8ce933a..042710c 100644
--- a/drawinglayer/source/primitive2d/cropprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/cropprimitive2d.cxx
@@ -85,7 +85,7 @@ namespace drawinglayer
// with getSmallValue here, the original which uses
rtl::math::approxEqual
// is too correct here. Maybe this changes with enhanced
precision in aw080
// to the better so that this can be reduced to the more
precise call again
-if(basegfx::fTools::equal(fRotate, F_PI, 0.1))
+if(basegfx::fTools::equal(fabs(fRotate), F_PI, 0.1))
{
aScale.setX(aScale.getX() * -1.0);
aScale.setY(aScale.getY() * -1.0);
diff --git a/drawinglayer/source/primitive2d/graphicprimitive2d.cxx
b/drawinglayer/source/primitive2d/graphicprimitive2d.cxx
index 778245ff..df69a36 100644
--- a/drawinglayer/source/primitive2d/graphicprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/graphicprimitive2d.cxx
@@ -85,47 +85,25 @@ namespace drawinglayer
{
// calculate scalings between real image size and
logic object size. This
// is necessary since the crop values are relative to
original bitmap size
-double fFactorX(1.0);
-double fFactorY(1.0);
-
-{
-const MapMode aMapMode100thmm(MAP_100TH_MM);
-Size aBitmapSize(rGraphicObject.GetPrefSize());
-
-// #i95968# better support PrefMapMode; special
for MAP_PIXEL was missing
-if(MAP_PIXEL ==
rGraphicObject.GetPrefMapMode().GetMapUnit())
-{
-aBitmapSize =
Application::GetDefaultDevice()-PixelToLogic(aBitmapSize, aMapMode100thmm);
-}
-else
-{
-aBitmapSize =
Application::GetDefaultDevice()-LogicToLogic(aBitmapSize,
rGraphicObject.GetPrefMapMode(), aMapMode100thmm);
-}
-
-const double fDivX(aBitmapSize.Width() -
getGraphicAttr().GetLeftCrop() - getGraphicAttr().GetRightCrop());
-const double fDivY(aBitmapSize.Height() -
getGraphicAttr().GetTopCrop() - getGraphicAttr().GetBottomCrop());
-const basegfx::B2DVector aScale(aTransform *
basegfx::B2DVector(1.0, 1.0));
-
-if(!basegfx::fTools::equalZero(fDivX))
-{
-fFactorX = fabs(aScale.getX()) / fDivX;
-}
-
-if(!basegfx::fTools::equalZero(fDivY))
-{
-fFactorY = fabs(aScale.getY()) / fDivY;
-}
-}
+const basegfx::B2DVector aObjectScale(aTransform *
basegfx::B2DVector(1.0, 1.0));
+const basegfx::B2DVector aCropScaleFactor(
+rGraphicObject.calculateCropScaling(
+aObjectScale.getX(),
+aObjectScale.getY(),
+getGraphicAttr().GetLeftCrop(),
+getGraphicAttr().GetTopCrop(),
+getGraphicAttr().GetRightCrop(),
+
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - a2/4965371f7e881671182bc51432c08cbf667b56
a2/4965371f7e881671182bc51432c08cbf667b56 |1 + 1 file changed, 1 insertion(+) New commits: commit 77d973b150798de8cbd394013db9041a65a64ce4 Author: Caolán McNamara caol...@redhat.com Date: Mon Jun 17 15:40:24 2013 +0100 Notes added by 'git notes add' diff --git a/a2/4965371f7e881671182bc51432c08cbf667b56 b/a2/4965371f7e881671182bc51432c08cbf667b56 new file mode 100644 index 000..4c49a78 --- /dev/null +++ b/a2/4965371f7e881671182bc51432c08cbf667b56 @@ -0,0 +1 @@ +merged as: 3a8dbb63197c5b9298015cbd5b15e607ec9a3705 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - cd/6db555e6a2b3befc11698fe2a3c443780b6a7d
cd/6db555e6a2b3befc11698fe2a3c443780b6a7d |1 + 1 file changed, 1 insertion(+) New commits: commit 246978549584546d8594d8ad8b05ad69c8e111d4 Author: Caolán McNamara caol...@redhat.com Date: Mon Jun 17 15:57:28 2013 +0100 Notes added by 'git notes add' diff --git a/cd/6db555e6a2b3befc11698fe2a3c443780b6a7d b/cd/6db555e6a2b3befc11698fe2a3c443780b6a7d new file mode 100644 index 000..692ec99 --- /dev/null +++ b/cd/6db555e6a2b3befc11698fe2a3c443780b6a7d @@ -0,0 +1 @@ +merged as: d24f5f8ab835c01908c3ac1fff8dd39a6c1e5112 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/svdraw/svdhdl.cxx | 20 ++-- 1 file changed, 18 insertions(+), 2 deletions(-) New commits: commit d24f5f8ab835c01908c3ac1fff8dd39a6c1e5112 Author: Armin Le Grand a...@apache.org Date: Wed Jun 12 16:56:18 2013 + Related: #i74211# added frame to better see graphic (cherry picked from commit cd6db555e6a2b3befc11698fe2a3c443780b6a7d) Change-Id: I35c3681469c7fec958437de566bfaa15c85266e0 diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx index 323deaf..7058e0c 100644 --- a/svx/source/svdraw/svdhdl.cxx +++ b/svx/source/svdraw/svdhdl.cxx @@ -63,6 +63,7 @@ #include drawinglayer/primitive2d/graphicprimitive2d.hxx #include drawinglayer/primitive2d/maskprimitive2d.hxx #include drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx +#include drawinglayer/primitive2d/polygonprimitive2d.hxx // #i15222# @@ -2455,9 +2456,10 @@ void SdrCropViewHdl::CreateB2dIAObject() aCropped.transform(aBackToUnit); // prepare crop PolyPolygon -basegfx::B2DPolyPolygon aCropPolyPolygon( +basegfx::B2DPolygon aGraphicOutlinePolygon( basegfx::tools::createPolygonFromRect( aCropped)); +basegfx::B2DPolyPolygon aCropPolyPolygon(aGraphicOutlinePolygon); // current range is unit range basegfx::B2DRange aOverlap(0.0, 0.0, 1.0, 1.0); @@ -2473,6 +2475,7 @@ void SdrCropViewHdl::CreateB2dIAObject() // transform to object coordinates to prepare for clip aCropPolyPolygon.transform(maObjectTransform); +aGraphicOutlinePolygon.transform(maObjectTransform); // create cropped transformation basegfx::B2DHomMatrix aCroppedTransform; @@ -2492,11 +2495,24 @@ void SdrCropViewHdl::CreateB2dIAObject() aCroppedTransform, maGraphic)); +// prepare outline polygon for whole graphic +const SvtOptionsDrawinglayer aSvtOptionsDrawinglayer; +const basegfx::BColor aHilightColor(aSvtOptionsDrawinglayer.getHilightColor().getBColor()); +const drawinglayer::primitive2d::Primitive2DReference aGraphicOutline( +new drawinglayer::primitive2d::PolygonHairlinePrimitive2D( +aGraphicOutlinePolygon, +aHilightColor)); + +// combine these +drawinglayer::primitive2d::Primitive2DSequence aCombination(2); +aCombination[0] = aGraphic; +aCombination[1] = aGraphicOutline; + // embed to MaskPrimitive2D const drawinglayer::primitive2d::Primitive2DReference aMaskedGraphic( new drawinglayer::primitive2d::MaskPrimitive2D( aCropPolyPolygon, -drawinglayer::primitive2d::Primitive2DSequence(aGraphic, 1))); +aCombination)); // embed to UnifiedTransparencePrimitive2D const drawinglayer::primitive2d::Primitive2DReference aTransparenceMaskedGraphic( ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] fdo#43460 sc: use isEmpty()
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4316
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/16/4316/1
fdo#43460 sc: use isEmpty()
Change-Id: I062570091ebea0ad30f09b0358ab664a3ff949ef
---
M sc/source/core/data/documen3.cxx
M sc/source/core/data/postit.cxx
M sc/source/core/tool/compiler.cxx
M sc/source/core/tool/dbdata.cxx
M sc/source/core/tool/interpr2.cxx
M sc/source/filter/oox/pagesettings.cxx
M sc/source/filter/oox/querytablebuffer.cxx
M sc/source/filter/xml/XMLStylesExportHelper.cxx
M sc/source/filter/xml/xmlexprt.cxx
M sc/source/filter/xml/xmltabi.cxx
M sc/source/ui/docshell/docsh.cxx
M sc/source/ui/unoobj/chart2uno.cxx
M sc/source/ui/vba/vbafont.cxx
M sc/source/ui/view/dbfunc3.cxx
14 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index 3c20d73..c6ef36a 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -1942,7 +1942,7 @@
aCellStr = GetString(nCol, nRow, nTab);
if (!aCellStr.isEmpty())
{
-if (aTotal.getLength())
+if (!aTotal.isEmpty())
aTotal.append(' ');
aTotal.append(aCellStr);
}
diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index 3c03746..0e0cde3 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -777,13 +777,13 @@
const ScPostIt* pNote = rDoc.GetNotes(rPos.Tab())-findByAddress( rPos );
if( pNote !pNote-IsCaptionShown() )
{
-if( aBuffer.getLength() 0 )
+if( !aBuffer.isEmpty() )
aBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( \n\n )
).append( pNote-GetText() );
pNoteCaption = pNote-GetOrCreateCaption( rPos );
}
// create a caption if any text exists
-if( !pNoteCaption (aBuffer.getLength() == 0) )
+if( !pNoteCaption aBuffer.isEmpty() )
return 0;
// prepare visible rectangle (add default distance to all borders)
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index afd50e1..a726f91 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -5166,7 +5166,7 @@
default:
; // nothing
}
-if ( aBuffer.getLength() )
+if ( !aBuffer.isEmpty() )
rBuffer.append(aBuffer.makeStringAndClear());
else
rBuffer.append(ScGlobal::GetRscString(STR_NO_NAME_REF));
diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx
index 163e6fe..0b60852 100644
--- a/sc/source/core/tool/dbdata.cxx
+++ b/sc/source/core/tool/dbdata.cxx
@@ -234,19 +234,19 @@
if (mpSortParam-maKeyState[0].bDoSort)
{
-if (aBuf.getLength())
+if (!aBuf.isEmpty())
aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM(, ));
aBuf.append(ScGlobal::GetRscString(STR_OPERATION_SORT));
}
if (mpSubTotal-bGroupActive[0] !mpSubTotal-bRemoveOnly)
{
-if (aBuf.getLength())
+if (!aBuf.isEmpty())
aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM(, ));
aBuf.append(ScGlobal::GetRscString(STR_OPERATION_SUBTOTAL));
}
-if (!aBuf.getLength())
+if (aBuf.isEmpty())
aBuf.append(ScGlobal::GetRscString(STR_OPERATION_NONE));
return aBuf.makeStringAndClear();
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index b42cf4d..16d460d 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -3052,7 +3052,7 @@
aText.insert(0, aBlock.makeStringAndClear());
}
-if (aText.getLength() 0)
+if (!aText.isEmpty())
aText.append( RTL_CONSTASCII_STRINGPARAM(UTF8_TH_BAHT) );
// generate text for Satang value
diff --git a/sc/source/filter/oox/pagesettings.cxx
b/sc/source/filter/oox/pagesettings.cxx
index fd90cc5..9e9f941 100644
--- a/sc/source/filter/oox/pagesettings.cxx
+++ b/sc/source/filter/oox/pagesettings.cxx
@@ -786,7 +786,7 @@
void HeaderFooterParser::appendText()
{
-if( maBuffer.getLength() 0 )
+if( !maBuffer.isEmpty() )
{
getEndPos()-gotoEnd( sal_False );
getEndPos()-setString( maBuffer.makeStringAndClear() );
diff --git a/sc/source/filter/oox/querytablebuffer.cxx
b/sc/source/filter/oox/querytablebuffer.cxx
index d80d06d..cf42cc5 100644
--- a/sc/source/filter/oox/querytablebuffer.cxx
+++ b/sc/source/filter/oox/querytablebuffer.cxx
@@ -93,7 +93,7 @@
{
if( !rTableName.isEmpty() )
{
-if( rTables.getLength() 0 )
+if( !rTables.isEmpty() )
rTables.append( sal_Unicode( ';' ) );
rTables.appendAscii( RTL_CONSTASCII_STRINGPARAM( HTML__ ) ).append(
rTableName );
}
@@ -103,7 +103,7 @@
{
if( nTableIndex 0 )
{
-if(
[Libreoffice-commits] core.git: chart2/source
chart2/source/tools/ObjectIdentifier.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit d30df91b1e5ce90826a96e4f494791c0b61b8b7c
Author: Jelle van der Waa je...@vdwaa.nl
Date: Mon Jun 17 16:32:16 2013 +0200
fdo#43460 chart2: use isEmpty()
Change-Id: Ia74923ed8f00adfa3f7758edb4e5755fedb0ec8a
Reviewed-on: https://gerrit.libreoffice.org/4315
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com
diff --git a/chart2/source/tools/ObjectIdentifier.cxx
b/chart2/source/tools/ObjectIdentifier.cxx
index 9dc31b1..2358057 100644
--- a/chart2/source/tools/ObjectIdentifier.cxx
+++ b/chart2/source/tools/ObjectIdentifier.cxx
@@ -1005,7 +1005,7 @@ OUString ObjectIdentifier::addChildParticle( const
OUString rParticle, const OU
{
OUStringBuffer aRet(rParticle);
-if( aRet.getLength() !rChildParticle.isEmpty() )
+if( !aRet.isEmpty() !rChildParticle.isEmpty() )
aRet.appendAscii(:);
if( !rChildParticle.isEmpty() )
aRet.append(rChildParticle);
@@ -1016,7 +1016,7 @@ OUString ObjectIdentifier::addChildParticle( const
OUString rParticle, const OU
OUString ObjectIdentifier::createChildParticleWithIndex( ObjectType
eObjectType, sal_Int32 nIndex )
{
OUStringBuffer aRet( getStringForType( eObjectType ) );
-if( aRet.getLength() )
+if( !aRet.isEmpty() )
{
aRet.appendAscii(=);
aRet.append(OUString::valueOf(nIndex));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] fdo#43460 chart2: use isEmpty()
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4315 Approvals: Noel Power: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/4315 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia74923ed8f00adfa3f7758edb4e5755fedb0ec8a Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Jelle van der Waa je...@vdwaa.nl Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: starmath/source
starmath/source/mathmlimport.cxx | 29 -
1 file changed, 29 deletions(-)
New commits:
commit e2c63c14f0bdea6ba360b2549dced1492b626b67
Author: Marcos Paulo de Souza marcos.souza@gmail.com
Date: Fri Jun 14 08:26:02 2013 -0300
Remove useless attributions in starmath
These values are initialized as 0 in the constructor(see
starmath/source/parse.cxx).
Change-Id: I68508f7f7132a2f43b99da3e7cdef9709fd62598
Reviewed-on: https://gerrit.libreoffice.org/4282
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index b5f0529..4d1f95e 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -719,7 +719,6 @@ void SmXMLContext_Helper::ApplyAttrs()
{
SmToken aToken;
aToken.cMathChar = '\0';
-aToken.nGroup = 0;
aToken.nLevel = 5;
if (nIsBold != -1)
@@ -960,7 +959,6 @@ void SmXMLPhantomContext_Impl::EndElement()
SmToken aToken;
aToken.cMathChar = '\0';
-aToken.nGroup = 0;
aToken.nLevel = 5;
aToken.eType = TPHANTOM;
@@ -1024,7 +1022,6 @@ void SmXMLFencedContext_Impl::EndElement()
{
SmToken aToken;
aToken.cMathChar = '\0';
-aToken.nGroup = 0;
aToken.aText = ,;
aToken.eType = TLEFT;
aToken.nLevel = 5;
@@ -1110,7 +1107,6 @@ public:
: SmXMLImportContext(rImport,nPrefix,rLName)
{
aToken.cMathChar = '\0';
-aToken.nGroup = 0;
aToken.nLevel = 5;
aToken.eType = TNUMBER;
}
@@ -1190,7 +1186,6 @@ public:
: SmXMLImportContext(rImport,nPrefix,rLName)
{
aToken.cMathChar = '\0';
-aToken.nGroup = 0;
aToken.nLevel = 5;
aToken.eType = TTEXT;
}
@@ -1223,7 +1218,6 @@ public:
: SmXMLImportContext(rImport,nPrefix,rLName)
{
aToken.cMathChar = '\0';
-aToken.nGroup = 0;
aToken.nLevel = 5;
aToken.eType = TTEXT;
}
@@ -1267,7 +1261,6 @@ public:
: SmXMLImportContext(rImport,nPrefix,rLName),aStyleHelper(*this)
{
aToken.cMathChar = '\0';
-aToken.nGroup = 0;
aToken.nLevel = 5;
aToken.eType = TIDENT;
}
@@ -1332,7 +1325,6 @@ public:
const OUString rLName)
: SmXMLImportContext(rImport,nPrefix,rLName), bIsStretchy(sal_False)
{
-aToken.nGroup = 0;
aToken.eType = TSPECIAL;
aToken.nLevel = 5;
}
@@ -1404,7 +1396,6 @@ void SmXMLSpaceContext_Impl::StartElement(
{
SmToken aToken;
aToken.cMathChar = '\0';
-aToken.nGroup = 0;
aToken.eType = TBLANK;
aToken.nLevel = 5;
SmBlankNode *pBlank = new SmBlankNode(aToken);
@@ -1441,8 +1432,6 @@ void SmXMLSubContext_Impl::GenericEndElement(SmTokenType
eType, SmSubSup eSubSup
SmToken aToken;
aToken.cMathChar = '\0';
-aToken.nGroup = 0;
-aToken.nLevel = 0;
aToken.eType = eType;
SmSubSupNode *pNode = new SmSubSupNode(aToken);
SmNodeStack rNodeStack = GetSmImport().GetNodeStack();
@@ -1503,8 +1492,6 @@ void
SmXMLSubSupContext_Impl::GenericEndElement(SmTokenType eType,
SmToken aToken;
aToken.cMathChar = '\0';
-aToken.nGroup = 0;
-aToken.nLevel = 0;
aToken.eType = eType;
SmSubSupNode *pNode = new SmSubSupNode(aToken);
SmNodeStack rNodeStack = GetSmImport().GetNodeStack();
@@ -1557,8 +1544,6 @@ void SmXMLUnderContext_Impl::HandleAccent()
SmNode *pTest = lcl_popOrZero(rNodeStack);
SmToken aToken;
aToken.cMathChar = '\0';
-aToken.nGroup = 0;
-aToken.nLevel = 0;
aToken.eType = TUNDERLINE;
@@ -1632,8 +1617,6 @@ void SmXMLOverContext_Impl::HandleAccent()
SmToken aToken;
aToken.cMathChar = '\0';
-aToken.nGroup = 0;
-aToken.nLevel = 0;
aToken.eType = TACUTE;
SmAttributNode *pNode = new SmAttributNode(aToken);
@@ -1701,7 +1684,6 @@ void SmXMLNoneContext_Impl::EndElement(void)
{
SmToken aToken;
aToken.cMathChar = '\0';
-aToken.nGroup = 0;
aToken.aText = ;
aToken.nLevel = 5;
aToken.eType = TIDENT;
@@ -2184,8 +2166,6 @@ void SmXMLFracContext_Impl::EndElement()
SmToken aToken;
aToken.cMathChar = '\0';
-aToken.nGroup = 0;
-aToken.nLevel = 0;
aToken.eType = TOVER;
SmStructureNode *pSNode = new SmBinVerNode(aToken);
SmNode *pOper = new SmRectangleNode(aToken);
@@ -2205,8 +2185,6 @@ void SmXMLRootContext_Impl::EndElement()
SmToken aToken;
aToken.cMathChar = MS_SQRT; //Temporary: alert, based on StarSymbol font
-aToken.nGroup = 0;
-aToken.nLevel = 0;
aToken.eType = TNROOT;
SmStructureNode *pSNode = new SmRootNode(aToken);
SmNode *pOper = new SmRootSymbolNode(aToken);
@@ -2229,8 +2207,6 @@ void SmXMLSqrtContext_Impl::EndElement()
SmToken aToken;
aToken.cMathChar = MS_SQRT; //Temporary: alert,
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 65/dd87d8f010a9c9d1b277f9b1839378b549d06f
65/dd87d8f010a9c9d1b277f9b1839378b549d06f |1 + 1 file changed, 1 insertion(+) New commits: commit 141bc8e6f6f8c7b82ca1065796891115bf816d6d Author: Caolán McNamara caol...@redhat.com Date: Mon Jun 17 16:14:25 2013 +0100 Notes added by 'git notes add' diff --git a/65/dd87d8f010a9c9d1b277f9b1839378b549d06f b/65/dd87d8f010a9c9d1b277f9b1839378b549d06f new file mode 100644 index 000..2ac0aa9 --- /dev/null +++ b/65/dd87d8f010a9c9d1b277f9b1839378b549d06f @@ -0,0 +1 @@ +merged as: 20e1181461adaae3289a5ef943ec5c4b75cc1570 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Remove useless attributions in starmath
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4282 Approvals: Noel Power: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/4282 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I68508f7f7132a2f43b99da3e7cdef9709fd62598 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: svtools/source
svtools/source/misc/transfer.cxx |8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 20e1181461adaae3289a5ef943ec5c4b75cc1570
Author: Armin Le Grand a...@apache.org
Date: Wed May 29 16:15:37 2013 +
Resolves: #i122388# Corrected old fix to mentioned bounds
(cherry picked from commit 65dd87d8f010a9c9d1b277f9b1839378b549d06f)
Change-Id: I01318b3f96b23196f54335782ef9c946bf2b1ef9
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index 8407e19..0f9c540 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -1777,9 +1777,15 @@ sal_Bool TransferableDataHelper::GetBitmapEx( const
DataFlavor rFlavor, BitmapE
{
const Size
aSize(OutputDevice::LogicToLogic(rBmpEx.GetPrefSize(), aMapMode, MAP_100TH_MM));
-if((aSize.Width() 5000) || (aSize.Height() 5000))
+// #i122388# This wrongly corrects in the given case; changing
from 5000 100th mm to
+// the described 50 cm (which is 5 100th mm)
+if((aSize.Width() 5) || (aSize.Height() 5))
{
rBmpEx.SetPrefMapMode(MAP_PIXEL);
+
+// #i122388# also adapt size by applying the mew MapMode
+const Size aNewSize(OutputDevice::LogicToLogic(aSize,
MAP_100TH_MM, MAP_PIXEL));
+rBmpEx.SetPrefSize(aNewSize);
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] fdo#43460 configmgr: use isEmpty()
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4317
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/17/4317/1
fdo#43460 configmgr: use isEmpty()
Change-Id: Ifab7cef3e883bc10632ac280ca382b2c68bc79e1
---
M configmgr/source/access.cxx
M configmgr/source/childaccess.cxx
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/configmgr/source/access.cxx b/configmgr/source/access.cxx
index 9f18e8f..1219f37 100644
--- a/configmgr/source/access.cxx
+++ b/configmgr/source/access.cxx
@@ -571,7 +571,7 @@
path.append(root-getAbsolutePathRepresentation());
}
OUString rel(getRelativePathRepresentation());
-if (path.getLength() != 0 !rel.isEmpty()) {
+if (!path.isEmpty() !rel.isEmpty()) {
path.append(sal_Unicode('/'));
}
path.append(rel);
@@ -594,7 +594,7 @@
static_cast cppu::OWeakObject * (this), -1);
}
OUStringBuffer path(getRelativePathRepresentation());
-if (path.getLength() != 0) {
+if (!path.isEmpty()) {
path.append(sal_Unicode('/'));
}
path.append(aRelativeName);
@@ -1873,7 +1873,7 @@
}
if (allChanges != 0) {
OUStringBuffer path(getRelativePathRepresentation());
-if (path.getLength() != 0) {
+if (!path.isEmpty()) {
path.append(sal_Unicode('/'));
}
path.append(
@@ -1935,7 +1935,7 @@
if (allChanges != 0) {
OUStringBuffer path(
getRelativePathRepresentation());
-if (path.getLength() != 0) {
+if (!path.isEmpty()) {
path.append(sal_Unicode('/'));
}
path.append(i-first);
@@ -1972,7 +1972,7 @@
if (allChanges != 0) {
OUStringBuffer path(
getRelativePathRepresentation());
-if (path.getLength() != 0) {
+if (!path.isEmpty()) {
path.append(sal_Unicode('/'));
}
path.append(
diff --git a/configmgr/source/childaccess.cxx b/configmgr/source/childaccess.cxx
index 587f59b..b5a34ef 100644
--- a/configmgr/source/childaccess.cxx
+++ b/configmgr/source/childaccess.cxx
@@ -113,7 +113,7 @@
rtl::Reference Access parent(getParentAccess());
if (parent.is()) {
path.append(parent-getRelativePathRepresentation());
-if (path.getLength() != 0) {
+if (!path.isEmpty()) {
path.append(sal_Unicode('/'));
}
}
--
To view, visit https://gerrit.libreoffice.org/4317
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifab7cef3e883bc10632ac280ca382b2c68bc79e1
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Jelle van der Waa je...@vdwaa.nl
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: solenv/bin
solenv/bin/fix-includes.pl | 95 +
1 file changed, 95 insertions(+)
New commits:
commit 4086aec2f945e312d18b76a21683cbc0393a3e57
Author: Jelle van der Waa je...@vdwaa.nl
Date: Sun Jun 16 13:39:47 2013 +0200
fdo#65108 clean-up headers(global/local) perl script
Change-Id: I5f17a33bcd735b4655d350ce8ec2dd069e215a4b
Reviewed-on: https://gerrit.libreoffice.org/4306
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com
diff --git a/solenv/bin/fix-includes.pl b/solenv/bin/fix-includes.pl
new file mode 100755
index 000..6460ad2
--- /dev/null
+++ b/solenv/bin/fix-includes.pl
@@ -0,0 +1,95 @@
+#!/usr/bin/perl
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#
+# fix-includes, a simple script replace local includes which should be global
+# , to global includes. And global includes which should be local, to local
includes.
+# The script is expected to run in the root of the git repo, so it can fetch
all the include directory's.
+#
+use strict;
+use warnings;
+use File::Basename;
+use File::Find;
+use IO::All;
+
+my $dirname = include;
+
+# Fetch the list of includes
+my @subdirs = map {basename $_} grep {-d} glob($dirname/*);
+
+# Add boost
+push(@subdirs,boost);
+
+# Simple function to check and replace headers
+sub check_headers
+{
+ my ($dir,$file, @includes) = @_;
+ open(my $fh,+,$file) or die Couldn't open file $file $!\n;
+ my @content = $fh;
+ my $line;
+
+ # seek to the first line, so we can replace then lines correctly
+ seek $fh,0,0;
+ foreach $line (@content){
+if($line =~ m/#include (\w*)\//){
+ # If a include is local and it should be global, make it global
+ if($1 ~~ @includes){
+print local header $line\n;
+$line =~ s///;
+$line =~ s///;
+print $fh $line;
+print converted to global header $line\n;
+ }
+ else {
+ print $fh $line;
+ }
+}
+# If a local file is defined global, make it local
+elsif($line =~ /#include ((\w*)\.(hxx|h))/){
+ # check if file exists, then it must be local so replace the to
+ if(-e $dir/$1 ){
+print global header $line\n;
+$line =~ s///g;
+$line =~ s///g;
+print $fh $line;
+print converted to local header $line\n;
+ }
+ else {
+print $fh $line;
+ }
+}
+else {
+ print $fh $line;
+}
+ }
+ close($fh);
+}
+
+# routine that checks the headers of every cxx,hxx,c,h file in a directory
+sub check_routine
+{
+ my ($dir) = @_;
+ opendir(my $fh, $dir) or die Program stopping, could't open directory \n;
+ while(my $file = readdir($fh)){
+if($file =~ m/\.(cxx|hxx|c|h)$/i ){
+ check_headers($dir,$dir/$file,@subdirs);
+}
+ }
+ closedir($fh);
+}
+
+# Expect ARGV[0] to be a directory, then fetch all subdirectory's and check
the header files.
+if(-d $ARGV[0]){
+ my @directories = io-dir($ARGV[0])-All_Dirs;
+ foreach my $dir (@directories){
+print checking header files in $dir\n;
+check_routine($dir);
+ }
+}
+else{
+ print $ARGV[0] isn't a directory\n;
+}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 30/5986a4ee0f1294d629c51c75d8f793b5b80e1d
30/5986a4ee0f1294d629c51c75d8f793b5b80e1d |1 + 1 file changed, 1 insertion(+) New commits: commit ea07a8deb4d4eb082534a241c794d9d0143d2f1c Author: Caolán McNamara caol...@redhat.com Date: Mon Jun 17 16:23:22 2013 +0100 Notes added by 'git notes add' diff --git a/30/5986a4ee0f1294d629c51c75d8f793b5b80e1d b/30/5986a4ee0f1294d629c51c75d8f793b5b80e1d new file mode 100644 index 000..f73d4a5 --- /dev/null +++ b/30/5986a4ee0f1294d629c51c75d8f793b5b80e1d @@ -0,0 +1 @@ +merged as: af04930d1513f1274e8a69b96e6941ca43cfc901 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/filter/oox/pivottablebuffer.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit af04930d1513f1274e8a69b96e6941ca43cfc901
Author: Jian Fang Zhang zhan...@apache.org
Date: Wed Sep 12 10:33:44 2012 +
Resolves: #i119512# selection lost if there is blank item selected...
in page filed of Pivot Table
Found by: shan zhu
Patch by: bjcheny
Review by: Yolanda Zhang Ying
(cherry picked from commit 305986a4ee0f1294d629c51c75d8f793b5b80e1d)
Conflicts:
oox/source/xls/pivottablebuffer.cxx
Change-Id: Ied8ca19738e9b2e7bb596010f7ae9e308792fcbc
diff --git a/sc/source/filter/oox/pivottablebuffer.cxx
b/sc/source/filter/oox/pivottablebuffer.cxx
index 6303a05..2a1582b 100644
--- a/sc/source/filter/oox/pivottablebuffer.cxx
+++ b/sc/source/filter/oox/pivottablebuffer.cxx
@@ -578,8 +578,7 @@ void PivotTableField::convertPageField( const
PTPageFieldModel rPageField )
if( const PivotCacheItem* pSharedItem =
pCacheField-getCacheItem( nCacheItem ) )
{
OUString aSelectedPage = pSharedItem-getName();
-if( !aSelectedPage.isEmpty() )
-aPropSet.setProperty( PROP_SelectedPage, aSelectedPage
);
+aPropSet.setProperty( PROP_SelectedPage, aSelectedPage );
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] fdo#65108 clean-up headers(global/local) perl script
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4306 Approvals: Noel Power: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/4306 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5f17a33bcd735b4655d350ce8ec2dd069e215a4b Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Jelle van der Waa je...@vdwaa.nl Gerrit-Reviewer: Matúš Kukan matus.ku...@gmail.com Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH][RESOLVED] Stop disabling graphite on non-WINNT and non-Linux platforms
On Wed, 2013-01-02 at 13:22 +0100, Francois Tigeot wrote: configure.ac checks if the operating system family is Linux or WINNT and refuses to enable graphite support if this is not the case. I'm using graphite on DragonFly and FreeBSD ports also enable it with a local patch; the Linux or WINNT check should be removed. Patch vs -master attached. resolved by fdd6008def896b5f1f7448553bd2985e6252ed60 and various follow up patches. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] help.git: Changes to 'refs/tags/suse-4.0-5'
Tag 'suse-4.0-5' created by Fridrich Å trba fridrich.st...@bluewin.ch at 2013-06-17 15:24 -0700 Tag suse-4.0-5 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.19 (GNU/Linux) iEYEABECAAYFAlG/HDgACgkQu9a1imXPdA8ctgCfdgSiixkO1K4XiY6JY8a5mW/u gEAAnjYhfQmTS9zf3nsiwGbdnCKq9js9 =kAHy -END PGP SIGNATURE- Changes since suse-4.0-3-1: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/suse-4.0-5'
Tag 'suse-4.0-5' created by Fridrich Å trba fridrich.st...@bluewin.ch at 2013-06-17 15:23 -0700 Tag suse-4.0-5 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.19 (GNU/Linux) iEYEABECAAYFAlG/G/4ACgkQu9a1imXPdA94OACfSAqw61zUUfJliz3z585f65cC 7qEAnjD+bY+bnX50KVGWH+5CARnIPuNW =RDyf -END PGP SIGNATURE- Changes since suse-4.0-3-1: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Branch 'distro/suse/suse-4.0.3' -
0 files changed New commits: commit 89139d63196fbbff3074d9e36dfaa52f50c8cada Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Mon Jun 17 16:22:49 2013 +0200 Release SUSE 4.0-5, build id 305, Linux version 4.0.3.3.5, tag suse-4.0-5 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0.3' - 2 commits - helpcontent2 translations
helpcontent2 |2 +- translations |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 2ba8dac1687b10f49f21c3e7852541f6276407d5 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Mon Jun 17 16:22:49 2013 +0200 Updated core Project: translations 89139d63196fbbff3074d9e36dfaa52f50c8cada diff --git a/translations b/translations index b6633ed..89139d6 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit b6633ed61b72b0f81b2a0d574eedfa0d8479832d +Subproject commit 89139d63196fbbff3074d9e36dfaa52f50c8cada commit dd2ccedc71063053011e27df91a6cc82035bd27a Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Mon Jun 17 16:24:49 2013 +0200 Updated core Project: help 196c039db387f367c7cb56e820bcf9af45ee0f12 diff --git a/helpcontent2 b/helpcontent2 index 3d4c459..196c039 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 3d4c4595c7e922ac7327829aeaf0ebff258df60e +Subproject commit 196c039db387f367c7cb56e820bcf9af45ee0f12 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Branch 'distro/suse/suse-4.0.3' -
0 files changed New commits: commit 196c039db387f367c7cb56e820bcf9af45ee0f12 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Mon Jun 17 16:24:49 2013 +0200 Release SUSE 4.0-5, build id 305, Linux version 4.0.3.3.5, tag suse-4.0-5 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] fdo#43460 startmath,codemaker: use isEmpty()
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4318
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/18/4318/1
fdo#43460 startmath,codemaker: use isEmpty()
Change-Id: I55d3f4546f40a321ebf4b08db33536592f451944
---
M codemaker/source/codemaker/global.cxx
M starmath/inc/visitors.hxx
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/codemaker/source/codemaker/global.cxx
b/codemaker/source/codemaker/global.cxx
index 4324cb6..645fd06 100644
--- a/codemaker/source/codemaker/global.cxx
+++ b/codemaker/source/codemaker/global.cxx
@@ -135,7 +135,7 @@
if( nIndex == -1 )
break;
-if (buffer.getLength() == 0 || OString(.) == buffer.getStr())
+if (buffer.isEmpty() || OString(.) == buffer.getStr())
{
buffer.append(token);
continue;
diff --git a/starmath/inc/visitors.hxx b/starmath/inc/visitors.hxx
index d864c45..ef21763 100644
--- a/starmath/inc/visitors.hxx
+++ b/starmath/inc/visitors.hxx
@@ -477,7 +477,7 @@
}
/** Append a blank for separation, if needed */
inline void Separate( ){
-if( !aCmdText.getLength() || aCmdText[ aCmdText.getLength() - 1 ] != '
' )
+if( aCmdText.isEmpty() || aCmdText[ aCmdText.getLength() - 1 ] != ' ' )
aCmdText.append(' ');
}
/** Output text generated from the pNodes */
--
To view, visit https://gerrit.libreoffice.org/4318
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I55d3f4546f40a321ebf4b08db33536592f451944
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Jelle van der Waa je...@vdwaa.nl
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: LibreOffice Gerrit News 2013-06-17
Hi all, Le Mon, 17 Jun 2013 14:37:28 +0200, Tommy ba...@quipo.it a écrit: On Mon, 17 Jun 2013 13:52:05 +0200, Khaled Hosny khaledho...@eglug.org wrote: I'm not sure if it is only me, but those messages are hard to read, can we have new lines between different items (i.e. after the in https://; line)? or any other way to make it easier to tell which line belongs to which description? Regards, Khaled I agree.. could be that list be formatted from actual: fontsizedialog.ui widget in https://gerrit.libreoffice.org/4312 from Manal Alhassoun Migrate CheckFields unit test to python in https://gerrit.libreoffice.org/4294 from David Ostrovsky replace ShapeList::getNextShape with STL like iterator. in https://gerrit.libreoffice.org/4191 from mhofmann etc. etc to something like this: fontsizedialog.ui widget in https://gerrit.libreoffice.org/4312 from Manal Alhassoun Migrate CheckFields unit test to python in https://gerrit.libreoffice.org/4294 from David Ostrovsky replace ShapeList::getNextShape with STL like iterator. in https://gerrit.libreoffice.org/4191 from mhofmann etc. etc To avoid having still more lines to scroll, could we get a consensus on itemizing ? Something like + fontsizedialog.ui widget in https://gerrit.libreoffice.org/4312 from Manal Alhassoun + Migrate CheckFields unit test to python in https://gerrit.libreoffice.org/4294 from David Ostrovsky + replace ShapeList::getNextShape with STL like iterator. in https://gerrit.libreoffice.org/4191 from mhofmann which cancels doubt of block start and keep us on a not so long mail. IMHO some kind of separators would help readability of such long lists We could have separator for categories, btw. I t will help separating full mail into major blocks. HTH -- Mat M ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
