[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Bug 6 depends on bug 52399, which changed state. Bug 52399 Summary: EDITING: Report-Builder does not show any properties https://bugs.freedesktop.org/show_bug.cgi?id=52399 What|Old Value |New Value Resolution||FIXED Status|NEW |RESOLVED -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Roman Eisele b...@eikota.de changed: What|Removed |Added Depends on||34467 --- Comment #350 from Roman Eisele b...@eikota.de 2012-07-25 06:38:55 UTC --- Bug 34467 - FORMATTING Fit to Frame for text boxes is broken should be removed from LibreOffice 3.6 most annoying bugs (bug 6) and added here, because this bug goes back to LibreOffice 3.3.0. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Roman Eisele b...@eikota.de changed: What|Removed |Added Depends on|34467 | --- Comment #54 from Roman Eisele b...@eikota.de 2012-07-25 06:40:51 PDT --- Bug 34467 - FORMATTING Fit to Frame for text boxes is broken removed here and added to LibreOffice 3.5 most annoying bugs (bug 37361) instead, because this bug goes back to LibreOffice 3.3.0. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 --- Comment #55 from Roman Eisele b...@eikota.de 2012-07-25 06:48:55 PDT --- Bug 52433 -- writer memory eater file leading to crash (images related) -- is alreay reproducible in LibreOffice 3.5.x and also listed on the LibreOffice 3.5 most annoying bugs list (bug 37361). Therefore removed it from the present list, which is about 3.6; a bug should be included only in one of our most annoying bugs lists, that is to say, in the best fitting one. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Roman Eisele b...@eikota.de changed: What|Removed |Added Depends on|52433 | -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#47164: Start Center: Recent Documents picker can not be reached right third of separate button area
Patch #2, think this one is much cleaner. Feel free to comment, next patch I'll submit through gerrit, late and didn't want to learn about it at midnight ;) Joel 0001-fdo-47164-Increased-size-of-hotspot-box-for-recent-d.patch Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: basctl/source
basctl/source/basicide/baside2.cxx | 42 ++--
basctl/source/basicide/baside2.hxx | 18 +++
basctl/source/basicide/baside3.cxx | 15 ++--
basctl/source/basicide/basides1.cxx |4 +--
basctl/source/inc/baside3.hxx |4 +--
basctl/source/inc/basidesh.hxx |2 -
6 files changed, 42 insertions(+), 43 deletions(-)
New commits:
commit 264ff0e6e4ed386916b6e0ad20f0fa818d53
Author: Takeshi Abe t...@fixedpoint.jp
Date: Tue Jul 24 17:46:32 2012 +0900
sal_Bool - bool
Change-Id: I009a55e1e399198aef8e5ad3f43230b0aea0b6fe
diff --git a/basctl/source/basicide/baside2.cxx
b/basctl/source/basicide/baside2.cxx
index 579b706..2be8005 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -417,10 +417,10 @@ void ModulWindow::BasicStop()
aStatus.bIsRunning = false;
}
-sal_Bool ModulWindow::LoadBasic()
+bool ModulWindow::LoadBasic()
{
DBG_CHKTHIS( ModulWindow, 0 );
-sal_Bool bDone = sal_False;
+bool bDone = false;
Reference lang::XMultiServiceFactory xMSF(
::comphelper::getProcessServiceFactory() );
Reference XFilePicker xFP;
@@ -462,7 +462,7 @@ sal_Bool ModulWindow::LoadBasic()
if ( nError )
ErrorHandler::HandleError( nError );
else
-bDone = sal_True;
+bDone = true;
}
else
ErrorBox( this, WB_OK | WB_DEF_OK, IDE_RESSTR(RID_STR_COULDNTREAD)
).Execute();
@@ -471,10 +471,10 @@ sal_Bool ModulWindow::LoadBasic()
}
-sal_Bool ModulWindow::SaveBasicSource()
+bool ModulWindow::SaveBasicSource()
{
DBG_CHKTHIS( ModulWindow, 0 );
-sal_Bool bDone = sal_False;
+bool bDone = false;
Reference lang::XMultiServiceFactory xMSF(
::comphelper::getProcessServiceFactory() );
Reference XFilePicker xFP;
@@ -517,7 +517,7 @@ sal_Bool ModulWindow::SaveBasicSource()
if ( nError )
ErrorHandler::HandleError( nError );
else
-bDone = sal_True;
+bDone = true;
}
else
ErrorBox( this, WB_OK | WB_DEF_OK, String( IDEResId(
RID_STR_COULDNTWRITE) ) ).Execute();
@@ -526,27 +526,27 @@ sal_Bool ModulWindow::SaveBasicSource()
return bDone;
}
-sal_Bool implImportDialog( Window* pWin, const ::rtl::OUString rCurPath,
const ScriptDocument rDocument, const ::rtl::OUString aLibName );
+bool implImportDialog( Window* pWin, const ::rtl::OUString rCurPath, const
ScriptDocument rDocument, const ::rtl::OUString aLibName );
-sal_Bool ModulWindow::ImportDialog()
+bool ModulWindow::ImportDialog()
{
const ScriptDocument rDocument = GetDocument();
::rtl::OUString aLibName = GetLibName();
return implImportDialog( this, aCurPath, rDocument, aLibName );
}
-sal_Bool ModulWindow::ToggleBreakPoint( sal_uLong nLine )
+bool ModulWindow::ToggleBreakPoint( sal_uLong nLine )
{
DBG_ASSERT( XModule().Is(), Kein Modul! );
-sal_Bool bNewBreakPoint = sal_False;
+bool bNewBreakPoint = false;
if ( XModule().Is() )
{
CheckCompileBasic();
if ( aStatus.bError )
{
-return sal_False;
+return false;
}
BreakPoint* pBrk = GetBreakPoints().FindBreakPoint( nLine );
@@ -560,7 +560,7 @@ sal_Bool ModulWindow::ToggleBreakPoint( sal_uLong nLine )
if ( xModule-SetBP( (sal_uInt16)nLine) )
{
GetBreakPoints().InsertSorted( new BreakPoint( nLine ) );
-bNewBreakPoint = sal_True;
+bNewBreakPoint = true;
if ( StarBASIC::IsRunning() )
{
for ( sal_uInt16 nMethod = 0; nMethod
xModule-GetMethods()-Count(); nMethod++ )
@@ -593,7 +593,7 @@ void ModulWindow::UpdateBreakPoint( const BreakPoint rBrk )
}
-sal_Bool ModulWindow::BasicToggleBreakPoint()
+bool ModulWindow::BasicToggleBreakPoint()
{
DBG_CHKTHIS( ModulWindow, 0 );
AssertValidEditEngine();
@@ -602,12 +602,12 @@ sal_Bool ModulWindow::BasicToggleBreakPoint()
aSel.GetStart().GetPara()++;// Basic lines start at 1!
aSel.GetEnd().GetPara()++;
-sal_Bool bNewBreakPoint = sal_False;
+bool bNewBreakPoint = false;
for ( sal_uLong nLine = aSel.GetStart().GetPara(); nLine =
aSel.GetEnd().GetPara(); nLine++ )
{
if ( ToggleBreakPoint( nLine ) )
-bNewBreakPoint = sal_True;
+bNewBreakPoint = true;
}
aXEditorWindow.GetBrkWindow().Invalidate();
@@ -1184,7 +1184,7 @@ void ModulWindow::FrameWindowMoved()
-void ModulWindow::ShowCursor( sal_Bool bOn )
+void ModulWindow::ShowCursor( bool bOn )
{
if ( GetEditEngine() )
{
@@ -1217,7 +1217,7 @@ void ModulWindow::Deactivating()
GetEditView()-EraseVirtualDevice();
}
-sal_uInt16 ModulWindow::StartSearchAndReplace( const SvxSearchItem
rSearchItem, sal_Bool
[PATCH] fdo#40152: replace with empty string in Basic IDE
This patch solves https://bugs.freedesktop.org/show_bug.cgi?id=40152 .
Uray M. János
From d10f4ddea22d332fee1a642d076bbce25ac4b10a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Uray=20M.=20J=C3=A1nos?= uray.ja...@gmail.com
Date: Wed, 25 Jul 2012 09:42:12 +0200
Subject: [PATCH] fdo#40152 replace with empty string in Basic IDE
Change-Id: I2ee41160e5cb10694ccdb5a1cdaf7d4abfeb23bb
---
svtools/source/edit/textview.cxx |4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/svtools/source/edit/textview.cxx b/svtools/source/edit/textview.cxx
index 1b62541..5d6d988 100644
--- a/svtools/source/edit/textview.cxx
+++ b/svtools/source/edit/textview.cxx
@@ -1369,7 +1369,7 @@ void TextView::InsertNewText( const rtl::OUString rStr, sal_Bool bSelect )
*/
sal_Int32 nLen = rStr.getLength();
sal_Int32 nPos = 0;
-while( nLen )
+do
{
sal_Int32 nChunkLen = nLen 65534 ? 65534 : nLen;
String aChunk( rStr.copy( nPos, nChunkLen ) );
@@ -1392,6 +1392,8 @@ void TextView::InsertNewText( const rtl::OUString rStr, sal_Bool bSelect )
nLen -= nChunkLen;
nPos += nChunkLen;
}
+while( nLen );
+
mpImpl-mpTextEngine-UndoActionEnd();
mpImpl-mpTextEngine-FormatAndUpdate( this );
--
1.7.7
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: writerfilter/source
writerfilter/source/rtftok/README | 12
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 14 +-
writerfilter/source/rtftok/rtfdocumentimpl.hxx |4
3 files changed, 29 insertions(+), 1 deletion(-)
New commits:
commit 97adf176987e86c8b2ade9e3886cfcdad405f732
Author: Miklos Vajna vmik...@suse.cz
Date: Wed Jul 25 09:45:27 2012 +0200
import RTF_M{SEPCHR,EQARR,BOX,GROW}
Change-Id: Idbd5ea29b886d94b456b126de00a02833f7c0d7c
diff --git a/writerfilter/source/rtftok/README
b/writerfilter/source/rtftok/README
new file mode 100644
index 000..e77c05f
--- /dev/null
+++ b/writerfilter/source/rtftok/README
@@ -0,0 +1,12 @@
+= Writerfilter-based RTF tokenizer
+
+== Mathematics
+
+At the time of writing, all control words understood by SmOoxmlImport are
+imported. To view the current status:
+
+
+grep M_TOKEN starmath/source/ooxmlimport.cxx |sed
's/.*\(M_TOKEN(\)/\1/;s/).*/)/'|sort -u ~/math-import-list
+grep '[^_]M_TOKEN' writerfilter/source/rtftok/rtfdocumentimpl.cxx |sed
's/.*\(M_TOKEN(\)/\1/;s/).*/)/'|sort -u ~/wf-export-list
+diff -u ~/math-import-list ~/wf-export-list |grep ^-M_TOKEN
+
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 6e2a886..3b0c4b4 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -962,10 +962,12 @@ void RTFDocumentImpl::text(OUString rString)
case DESTINATION_MSTRIKEH:
case DESTINATION_MDEGHIDE:
case DESTINATION_MBEGCHR:
+case DESTINATION_MSEPCHR:
case DESTINATION_MENDCHR:
case DESTINATION_MSUBHIDE:
case DESTINATION_MSUPHIDE:
case DESTINATION_MTYPE:
+case DESTINATION_MGROW:
m_aStates.top().aDestinationText.append(rString);
break;
case DESTINATION_EQINSTRUCTION:
@@ -1424,6 +1426,7 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword
nKeyword)
case RTF_MSTRIKEH: m_aStates.top().nDestinationState =
DESTINATION_MSTRIKEH; break;
case RTF_MDEGHIDE: m_aStates.top().nDestinationState =
DESTINATION_MDEGHIDE; break;
case RTF_MTYPE: m_aStates.top().nDestinationState = DESTINATION_MTYPE;
break;
+case RTF_MGROW: m_aStates.top().nDestinationState = DESTINATION_MGROW;
break;
case RTF_MHIDETOP:
case RTF_MHIDEBOT:
case RTF_MHIDELEFT:
@@ -1434,6 +1437,7 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword
nKeyword)
case RTF_MSUBHIDE: m_aStates.top().nDestinationState =
DESTINATION_MSUBHIDE; break;
case RTF_MSUPHIDE: m_aStates.top().nDestinationState =
DESTINATION_MSUPHIDE; break;
case RTF_MBEGCHR: m_aStates.top().nDestinationState =
DESTINATION_MBEGCHR; break;
+case RTF_MSEPCHR: m_aStates.top().nDestinationState =
DESTINATION_MSEPCHR; break;
case RTF_MENDCHR: m_aStates.top().nDestinationState =
DESTINATION_MENDCHR; break;
OPEN_M_TOKEN(OMATH, oMath);
OPEN_M_TOKEN(F, f);
@@ -1478,6 +1482,8 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword
nKeyword)
OPEN_M_TOKEN(SSUBSUPPR, sSubSupPr);
OPEN_M_TOKEN(SPRE, sPre);
OPEN_M_TOKEN(SPREPR, sPrePr);
+OPEN_M_TOKEN(BOX, box);
+OPEN_M_TOKEN(EQARR, eqArr);
default:
SAL_INFO(writerfilter, OSL_THIS_FUNC : TODO handle
destination ' lcl_RtfToString(nKeyword) ');
// Make sure we skip destinations (even without \*) till we don't
handle them
@@ -3138,6 +3144,8 @@ int RTFDocumentImpl::pushState()
case DESTINATION_SHAPETEXT:
case DESTINATION_FORMFIELD:
case DESTINATION_EQINSTRUCTION:
+m_aStates.top().nDestinationState = DESTINATION_NORMAL;
+break;
case DESTINATION_MNUM:
case DESTINATION_MDEN:
case DESTINATION_ME:
@@ -3146,7 +3154,7 @@ int RTFDocumentImpl::pushState()
case DESTINATION_MSUB:
case DESTINATION_MSUP:
case DESTINATION_MDEG:
-m_aStates.top().nDestinationState = DESTINATION_NORMAL;
+m_aStates.top().nDestinationState = DESTINATION_MR;
break;
case DESTINATION_FIELDINSTRUCTION:
m_aStates.top().nDestinationState = !m_bEq ? DESTINATION_NORMAL :
DESTINATION_EQINSTRUCTION;
@@ -3627,10 +3635,12 @@ int RTFDocumentImpl::popState()
case DESTINATION_MSTRIKEH: if (!nMathToken) nMathToken = M_TOKEN(strikeH);
case DESTINATION_MDEGHIDE: if (!nMathToken) nMathToken = M_TOKEN(degHide);
case DESTINATION_MBEGCHR: if (!nMathToken) nMathToken = M_TOKEN(begChr);
+case DESTINATION_MSEPCHR: if (!nMathToken) nMathToken = M_TOKEN(sepChr);
case DESTINATION_MENDCHR: if (!nMathToken) nMathToken = M_TOKEN(endChr);
case DESTINATION_MSUBHIDE: if (!nMathToken) nMathToken = M_TOKEN(subHide);
case DESTINATION_MSUPHIDE: if (!nMathToken) nMathToken = M_TOKEN(supHide);
case DESTINATION_MTYPE: if (!nMathToken) nMathToken = M_TOKEN(type);
+
[Libreoffice-commits] .: desktop/source
desktop/source/app/sofficemain.cxx | 22 --
1 file changed, 20 insertions(+), 2 deletions(-)
New commits:
commit fdfb7a3c4b3a89b73ab5546b9620348bc4984d8f
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Jul 25 10:31:21 2012 +0200
Related fdo#51252: Report uncaught exceptions with MessageBox on Windows
...as stderr is not generally visible there to the user (and vcl's
Application::ShowNativeErrorBox might not yet be functional during early
start
up).
Change-Id: I1b99a77f7add967579d726462aa0a7b83a5d2d0a
diff --git a/desktop/source/app/sofficemain.cxx
b/desktop/source/app/sofficemain.cxx
old mode 100644
new mode 100755
index 93081b9..a0fba04
--- a/desktop/source/app/sofficemain.cxx
+++ b/desktop/source/app/sofficemain.cxx
@@ -26,6 +26,7 @@
*
/
+#include sal/config.h
#include desktopdllapi.h
@@ -37,14 +38,21 @@
#include rtl/bootstrap.hxx
#include tools/extendapplicationenvironment.hxx
+#if defined WNT
+#define WIN32_LEAN_AND_MEAN
+#include windows.h
+#endif
+
int SVMain();
// -=-= main() -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
extern C int DESKTOP_DLLPUBLIC soffice_main()
{
-#if defined(ANDROID)
+#if defined ANDROID || defined WNT
try {
+#endif
+#if defined(ANDROID)
rtl::Bootstrap::setIniFilename(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(file:///assets/program/lofficerc)));
#endif
@@ -75,10 +83,20 @@ extern C int DESKTOP_DLLPUBLIC soffice_main()
}
#endif
return SVMain();
-#ifdef ANDROID
+#if defined ANDROID || defined WNT
} catch (const ::com::sun::star::uno::Exception e) {
+#if defined ANDROID
fprintf (stderr, Not handled UNO exception at main: '%s'\n,
rtl::OUStringToOString(e.Message,
RTL_TEXTENCODING_UTF8).getStr());
+#elif defined WNT
+MessageBoxW(
+0,
+reinterpret_cast LPCWSTR (
+rtl::OUString(Unhandled exception:\n + e.Message).getStr()),
+reinterpret_cast LPCWSTR (rtl::OUString(Fatal Error).getStr()),
+(MB_OK | MB_ICONERROR | MB_DEFBUTTON1 | MB_TASKMODAL
+ | MB_SETFOREGROUND | MB_TOPMOST));
+#endif
throw; // to get exception type printed
}
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[REVIEW 3-6][REVIEW 3-6-0] Report uncaught exceptions with MessageBox on Windows
http://cgit.freedesktop.org/libreoffice/core/commit/?id=fdfb7a3c4b3a89b73ab5546b9620348bc4984d8f Related fdo#51252: Report uncaught exceptions with MessageBox on Windows is an attempt to get more useful information when a user is hit by https://bugs.freedesktop.org/show_bug.cgi?id=51252 LO cannot start (reports runtime error with Visual C++ Runtime Library) etc. on Windows. It displays a native message box containing the message of the uncaught UNO exception. One easy way to test the effectiveness of this patch is to duplicate a LO installation's program\services\services.rdb as program\services\DUPLICATE.rdb. Starting soffice.exe should then cause this fatal error (due to duplicate UNO service implementations). Please review for libreoffice-3-6 and libreoffice-3-6-0. The patch should be really harmless, as it should only kick in in situations where LibreOffice is failing completely anyway. Thanks, Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] This is modifying comments to meet doxygen standards
From Jan Holesovsky ke...@suse.cz: Jan Holesovsky has submitted this change and it was merged. Change subject: This is modifying comments to meet doxygen standards .. This is modifying comments to meet doxygen standards Change-Id: I73cd4c901aa003abec43f55948c184672d2e14ff --- M sw/inc/IDocumentMarkAccess.hxx M sw/inc/IDocumentRedlineAccess.hxx M sw/inc/bparr.hxx M sw/inc/breakit.hxx M sw/inc/calbck.hxx M sw/inc/cellatr.hxx M sw/inc/cellfml.hxx M sw/inc/chpfld.hxx M sw/inc/crsrsh.hxx M sw/inc/crstate.hxx M sw/inc/cshtyp.hxx 11 files changed, 128 insertions(+), 128 deletions(-) Approvals: Jan Holesovsky: Verified; Looks good to me, approved Eike Rathke: Looks good to me, but someone else must approve -- To view, visit https://gerrit.libreoffice.org/338 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I73cd4c901aa003abec43f55948c184672d2e14ff Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa Gerrit-Reviewer: Eike Rathke er...@redhat.com Gerrit-Reviewer: Jan Holesovsky ke...@suse.cz Gerrit-Reviewer: Michael Meeks michael.me...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: reportbuilder/Extension_reportbuilder.mk
reportbuilder/Extension_reportbuilder.mk | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) New commits: commit dda589ba60ff5ea104d85f0a09759c954498a5c9 Author: David Tardon dtar...@redhat.com Date: Wed Jul 25 10:57:13 2012 +0200 fdo#52427 fix l10n of reportbuilder Change-Id: I9ff1b7329eca2faa560181c49d6c4527a008fead diff --git a/reportbuilder/Extension_reportbuilder.mk b/reportbuilder/Extension_reportbuilder.mk index da80dae..7309467 100644 --- a/reportbuilder/Extension_reportbuilder.mk +++ b/reportbuilder/Extension_reportbuilder.mk @@ -63,27 +63,27 @@ $(eval $(call gb_Extension_add_files,report-builder,images,\ )) $(eval $(call gb_Extension_add_files,report-builder,registry/data/org/openoffice,\ - $(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Setup.xcu) \ + $(call gb_XcuMergeTarget_get_target,reportbuilder/registry/data/org/openoffice/Setup.xcu) \ )) $(eval $(call gb_Extension_add_files,report-builder,registry/data/org/openoffice/Office,\ - $(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/Accelerators.xcu) \ - $(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/DataAccess.xcu) \ - $(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/Embedding.xcu) \ - $(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu) \ + $(call gb_XcuMergeTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/Accelerators.xcu) \ + $(call gb_XcuMergeTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/DataAccess.xcu) \ + $(call gb_XcuMergeTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/Embedding.xcu) \ + $(call gb_XcuMergeTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu) \ $(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/Paths.xcu) \ $(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/ReportDesign.xcu) \ )) $(eval $(call gb_Extension_add_files,report-builder,registry/data/org/openoffice/Office/UI,\ $(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/UI/Controller.xcu) \ - $(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu) \ - $(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu) \ + $(call gb_XcuMergeTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu) \ + $(call gb_XcuMergeTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu) \ )) $(eval $(call gb_Extension_add_files,report-builder,registry/data/org/openoffice/TypeDetection,\ - $(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/TypeDetection/Filter.xcu) \ - $(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/TypeDetection/Types.xcu) \ + $(call gb_XcuMergeTarget_get_target,reportbuilder/registry/data/org/openoffice/TypeDetection/Filter.xcu) \ + $(call gb_XcuMergeTarget_get_target,reportbuilder/registry/data/org/openoffice/TypeDetection/Types.xcu) \ )) $(eval $(call gb_Extension_add_files,report-builder,registry/schema/org/openoffice/Office,\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 6 commits - basctl/source i18npool/qa i18npool/source sal/osl unusedcode.easy
basctl/source/basicide/baside2.cxx |3
i18npool/qa/cppunit/test_breakiterator.cxx | 171 -
i18npool/source/breakiterator/data/README | 33 -
sal/osl/unx/util.c | 17 ++
unusedcode.easy|1
5 files changed, 144 insertions(+), 81 deletions(-)
New commits:
commit a5947d14c278446b44fd76050103d16dd768601c
Author: Caolán McNamara caol...@redhat.com
Date: Wed Jul 25 09:10:00 2012 +0100
callcatcher: SwInsHardBlankSoftHyph unused
Change-Id: Ia023647520828f562c879eb7410dda1417ad901d
diff --git a/unusedcode.easy b/unusedcode.easy
index 29b66c0..87728a5 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -216,7 +216,6 @@ binfilter::SwChartLines::DeleteAndDestroy(unsigned short,
unsigned short)
binfilter::SwDependentFields::DeleteAndDestroy(unsigned short, unsigned short)
binfilter::SwDestroyList::DeleteAndDestroy(unsigned short, unsigned short)
binfilter::SwDestroyList::Seek_Entry(binfilter::SwSectionFrm*, unsigned
short*) const
-binfilter::SwInsHardBlankSoftHyph::~SwInsHardBlankSoftHyph()
binfilter::SwRects::SwRects(unsigned short, unsigned char)
binfilter::SwRubyList::DeleteAndDestroy(unsigned short, unsigned short)
binfilter::SwSortDrawObjs::DeleteAndDestroy(unsigned short, unsigned short)
commit 5a6279df5549665ffe378c7c313399aa47823085
Author: Caolán McNamara caol...@redhat.com
Date: Tue Jul 24 22:32:05 2012 +0100
Related: #i17155# regression test for slash part of word for line break
Change-Id: I5b457531fb94f66dd7f5fdcc4636c5a202a036f1
diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx
b/i18npool/qa/cppunit/test_breakiterator.cxx
index cf2147f..403c71b 100644
--- a/i18npool/qa/cppunit/test_breakiterator.cxx
+++ b/i18npool/qa/cppunit/test_breakiterator.cxx
@@ -125,6 +125,21 @@ void TestBreakIterator::testLineBreaking()
CPPUNIT_ASSERT_MESSAGE(Expected a break at the the start of the
word, aResult.breakIndex == aWord.getLength()+1);
}
}
+
+//See https://issues.apache.org/ooo/show_bug.cgi?id=17155
+{
+rtl::OUString aTest(RTL_CONSTASCII_USTRINGPARAM(foo /bar/baz));
+
+aLocale.Language = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(en));
+aLocale.Country = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(US));
+
+{
+//Here we want the line break to leave /bar/ba clumped together on
the next line
+i18n::LineBreakResults aResult = m_xBreak-getLineBreak(aTest,
strlen(foo /bar/ba), aLocale, 0,
+aHyphOptions, aUserOptions);
+CPPUNIT_ASSERT_MESSAGE(Expected a break at the first slash,
aResult.breakIndex == 4);
+}
+}
}
//See https://bugs.freedesktop.org/show_bug.cgi?id=49629
diff --git a/i18npool/source/breakiterator/data/README
b/i18npool/source/breakiterator/data/README
index bb2ab6b..cf74ec4 100644
--- a/i18npool/source/breakiterator/data/README
+++ b/i18npool/source/breakiterator/data/README
@@ -698,15 +698,9 @@ Date: Tue Jan 20 12:20:28 2004 +
INTEGRATION: CWS i18n10 (1.12.4); FILE MERGED
2003/12/17 20:15:43 khong 1.12.4.1: #i22138# #112506# migrate to ICU
collator and remove link to tool library
-commit 825b2bb5d875a9d94e2ee5549d7cfb78b0aed933
-Author: Jens-Heiner Rechtien h...@openoffice.org
-Date: Fri Nov 7 14:14:53 2003 +
-
-INTEGRATION: CWS i18n08 (1.1.2); FILE ADDED
-2003/08/08 23:30:57 khong 1.1.2.1: #i17155# fix line breakiterator rule to
make slash and hyphen as part of word when doing line break
-
done, regression tests added:
+#i17155# fix line breakiterator rule to make slash and hyphen as part of word
when doing line break
#i13451# add '-' as midLetter for Catalan dictionary word breakiterator
#i13494# fix word breakiterator rule to handle punctuations and signs correctly
#i29548# Fix Thai word breakiterator problem
commit b8fa8841c098f15ef2280aa4c82c55c4f96325c9
Author: Caolán McNamara caol...@redhat.com
Date: Tue Jul 24 22:17:13 2012 +0100
Related: #i13451# regression test for Catalan dictionary word breakiterator
Change-Id: I7785746b2cf4e5e054ced5b728dc69e6b1a966f2
diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx
b/i18npool/qa/cppunit/test_breakiterator.cxx
index 0c913bc..cf2147f 100644
--- a/i18npool/qa/cppunit/test_breakiterator.cxx
+++ b/i18npool/qa/cppunit/test_breakiterator.cxx
@@ -64,15 +64,10 @@ public:
#if TODO
void testNorthernThai();
#endif
-#if (U_ICU_VERSION_MAJOR_NUM 4)
void testKhmer();
-#endif
CPPUNIT_TEST_SUITE(TestBreakIterator);
CPPUNIT_TEST(testLineBreaking);
-#if (U_ICU_VERSION_MAJOR_NUM 4)
-CPPUNIT_TEST(testWordBoundaries);
-#endif
CPPUNIT_TEST(testGraphemeIteration);
CPPUNIT_TEST(testWeak);
CPPUNIT_TEST(testAsian);
@@ -81,6 +76,7 @@ public:
CPPUNIT_TEST(testNorthernThai);
#endif
#if (U_ICU_VERSION_MAJOR_NUM 4)
+CPPUNIT_TEST(testWordBoundaries);
CPPUNIT_TEST(testKhmer);
[REVIEW: 3-6 3-6-0] fdo#52427 Report Builder UI is not translated
Hi all, commit dda589ba60ff5ea104d85f0a09759c954498a5c9 fixes a regression caused by gbuildification of module reportbuilder. It erroneously packed untranslated .xcu files into the extension. I would appreciate reviews for 3-6 and 3-6-0 (if it is not too late for that). D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: binfilter/bf_sw
binfilter/bf_sw/source/core/sw3io/sw3imp.hxx |5 --
binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx | 54 ++
2 files changed, 8 insertions(+), 51 deletions(-)
New commits:
commit fa8451f5a9714bf4d2f9832f62baa013b35e1292
Author: Caolán McNamara caol...@redhat.com
Date: Wed Jul 25 09:09:47 2012 +0100
callcatcher: SwInsHardBlankSoftHyph unused
Change-Id: Ib2879953fc98a6494c47cc0400590215d286c256
diff --git a/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx
b/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx
index d819573..d21dca2 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx
@@ -108,7 +108,6 @@ class SwFlyFrm;
class Sw3RecordSizeTable;
class SvxTabStopItem;
class Sw3TOXBase;
-class SwInsHardBlankSoftHyph;
class SvxFontItem;
class SdrObject;
@@ -331,11 +330,11 @@ class Sw3IoImp
xub_StrLen nOffset, const SwTxtNode rNd,
rtl_TextEncoding eEnc,
const SvxFontItem rFontItem,
-SwInsHardBlankSoftHyph* pHBSH, BOOL bTo8 );
+BOOL bTo8 );
void ConvertText( ByteString rText8, String rText,
xub_StrLen nOffset, SwTxtNode rNd,
rtl_TextEncoding eEnc, const SvxFontItem rFontItem,
- SwInsHardBlankSoftHyph* pHBSH, BOOL bTo8 );
+ BOOL bTo8 );
public:
const String N_DOC; // Name des Dokument-Streams
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx
b/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx
index 5f0d21c..f84d69b 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx
@@ -109,16 +109,6 @@ namespace binfilter {
SV_DECL_PTRARR(SfxPoolItems,SfxPoolItem * ,16,16)
-class SwInsHardBlankSoftHyph
-{
-SvXub_StrLens aItemStarts;// Start-Pos der Hints
-SfxPoolItemsaItems; // Items der Hints
-public:
-SwInsHardBlankSoftHyph() {}
-~SwInsHardBlankSoftHyph();
-void AddItem( xub_StrLen nPos, sal_Unicode c );
-};
-
/*N*/ sal_Char Sw3IoImp::ConvStarSymbolCharToStarBats( sal_Unicode c )
/*N*/ {
/*N*/ if( !hBatsFontConv )
@@ -267,7 +257,7 @@ sal_Unicode Sw3IoImp::ConvStarMathCharToStarSymbol(
sal_Char c )
/*N*/ xub_StrLen nOffset, const SwTxtNode rNd,
/*N*/ rtl_TextEncoding eEnc,
/*N*/ const SvxFontItem rFontItem,
-/*N*/ SwInsHardBlankSoftHyph* pHBSH, BOOL bTo8 )
+/*N*/ BOOL bTo8 )
/*N*/ {
/*N*/ rtl::OStringBuffer aText8(rText8);
/*N*/ sal_Bool bRet = sal_False;
@@ -286,11 +276,6 @@ sal_Unicode Sw3IoImp::ConvStarMathCharToStarSymbol(
sal_Char c )
/*N*/ case CHAR_HARDBLANK:
/*N*/ case CHAR_HARDHYPHEN:
/*?*/ case CHAR_SOFTHYPHEN:
-/*?*/ if( pHBSH )
-/*?*/ {
-/*?*/ pHBSH-AddItem( nPos, c );
-/*?*/ c = '\xff';
-/*?*/ }
/*?*/ break;
/*N*/
/*N*/ case CH_TXTATR_BREAKWORD:
@@ -317,11 +302,6 @@ sal_Unicode Sw3IoImp::ConvStarMathCharToStarSymbol(
sal_Char c )
/*N*/ case CHAR_HARDBLANK:
/*N*/ case CHAR_HARDHYPHEN:
/*N*/ case CHAR_SOFTHYPHEN:
-/*N*/ if( pHBSH )
-/*N*/ {
-/*N*/ pHBSH-AddItem( nPos, c );
-/*N*/ bToFF = TRUE;
-/*N*/ }
/*N*/ break;
/*N*/
/*N*/ case CH_TXTATR_BREAKWORD:
@@ -431,7 +411,7 @@ SV_DECL_PTRARR( SwTxtAttrs, SwTxtAttrPtr, 5, 5 )
/*N*/ void Sw3IoImp::ConvertText( ByteString rText8, String rText,
/*N*/ xub_StrLen nOffset, SwTxtNode rNd,
/*N*/ rtl_TextEncoding eEnc, const SvxFontItem
rFontItem,
-/*N*/ SwInsHardBlankSoftHyph* pHBSH, BOOL bTo8 )
+/*N*/ BOOL bTo8 )
/*N*/
/*N*/ {
/*N*/ SvxFontItems aFontItemStack;
@@ -470,7 +450,7 @@ SV_DECL_PTRARR( SwTxtAttrs, SwTxtAttrPtr, 5, 5 )
/*N*/ {
/*N*/ sal_Bool bSymConv = ConvertText( rText8, rText, nCopy,
nPos,
/*N*/nOffset, rNd, eEnc,
-/*N*/*pFontItem, pHBSH, bTo8 );
+/*N*/*pFontItem, bTo8 );
/*N*/ if( bSymConv !bTo8 )
/*N*/ {
/*N*/ aInsertSymbolFontStartPoss.Insert( nCopy,
@@ -490,7 +470,7 @@ SV_DECL_PTRARR( SwTxtAttrs, SwTxtAttrPtr, 5, 5 )
/*N*/ {
/*N*/ sal_Bool bSymConv = ConvertText( rText8, rText, nCopy,
nPos,
/*N*/nOffset, rNd,eEnc,
*pFontItem,
[Libreoffice-commits] .: basctl/source
basctl/source/basicide/basides1.cxx |1 +
basctl/source/basicide/basidesh.cxx |6 +-
basctl/source/basicide/objdlg.cxx |7 +--
basctl/source/basicide/objdlg.hxx |2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 44e8b1c8ad917d3c4ed7efe9169e5197801198f2
Author: Uray M. János uray.ja...@gmail.com
Date: Tue Jul 24 11:29:57 2012 +0200
fdo#50633 IDE: select current module in Object Catalog on open
Change-Id: Ieea731b0ed8eefdab616ed1f778b445aae14191c
diff --git a/basctl/source/basicide/basides1.cxx
b/basctl/source/basicide/basides1.cxx
index 0f5d524..b342255 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -1205,6 +1205,7 @@ void BasicIDEShell::SetCurWindow( IDEBaseWindow* pNewWin,
sal_Bool bUpdateTabBar
GetViewFrame()-GetWindow().SetHelpId( HID_BASICIDE_MODULWINDOW );
SfxObjectShell::SetCurrentComponent( NULL );
}
+pModulLayout-GetObjectCatalog().SetCurrentEntry(pCurWin);
SetUndoManager( pCurWin ? pCurWin-GetUndoManager() : 0 );
InvalidateBasicIDESlots();
EnableScrollbars( pCurWin ? sal_True : sal_False );
diff --git a/basctl/source/basicide/basidesh.cxx
b/basctl/source/basicide/basidesh.cxx
index c51cb0a..e2a0884 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -542,11 +542,7 @@ void BasicIDEShell::ShowObjectDialog( sal_Bool bShow,
sal_Bool bCreateOrDestroy
if ( pObjectCatalog )
{
pObjectCatalog-SetCancelHdl( LINK( this, BasicIDEShell,
ObjectDialogCancelHdl ) );
-BasicEntryDescriptor aDesc;
-IDEBaseWindow* pCurWin_ = GetCurWindow();
-if ( pCurWin_ )
-aDesc = pCurWin_-CreateEntryDescriptor();
-pObjectCatalog-SetCurrentEntry( aDesc );
+pObjectCatalog-SetCurrentEntry(pCurWin);
}
}
diff --git a/basctl/source/basicide/objdlg.cxx
b/basctl/source/basicide/objdlg.cxx
index 1043594..64935bb 100644
--- a/basctl/source/basicide/objdlg.cxx
+++ b/basctl/source/basicide/objdlg.cxx
@@ -223,9 +223,12 @@ void ObjectCatalog::UpdateEntries()
aMacroTreeList.UpdateEntries();
}
-void ObjectCatalog::SetCurrentEntry( BasicEntryDescriptor rDesc )
+void ObjectCatalog::SetCurrentEntry (IDEBaseWindow* pCurWin)
{
-aMacroTreeList.SetCurrentEntry( rDesc );
+BasicEntryDescriptor aDesc;
+if (pCurWin)
+aDesc = pCurWin-CreateEntryDescriptor();
+aMacroTreeList.SetCurrentEntry(aDesc);
}
ObjectCatalogToolBox_Impl::ObjectCatalogToolBox_Impl(
diff --git a/basctl/source/basicide/objdlg.hxx
b/basctl/source/basicide/objdlg.hxx
index c0c3c45..f82ae0e 100644
--- a/basctl/source/basicide/objdlg.hxx
+++ b/basctl/source/basicide/objdlg.hxx
@@ -64,7 +64,7 @@ public:
virtual ~ObjectCatalog();
voidUpdateEntries();
-voidSetCurrentEntry( BasicEntryDescriptor rDesc );
+voidSetCurrentEntry (IDEBaseWindow* pCurWin);
voidSetCancelHdl( const Link rLink ) { aCancelHdl =
rLink; }
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED][PATCH] fdo#50633 IDE: select current module in Object Catalog on open
Hi János, patch looks good to me, pushed, thanks!!! On 24/07/12 10:40, János Uray wrote: Oh, yes, I'm sorry. On Tue, Jul 24, 2012 at 11:35 AM, Korrawit Pruegsanusak detective.conan.1...@gmail.com mailto:detective.conan.1...@gmail.com wrote: Hello, On Tue, Jul 24, 2012 at 4:31 PM, János Uray uray.ja...@gmail.com mailto:uray.ja...@gmail.com wrote: This patch solves this bug: Seems you forgot to attach the patch? :-) Bets Regards, -- Korrawit Pruegsanusak regards, Noel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Bring background image in About box back more
From Stefan Knorr heinzless...@gmail.com: Stefan Knorr has uploaded a new change for review. Change subject: Bring background image in About box back more .. Bring background image in About box back more + revert background image removal + useful fallback logo text in case rsvg doesn't work on the platform + better calculation of dialog size + somewhat better high-contrast support + slightly modified background image Change-Id: I1cd77dd7b47eec6bf8709b225ecf0d070f9bb869 --- M cui/source/dialogs/about.cxx M cui/source/dialogs/about.hrc M cui/source/dialogs/about.src M cui/source/inc/about.hxx M icon-themes/galaxy/brand/shell/about.svg 5 files changed, 293 insertions(+), 1,536 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/44/344/1 -- To view, visit https://gerrit.libreoffice.org/344 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1cd77dd7b47eec6bf8709b225ecf0d070f9bb869 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Stefan Knorr heinzless...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - desktop/source
desktop/source/app/sofficemain.cxx | 22 --
1 file changed, 20 insertions(+), 2 deletions(-)
New commits:
commit c794788fb0d28cbd1f8bb6be50198264b3427fc2
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Jul 25 10:31:21 2012 +0200
Related fdo#51252: Report uncaught exceptions with MessageBox on Windows
...as stderr is not generally visible there to the user (and vcl's
Application::ShowNativeErrorBox might not yet be functional during early
start
up).
Change-Id: I1b99a77f7add967579d726462aa0a7b83a5d2d0a
Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch
diff --git a/desktop/source/app/sofficemain.cxx
b/desktop/source/app/sofficemain.cxx
old mode 100644
new mode 100755
index 93081b9..a0fba04
--- a/desktop/source/app/sofficemain.cxx
+++ b/desktop/source/app/sofficemain.cxx
@@ -26,6 +26,7 @@
*
/
+#include sal/config.h
#include desktopdllapi.h
@@ -37,14 +38,21 @@
#include rtl/bootstrap.hxx
#include tools/extendapplicationenvironment.hxx
+#if defined WNT
+#define WIN32_LEAN_AND_MEAN
+#include windows.h
+#endif
+
int SVMain();
// -=-= main() -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
extern C int DESKTOP_DLLPUBLIC soffice_main()
{
-#if defined(ANDROID)
+#if defined ANDROID || defined WNT
try {
+#endif
+#if defined(ANDROID)
rtl::Bootstrap::setIniFilename(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(file:///assets/program/lofficerc)));
#endif
@@ -75,10 +83,20 @@ extern C int DESKTOP_DLLPUBLIC soffice_main()
}
#endif
return SVMain();
-#ifdef ANDROID
+#if defined ANDROID || defined WNT
} catch (const ::com::sun::star::uno::Exception e) {
+#if defined ANDROID
fprintf (stderr, Not handled UNO exception at main: '%s'\n,
rtl::OUStringToOString(e.Message,
RTL_TEXTENCODING_UTF8).getStr());
+#elif defined WNT
+MessageBoxW(
+0,
+reinterpret_cast LPCWSTR (
+rtl::OUString(Unhandled exception:\n + e.Message).getStr()),
+reinterpret_cast LPCWSTR (rtl::OUString(Fatal Error).getStr()),
+(MB_OK | MB_ICONERROR | MB_DEFBUTTON1 | MB_TASKMODAL
+ | MB_SETFOREGROUND | MB_TOPMOST));
+#endif
throw; // to get exception type printed
}
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [REVIEW 3-6][REVIEW 3-6-0] Report uncaught exceptions with MessageBox on Windows
On Wed, 2012-07-25 at 10:40 +0200, Stephan Bergmann wrote: http://cgit.freedesktop.org/libreoffice/core/commit/?id=fdfb7a3c4b3a89b73ab5546b9620348bc4984d8f Related fdo#51252: Report uncaught exceptions with MessageBox on Windows is an attempt to get more useful information when a user is hit by https://bugs.freedesktop.org/show_bug.cgi?id=51252 LO cannot start (reports runtime error with Visual C++ Runtime Library) etc. on Windows. It displays a native message box containing the message of the uncaught UNO exception. Looks sexy to me - at least at the level of wow that's ugly - but it really solves the problem we have ! :-) So +1 for me for -3-6 and -3-6-0 - thanks for doing that Stephan - much appreciated - someone else doing the cherry-picking appreciated - I'm in an all-day meeting :-) Thanks ! Michael. PS. I wonder if we could move this into VCL with some: void vcl_emergency_bailout (const rtl::OUString rMessage); type method - just to keep the windows mess in one place. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6-0' - desktop/source
desktop/source/app/sofficemain.cxx | 22 --
1 file changed, 20 insertions(+), 2 deletions(-)
New commits:
commit 199ebb3431f85d1d1ee40c698c19f14d57279729
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Jul 25 10:31:21 2012 +0200
Related fdo#51252: Report uncaught exceptions with MessageBox on Windows
...as stderr is not generally visible there to the user (and vcl's
Application::ShowNativeErrorBox might not yet be functional during early
start
up).
Change-Id: I1b99a77f7add967579d726462aa0a7b83a5d2d0a
Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch
(cherry picked from commit c794788fb0d28cbd1f8bb6be50198264b3427fc2)
Signed-off-by: Michael Meeks michael.me...@suse.com
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/desktop/source/app/sofficemain.cxx
b/desktop/source/app/sofficemain.cxx
old mode 100644
new mode 100755
index 93081b9..a0fba04
--- a/desktop/source/app/sofficemain.cxx
+++ b/desktop/source/app/sofficemain.cxx
@@ -26,6 +26,7 @@
*
/
+#include sal/config.h
#include desktopdllapi.h
@@ -37,14 +38,21 @@
#include rtl/bootstrap.hxx
#include tools/extendapplicationenvironment.hxx
+#if defined WNT
+#define WIN32_LEAN_AND_MEAN
+#include windows.h
+#endif
+
int SVMain();
// -=-= main() -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
extern C int DESKTOP_DLLPUBLIC soffice_main()
{
-#if defined(ANDROID)
+#if defined ANDROID || defined WNT
try {
+#endif
+#if defined(ANDROID)
rtl::Bootstrap::setIniFilename(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(file:///assets/program/lofficerc)));
#endif
@@ -75,10 +83,20 @@ extern C int DESKTOP_DLLPUBLIC soffice_main()
}
#endif
return SVMain();
-#ifdef ANDROID
+#if defined ANDROID || defined WNT
} catch (const ::com::sun::star::uno::Exception e) {
+#if defined ANDROID
fprintf (stderr, Not handled UNO exception at main: '%s'\n,
rtl::OUStringToOString(e.Message,
RTL_TEXTENCODING_UTF8).getStr());
+#elif defined WNT
+MessageBoxW(
+0,
+reinterpret_cast LPCWSTR (
+rtl::OUString(Unhandled exception:\n + e.Message).getStr()),
+reinterpret_cast LPCWSTR (rtl::OUString(Fatal Error).getStr()),
+(MB_OK | MB_ICONERROR | MB_DEFBUTTON1 | MB_TASKMODAL
+ | MB_SETFOREGROUND | MB_TOPMOST));
+#endif
throw; // to get exception type printed
}
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [REVIEW: 3-6 3-6-0] fdo#52427 Report Builder UI is not translated
On Wed, 2012-07-25 at 11:03 +0200, David Tardon wrote: commit dda589ba60ff5ea104d85f0a09759c954498a5c9 fixes a regression caused by gbuildification of module reportbuilder. It erroneously packed untranslated .xcu files into the extension. I would appreciate reviews for 3-6 and 3-6-0 (if it is not too late for that). +1 for -3-6 from me; I'd appreciate if you can cherry-pick. Thanks, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED][3-6-0] Re: [REVIEW 3-6][REVIEW 3-6-0] Report uncaught exceptions with MessageBox on Windows
On 25/07/12 11:20, Michael Meeks wrote: On Wed, 2012-07-25 at 10:40 +0200, Stephan Bergmann wrote: http://cgit.freedesktop.org/libreoffice/core/commit/?id=fdfb7a3c4b3a89b73ab5546b9620348bc4984d8f Related fdo#51252: Report uncaught exceptions with MessageBox on Windows is an attempt to get more useful information when a user is hit by https://bugs.freedesktop.org/show_bug.cgi?id=51252 LO cannot start (reports runtime error with Visual C++ Runtime Library) etc. on Windows. It displays a native message box containing the message of the uncaught UNO exception. Looks sexy to me - at least at the level of wow that's ugly - but it really solves the problem we have ! :-) So +1 for me for -3-6 and -3-6-0 - thanks for doing that Stephan - much appreciated - someone else doing the cherry-picking appreciated better error reporting gets an automatic +1 from me, pushed to libreoffice-3-6-0 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sal/osl
sal/osl/unx/util.c |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 4f1e5b34211a714baad8a05ab38f3f953ebd4cce Author: Caolán McNamara caol...@redhat.com Date: Wed Jul 25 10:32:01 2012 +0100 weak symbols don't link on macosx Change-Id: If4e8adfb4199863cd2f6d8d8a419762fcbaa6599 diff --git a/sal/osl/unx/util.c b/sal/osl/unx/util.c index b344f2b..eca61a8 100644 --- a/sal/osl/unx/util.c +++ b/sal/osl/unx/util.c @@ -349,7 +349,8 @@ void osl_interlockedCountCheckForSingleCPU(void) #endif /* defined(_SC_NPROCESSORS_CONF) */ #endif -#if defined(__GNUC__) +//might be useful on other platforms, but doesn't compiler under MACOSX anyway +#if defined(__GNUC__) defined(LINUX) //force the __data_start symbol to exist in any executables that link against //libuno_sal so that dlopening of the libgcj provided libjvm.so on some //platforms where it needs that symbol will succeed. e.g. Debian mips/lenny ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PATCH] fdo#40152: replace with empty string in Basic IDE
On 25/07/12 08:48, János Uray wrote: This patch solves https://bugs.freedesktop.org/show_bug.cgi?id=40152 . weirdly this doesn't seem to work for me ( no effect ) could you check again? Noel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - reportbuilder/Extension_reportbuilder.mk
reportbuilder/Extension_reportbuilder.mk | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) New commits: commit b1ca38aa592fa8b5adebb8832681babbf95e1eff Author: David Tardon dtar...@redhat.com Date: Wed Jul 25 10:57:13 2012 +0200 fdo#52427 fix l10n of reportbuilder Change-Id: I9ff1b7329eca2faa560181c49d6c4527a008fead (cherry picked from commit dda589ba60ff5ea104d85f0a09759c954498a5c9) Signed-off-by: Michael Meeks michael.me...@suse.com diff --git a/reportbuilder/Extension_reportbuilder.mk b/reportbuilder/Extension_reportbuilder.mk index 649a961..70d3408 100644 --- a/reportbuilder/Extension_reportbuilder.mk +++ b/reportbuilder/Extension_reportbuilder.mk @@ -64,27 +64,27 @@ $(eval $(call gb_Extension_add_files,report-builder,images,\ )) $(eval $(call gb_Extension_add_files,report-builder,registry/data/org/openoffice,\ - $(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Setup.xcu) \ + $(call gb_XcuMergeTarget_get_target,reportbuilder/registry/data/org/openoffice/Setup.xcu) \ )) $(eval $(call gb_Extension_add_files,report-builder,registry/data/org/openoffice/Office,\ - $(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/Accelerators.xcu) \ - $(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/DataAccess.xcu) \ - $(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/Embedding.xcu) \ - $(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu) \ + $(call gb_XcuMergeTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/Accelerators.xcu) \ + $(call gb_XcuMergeTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/DataAccess.xcu) \ + $(call gb_XcuMergeTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/Embedding.xcu) \ + $(call gb_XcuMergeTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu) \ $(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/Paths.xcu) \ $(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/ReportDesign.xcu) \ )) $(eval $(call gb_Extension_add_files,report-builder,registry/data/org/openoffice/Office/UI,\ $(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/UI/Controller.xcu) \ - $(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu) \ - $(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu) \ + $(call gb_XcuMergeTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu) \ + $(call gb_XcuMergeTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu) \ )) $(eval $(call gb_Extension_add_files,report-builder,registry/data/org/openoffice/TypeDetection,\ - $(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/TypeDetection/Filter.xcu) \ - $(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/TypeDetection/Types.xcu) \ + $(call gb_XcuMergeTarget_get_target,reportbuilder/registry/data/org/openoffice/TypeDetection/Filter.xcu) \ + $(call gb_XcuMergeTarget_get_target,reportbuilder/registry/data/org/openoffice/TypeDetection/Types.xcu) \ )) $(eval $(call gb_Extension_add_files,report-builder,registry/schema/org/openoffice/Office,\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6-0' - reportbuilder/Extension_reportbuilder.mk
reportbuilder/Extension_reportbuilder.mk | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) New commits: commit c1fec90a8f88379643414529e14b3626e682321a Author: David Tardon dtar...@redhat.com Date: Wed Jul 25 10:57:13 2012 +0200 fdo#52427 fix l10n of reportbuilder Change-Id: I9ff1b7329eca2faa560181c49d6c4527a008fead (cherry picked from commit dda589ba60ff5ea104d85f0a09759c954498a5c9) Signed-off-by: Michael Meeks michael.me...@suse.com Signed-off-by: Michael Stahl mst...@redhat.com Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/reportbuilder/Extension_reportbuilder.mk b/reportbuilder/Extension_reportbuilder.mk index 649a961..70d3408 100644 --- a/reportbuilder/Extension_reportbuilder.mk +++ b/reportbuilder/Extension_reportbuilder.mk @@ -64,27 +64,27 @@ $(eval $(call gb_Extension_add_files,report-builder,images,\ )) $(eval $(call gb_Extension_add_files,report-builder,registry/data/org/openoffice,\ - $(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Setup.xcu) \ + $(call gb_XcuMergeTarget_get_target,reportbuilder/registry/data/org/openoffice/Setup.xcu) \ )) $(eval $(call gb_Extension_add_files,report-builder,registry/data/org/openoffice/Office,\ - $(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/Accelerators.xcu) \ - $(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/DataAccess.xcu) \ - $(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/Embedding.xcu) \ - $(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu) \ + $(call gb_XcuMergeTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/Accelerators.xcu) \ + $(call gb_XcuMergeTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/DataAccess.xcu) \ + $(call gb_XcuMergeTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/Embedding.xcu) \ + $(call gb_XcuMergeTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu) \ $(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/Paths.xcu) \ $(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/ReportDesign.xcu) \ )) $(eval $(call gb_Extension_add_files,report-builder,registry/data/org/openoffice/Office/UI,\ $(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/UI/Controller.xcu) \ - $(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu) \ - $(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu) \ + $(call gb_XcuMergeTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu) \ + $(call gb_XcuMergeTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu) \ )) $(eval $(call gb_Extension_add_files,report-builder,registry/data/org/openoffice/TypeDetection,\ - $(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/TypeDetection/Filter.xcu) \ - $(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/TypeDetection/Types.xcu) \ + $(call gb_XcuMergeTarget_get_target,reportbuilder/registry/data/org/openoffice/TypeDetection/Filter.xcu) \ + $(call gb_XcuMergeTarget_get_target,reportbuilder/registry/data/org/openoffice/TypeDetection/Types.xcu) \ )) $(eval $(call gb_Extension_add_files,report-builder,registry/schema/org/openoffice/Office,\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED 3-6 3-6-0] fdo#52427 Report Builder UI is not translated
Michael Stahl píše v St 25. 07. 2012 v 11:39 +0200: On 25/07/12 11:03, David Tardon wrote: Hi all, commit dda589ba60ff5ea104d85f0a09759c954498a5c9 fixes a regression caused by gbuildification of module reportbuilder. It erroneously packed untranslated .xcu files into the extension. I would appreciate reviews for 3-6 and 3-6-0 (if it is not too late for that). ah packaging the right xcu file makes a lot of sense :) pushed to libreoffice-3-6, 2 more needed... oh noes, it's already pushed! you get just a sign off then. Looks fine. MichaelM approved as well = pushed into 3-6-0. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] fdo#40152: replace with empty string in Basic IDE
It still works for me. Am I doing something wrong? On Wed, Jul 25, 2012 at 11:36 AM, Noel Power nopo...@suse.com wrote: On 25/07/12 08:48, János Uray wrote: This patch solves https://bugs.freedesktop.org/**show_bug.cgi?id=40152https://bugs.freedesktop.org/show_bug.cgi?id=40152. weirdly this doesn't seem to work for me ( no effect ) could you check again? Noel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.6.0.3'
Tag 'libreoffice-3.6.0.3' created by Petr Mladek pmla...@suse.cz at 2012-07-25 11:38 -0700 Tag libreoffice-3.6.0.3 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJQD8y6AAoJEPQ0oe+v7q6jwg4QALZflCw05Da1Xq1lC2YOIN2f paFSKt46rpTCiE2/hAsiTphGISqJKfoj4t205IuqIBAzO6mH4r0BbfXAWP8zbtIL OJU8tlituRuTu3N4hGnqWZrix9Nona1AdpHsV+BiWuBVIWDReHyyllap1GskHHjh DZX/C8BKMiGd/nVlqR+Z6kop4bF2kOTk3rrgXxOuwe8FJvtIQiqA6ELnLFlINF6D siuKqy5/5KDQwnohMeguqIVWpOn6Aquj1ve9PatrYleFmuGkIdtZvH4AZ/iqmeuJ MtyT9DAc3uhM1BAXm6Kst3AkuXTZVsaxeA3w66EOUQo5Vuo5oKEVdGvKa3bC12Ej rVSZk68YfiS76CRZQUcxOrlgf6sRGDc5AOPwuy0cvUDz2x5uAZObzNOQ5uO1c9PF cna6sCWU+5NDNKKgp9XHT7vRNw6/xf4OJlXN+0D+SSB3c89Yz7rGX7w20YTRaRXq r48PzAad2nSsWxyEfLGjwGYDlVq+GNKh1/k3KX+xVC/GrpwKfNKhgdt1swj7SnFT scC2GhjqWvyOdYLRYfobMOSUBIXkqfuprfLQOTiKbQW69mVtKnXWfxwKh0GaSVUE WJdOPgqMJ3KbGULJs7gXAVyvILqr92s3Bawn+hUuXAJbexPjplzHHz2/UkYvxFUk 8HeFUCUHqm2Mr7o78mJr =7nxv -END PGP SIGNATURE- Changes since libreoffice-3-6-branch-point-9: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [GSoC] testing - Weekly Report no. 9
Hi Miklos, 2012/7/24 Miklos Vajna vmik...@suse.cz: Hi Artur, Great! :) In what branch did you work? I don't see commits from the last 20 days by you in any branch in core.git. I work in feature/gsoc_test_improvements3 There are no recent commits, because week before mid-term I was not online (trip), and this week I'm working local. The code is progressing slowly, there were a few talks with my mentors how to do different stuff. Thanks, Miklos Best regards, Artur ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Changing sort order of language list box
On Tue, 2012-07-24 at 14:53 +0200, Eike Rathke wrote: Hi Michael, On Tuesday, 2012-07-24 14:22:07 +0200, Michael Stahl wrote: wasn't exactly this approach of limiting the selectable languages for text to those that have a spelling checker discussed here last month or so, and wasn't the result that there are good reasons why even languages without an available spelling checker should be selectable, such as language dependent field formats etc.? Yes ... ah there's this bug, that's probably what i'm remembering: https://bugs.freedesktop.org/show_bug.cgi?id=47896 But, what I'm after is sorting the listbox by 1) Languages with Installed checkers then 2) Languages without that sounds like a reasonable approach, all languages are available, and the most likely used ones at the front. ... and indeed taking this further to present languages with spellcheckers first before all others IMHO is a reasonable approach. An additional possibility is to also add on a MRU section like the font selector does at the top for the last 3 or so last selected languages ? C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/source
sw/source/ui/misc/redlndlg.cxx |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) New commits: commit 4c3a16be845abf4037fab028148423c18a964056 Author: Caolán McNamara caol...@redhat.com Date: Wed Jul 25 12:31:46 2012 +0100 cppcheck: move this pView test to where it makes sense Change-Id: I5e6109e0a844808e612c84e49c7c82dc9720badf diff --git a/sw/source/ui/misc/redlndlg.cxx b/sw/source/ui/misc/redlndlg.cxx index 937147c..983b36b 100644 --- a/sw/source/ui/misc/redlndlg.cxx +++ b/sw/source/ui/misc/redlndlg.cxx @@ -397,13 +397,14 @@ void SwRedlineAcceptDlg::Activate() return; SwView *pView = ::GetActiveView(); -SwWait aWait( *pView-GetDocShell(), sal_False ); - -aUsedSeqNo.clear(); if (!pView) // can happen when switching to another app, when a Listbox in the dialog return; // had the focus previously (actually THs Bug) +SwWait aWait( *pView-GetDocShell(), sal_False ); + +aUsedSeqNo.clear(); + // did something change? SwWrtShell* pSh = pView-GetWrtShellPtr(); sal_uInt16 nCount = pSh-GetRedlineCount(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - svtools/source vcl/source
svtools/source/control/tabbar.cxx |6 +-
vcl/source/window/toolbox.cxx |6 ++
2 files changed, 11 insertions(+), 1 deletion(-)
New commits:
commit 0714d191e7273c3b32837834f9a37867b81cb78a
Author: Ruslan Kabatsayev b7.10110...@gmail.com
Date: Mon Jul 9 10:55:42 2012 +0400
Enable native background rendering for ToolBox
Change-Id: I575dc3a4e15c88d4c61da8195ed9df6c55e5cb66
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 9d3e115..75d0def 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -543,6 +543,12 @@ void ToolBox::ImplDrawBackground( ToolBox* pThis, const
Rectangle rRect )
// execute pending paint requests
ImplCheckUpdate( pThis );
+if (
pThis-IsNativeControlSupported(CTRL_WINDOW_BACKGROUND,PART_ENTIRE_CONTROL)
+
pThis-DrawNativeControl(CTRL_WINDOW_BACKGROUND,PART_ENTIRE_CONTROL,rRect,
+CTRL_STATE_ENABLED,ImplControlValue(0),rtl::OUString())
+)
+return;
+
ImplDockingWindowWrapper *pWrapper =
ImplGetDockingManager()-GetDockingWindowWrapper( pThis );
sal_Bool bIsInPopupMode = pThis-ImplIsInPopupMode();
commit 64124314a11493849e50c27ad210378743f39056
Author: Ruslan Kabatsayev b7.10110...@gmail.com
Date: Sun Jul 8 23:40:46 2012 +0400
Use native theme to draw TabBar background
Change-Id: Ia274a6438dbb1e3ae94d492df6b9ff86343dd272
diff --git a/svtools/source/control/tabbar.cxx
b/svtools/source/control/tabbar.cxx
index a922241..e844ef7 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -1328,8 +1328,12 @@ private:
}
-void TabBar::Paint( const Rectangle )
+void TabBar::Paint( const Rectangle rect )
{
+if(IsNativeControlSupported(CTRL_WINDOW_BACKGROUND,PART_ENTIRE_CONTROL))
+DrawNativeControl(CTRL_WINDOW_BACKGROUND,PART_ENTIRE_CONTROL,rect,
+CTRL_STATE_ENABLED,ImplControlValue(0),rtl::OUString());
+
// Items berechnen und ausgeben
sal_uInt16 nItemCount = (sal_uInt16)mpItemList-size();
if (!nItemCount)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PATCH][PUSHED] Native background for some more widgets
On Thu, 2012-07-12 at 14:50 +0400, Ruslan Kabatsayev wrote: Hello, These patches make TabBar and ToolBox have correct native background (needed for bg gradients and other non-flat-colored backgrounds). This looks reasonable to me, so pushed now. Or is there side-effects like the calc bottom tabbar stuff that means I shouldn't have pushed it :-) C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH][PUSHED] Native background for some more widgets
On Wed, Jul 25, 2012 at 3:59 PM, Caolán McNamara caol...@redhat.com wrote: Or is there side-effects like the calc bottom tabbar stuff that means I shouldn't have pushed it :-) No, these are just background, doesn't change anything for tabs themselves, so should be safe. Regards, Ruslan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] fdo#40152: replace with empty string in Basic IDE
On 25/07/12 11:34, János Uray wrote: It still works for me. Am I doing something wrong? most likely I am doing something stupid, let me rebuild and try again :-) Noel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/windows/msiglobal.pm |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8429bd67715a33751f4cfd50cb4be0346d78ee65 Author: Jan Holesovsky ke...@suse.cz Date: Wed Jul 25 14:04:04 2012 +0200 Make the relativisation of the path working even on Linux. Change-Id: Ib5e617d83d12c9c1faefee7f4a768e1eb1ffc492 diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm index 946f816..30fe348 100644 --- a/solenv/bin/modules/installer/windows/msiglobal.pm +++ b/solenv/bin/modules/installer/windows/msiglobal.pm @@ -130,7 +130,7 @@ sub make_relative_ddf_path } $sourcepath =~ s/\Q$windowstemppath\E//; -$sourcepath =~ s/^\\//; +$sourcepath =~ s/^[\\\/]//; return $sourcepath; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: oox/inc starmath/inc starmath/Library_sm.mk starmath/source sw/source
oox/inc/oox/mathml/export.hxx |4
starmath/Library_sm.mk |1
starmath/inc/document.hxx |2
starmath/inc/unomodel.hxx |1
starmath/source/document.cxx| 11 +
starmath/source/rtfexport.cxx | 228
starmath/source/rtfexport.hxx | 70
starmath/source/unomodel.cxx|5
sw/source/filter/ww8/rtfattributeoutput.cxx | 31 +++
sw/source/filter/ww8/rtfattributeoutput.hxx |2
10 files changed, 354 insertions(+), 1 deletion(-)
New commits:
commit 73e7cef672d7b47c7e8a2feda9a1499ea001b9cb
Author: Miklos Vajna vmik...@suse.cz
Date: Wed Jul 25 11:31:03 2012 +0200
export RTF_M{OMATH,R,F,FPR,TYPE,NUM,DEN,MATH}
Change-Id: If717d5d3b2179210516eec61959af0afa8b38319
diff --git a/oox/inc/oox/mathml/export.hxx b/oox/inc/oox/mathml/export.hxx
index 6c35feb..7d6a7db 100644
--- a/oox/inc/oox/mathml/export.hxx
+++ b/oox/inc/oox/mathml/export.hxx
@@ -29,6 +29,7 @@
#define _OOXMLEXPORT_HXX
#include sax/fshelper.hxx
+#include rtl/strbuf.hxx
#include oox/core/filterbase.hxx
#include oox/dllapi.h
@@ -36,13 +37,14 @@ namespace oox
{
/**
- Interface class, StarMath will implement writeFormulaOoxml() to write out
OOXML
+ Interface class, StarMath will implement writeFormula*() to write out markup
representing the formula.
*/
class OOX_DLLPUBLIC FormulaExportBase
{
public:
virtual void writeFormulaOoxml( ::sax_fastparser::FSHelperPtr
m_pSerializer, oox::core::OoxmlVersion version ) = 0;
+virtual void writeFormulaRtf( OStringBuffer rBuffer ) = 0;
protected:
FormulaExportBase();
diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk
index f23cfd9..779895d 100644
--- a/starmath/Library_sm.mk
+++ b/starmath/Library_sm.mk
@@ -75,6 +75,7 @@ $(eval $(call gb_Library_add_exception_objects,sm,\
starmath/source/node \
starmath/source/ooxmlexport \
starmath/source/ooxmlimport \
+starmath/source/rtfexport \
starmath/source/parse \
starmath/source/rect \
starmath/source/register \
diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx
index 6d25a96..43aefaa 100644
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -23,6 +23,7 @@
#define SMDLL 1
#include rtl/ustring.hxx
+#include rtl/strbuf.hxx
#include sfx2/docfac.hxx
#include sfx2/objsh.hxx
#include sot/sotref.hxx
@@ -155,6 +156,7 @@ class SmDocShell : public SfxObjectShell, public SfxListener
voidInvalidateCursor();
bool writeFormulaOoxml( ::sax_fastparser::FSHelperPtr m_pSerializer,
oox::core::OoxmlVersion version );
+void writeFormulaRtf(OStringBuffer rBuffer);
bool readFormulaOoxml( oox::formulaimport::XmlStream stream );
public:
diff --git a/starmath/inc/unomodel.hxx b/starmath/inc/unomodel.hxx
index bdbbae9..fc68089 100644
--- a/starmath/inc/unomodel.hxx
+++ b/starmath/inc/unomodel.hxx
@@ -93,6 +93,7 @@ public:
// oox::FormulaExportBase
virtual void writeFormulaOoxml( ::sax_fastparser::FSHelperPtr
m_pSerializer, oox::core::OoxmlVersion version );
+virtual void writeFormulaRtf(OStringBuffer rBuffer);
// oox::FormulaImportBase
virtual void readFormulaOoxml( oox::formulaimport::XmlStream stream );
virtual Size getFormulaSize() const;
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index 2aa4b82..65f2468 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -84,6 +84,7 @@
#include mathtype.hxx
#include ooxmlexport.hxx
#include ooxmlimport.hxx
+#include rtfexport.hxx
#include mathmlimport.hxx
#include mathmlexport.hxx
#include sfx2/sfxsids.hrc
@@ -986,6 +987,16 @@ bool SmDocShell::writeFormulaOoxml(
::sax_fastparser::FSHelperPtr m_pSerializer,
return aEquation.ConvertFromStarMath( m_pSerializer );
}
+void SmDocShell::writeFormulaRtf(OStringBuffer rBuffer)
+{
+if (!pTree)
+Parse();
+if (pTree !IsFormulaArranged())
+ArrangeFormula();
+SmRtfExport aEquation(pTree);
+aEquation.ConvertFromStarMath(rBuffer);
+}
+
bool SmDocShell::readFormulaOoxml( oox::formulaimport::XmlStream stream )
{
RTL_LOGFILE_CONTEXT( aLog, starmath: SmDocShell::readFormulaOoxml );
diff --git a/starmath/source/rtfexport.cxx b/starmath/source/rtfexport.cxx
new file mode 100644
index 000..f4e560f
--- /dev/null
+++ b/starmath/source/rtfexport.cxx
@@ -0,0 +1,228 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the License); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under
Re: [PATCH][PUSHED] Make default dark shadow non-black
On Tue, 2012-07-17 at 19:57 +0400, Ruslan Kabatsayev wrote: Oops, sorry. Here it is. On Tue, Jul 17, 2012 at 7:52 PM, Caolán McNamara caol...@redhat.com wrote: On Tue, 2012-07-17 at 18:23 +0400, Ruslan Kabatsayev wrote: Hello, This patch makes some plugins like gtk and kde4 have non-black dark shadow. Black (strict #00) resulted from lack of initialization both in StyleSettings and the plugins themselves. The patch makes dark shadow initialize in StyleSettings so that the plugins can have a reasonable default. Sounds reasonable, but there was no patch attached ? Pushed now to master. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Re: [PATCH] Final stretch of converting SV_DECL_PTRARR to STL containers stage 1/3
On 23/07/12 09:31, Noel Grandin wrote: Hi These patches convert various places from SV_DECL_PTRARR to STL containers. They have passed a full make check. thanks, mostly pushed these to master. except for patch #1, which did not apply (apparently Stephan changed sorted_vector) and is unnecessary for the patches in this mail; i've found adding an erase(const_iterator) method sufficient for now... also i've cleaned up that horrible SwAutoCompleteStrings thing to be less insane. ... and after a bit more cleanup finally removed the now empty svstdarr.hxx, which is progress. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - setup_native/source vcl/source vcl/unx
setup_native/source/win32/wintools/makecab/makefile.mk |5 ++---
setup_native/source/win32/wintools/msidb/makefile.mk |4 ++--
setup_native/source/win32/wintools/msiinfo/makefile.mk |5 ++---
setup_native/source/win32/wintools/msimsp/makefile.mk |5 ++---
setup_native/source/win32/wintools/msitran/makefile.mk |5 ++---
vcl/source/app/settings.cxx|2 ++
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |1 +
7 files changed, 13 insertions(+), 14 deletions(-)
New commits:
commit 5b9948108d5d552ce173441686d8719f10e81613
Author: Caolán McNamara caol...@redhat.com
Date: Wed Jul 25 13:13:49 2012 +0100
get rid of dmake warning
Change-Id: Ie10a8d53357255f4f326f399b59a3d81ebc7d2a6
dmake: Error executing ´o´: No such file or directory (Ignored)
diff --git a/setup_native/source/win32/wintools/makecab/makefile.mk
b/setup_native/source/win32/wintools/makecab/makefile.mk
index c7f277b..63604c3 100644
--- a/setup_native/source/win32/wintools/makecab/makefile.mk
+++ b/setup_native/source/win32/wintools/makecab/makefile.mk
@@ -20,8 +20,7 @@ TARGET=sn_makecab
.IF $(WINEGCC)==
@all:
@echo No winegcc present, not building makecab...
-.ENDIF
-
+.ELSE
@all: $(BIN)/makecab.exe $(BIN)/makecab.exe.so
$(BIN)/makecab.exe.so: $(BIN)/makecab.exe
@@ -33,4 +32,4 @@ $(BIN)/makecab.exe:
.INCLUDE : target.mk
-# -
+.ENDIF
diff --git a/setup_native/source/win32/wintools/msidb/makefile.mk
b/setup_native/source/win32/wintools/msidb/makefile.mk
index 96c100f..849f615 100644
--- a/setup_native/source/win32/wintools/msidb/makefile.mk
+++ b/setup_native/source/win32/wintools/msidb/makefile.mk
@@ -20,8 +20,7 @@ TARGET=sn_msidb
.IF $(WINEGCC)==
@all:
@echo No winegcc present, not building msidb...
-.ENDIF
-
+.ELSE
@all: $(BIN)/msidb.exe $(BIN)/msidb.exe.so
$(BIN)/msidb.exe.so: $(BIN)/msidb.exe
@@ -34,3 +33,4 @@ $(BIN)/msidb.exe:
.INCLUDE : target.mk
# -
+.ENDIF
diff --git a/setup_native/source/win32/wintools/msiinfo/makefile.mk
b/setup_native/source/win32/wintools/msiinfo/makefile.mk
index 8faf933..58d986e 100644
--- a/setup_native/source/win32/wintools/msiinfo/makefile.mk
+++ b/setup_native/source/win32/wintools/msiinfo/makefile.mk
@@ -20,8 +20,7 @@ TARGET=sn_msiinfo
.IF $(WINEGCC)==
@all:
@echo No winegcc present, not building msiinfo...
-.ENDIF
-
+.ELSE
@all: $(BIN)/msiinfo.exe $(BIN)/msiinfo.exe.so
$(BIN)/msiinfo.exe.so: $(BIN)/msiinfo.exe
@@ -33,4 +32,4 @@ $(BIN)/msiinfo.exe:
.INCLUDE : target.mk
-# -
+.ENDIF
diff --git a/setup_native/source/win32/wintools/msimsp/makefile.mk
b/setup_native/source/win32/wintools/msimsp/makefile.mk
index 8ecb5fc..0aabdf3 100644
--- a/setup_native/source/win32/wintools/msimsp/makefile.mk
+++ b/setup_native/source/win32/wintools/msimsp/makefile.mk
@@ -20,8 +20,7 @@ TARGET=sn_msimsp
.IF $(WINEGCC)==
@all:
@echo No winegcc present, not building msimsp...
-.ENDIF
-
+.ELSE
@all: $(BIN)/msimsp.exe $(BIN)/msimsp.exe.so
$(BIN)/msimsp.exe.so: $(BIN)/msimsp.exe
@@ -33,4 +32,4 @@ $(BIN)/msimsp.exe:
.INCLUDE : target.mk
-# -
+.ENDIF
diff --git a/setup_native/source/win32/wintools/msitran/makefile.mk
b/setup_native/source/win32/wintools/msitran/makefile.mk
index 910f8c5..f5a1dd4 100644
--- a/setup_native/source/win32/wintools/msitran/makefile.mk
+++ b/setup_native/source/win32/wintools/msitran/makefile.mk
@@ -20,8 +20,7 @@ TARGET=sn_msitran
.IF $(WINEGCC)==
@all:
@echo No winegcc present, not building msitran...
-.ENDIF
-
+.ELSE
@all: $(BIN)/msitran.exe $(BIN)/msitran.exe.so
$(BIN)/msitran.exe.so: $(BIN)/msitran.exe
@@ -33,4 +32,4 @@ $(BIN)/msitran.exe:
.INCLUDE : target.mk
-# -
+.ENDIF
commit 94932d121390c8a0e8d7cac7997a14ad49bb8676
Author: Ruslan Kabatsayev b7.10110...@gmail.com
Date: Tue Jul 17 18:18:35 2012 +0400
Make default dark shadow non-black
Change-Id: If517926b12633a96ad8088e007cfcd6d84e5c919
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 9684e38..aa6064f 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -474,8 +474,10 @@ void StyleSettings::Set3DColors( const Color rColor )
{
mpData-maLightColor= rColor;
mpData-maShadowColor = rColor;
+mpData-maDarkShadowColor=rColor;
mpData-maLightColor.IncreaseLuminance( 64 );
mpData-maShadowColor.DecreaseLuminance( 64 );
+mpData-maDarkShadowColor.DecreaseLuminance( 100 );
sal_uLong nRed= mpData-maLightColor.GetRed();
sal_uLong nGreen = mpData-maLightColor.GetGreen();
sal_uLong
[Libreoffice-commits] .: svl/inc
svl/inc/svl/svarray.hxx |1 + 1 file changed, 1 insertion(+) New commits: commit eb03fe6a5cc8a4d453fe8300f84bc0977546f585 Author: Caolán McNamara caol...@redhat.com Date: Wed Jul 25 13:22:53 2012 +0100 include osl/diagnose.h for OSL_ENSURE Change-Id: I64ed84dc6f5939e110a5051bc9c701e5dee1ba85 diff --git a/svl/inc/svl/svarray.hxx b/svl/inc/svl/svarray.hxx index b45a9ad..90f9765 100644 --- a/svl/inc/svl/svarray.hxx +++ b/svl/inc/svl/svarray.hxx @@ -80,6 +80,7 @@ #include string.h // memmove() #include limits.h // USHRT_MAX +#include osl/diagnose.h #include rtl/alloc.h #include tools/solar.h ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[REVIEW 3-6] fdo#51572 catch CLuceneError exceptions
This has been niggling me a bit since I saw the recent round of apparent startup problems on windows. I don't *think* its related, but on the other hand I couldn't reproduce the original circumstances that causes this indexing help of an extension made clucene throw an exception problem. http://cgit.freedesktop.org/libreoffice/core/commit/?id=4c912d3d8bd1ae01131e90fb4a2d8371a53ee888 just wraps the use of lucene in a try-catch block and makes the exception message available via its HelpIndexer::getErrorMessage C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Modifying comments to follow Doxygen standards
From Faisal al-otaibi fmalota...@kacst.edu.sa: Faisal al-otaibi has uploaded a new change for review. Change subject: Modifying comments to follow Doxygen standards .. Modifying comments to follow Doxygen standards Change-Id: Ic87c9c4f51af4da963835ac7311d998e69f61156 --- M cui/source/customize/eventdlg.hxx M cui/source/dialogs/SpellAttrib.hxx M cui/source/dialogs/commonlingui.hxx M cui/source/dialogs/thesdlg_impl.hxx M cui/source/inc/about.hxx M cui/source/inc/acccfg.hxx M cui/source/inc/autocdlg.hxx M cui/source/inc/backgrnd.hxx M cui/source/inc/bbdlg.hxx M cui/source/inc/border.hxx M cui/source/inc/cfg.hxx M cui/source/inc/chardlg.hxx 12 files changed, 71 insertions(+), 74 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/45/345/1 -- To view, visit https://gerrit.libreoffice.org/345 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic87c9c4f51af4da963835ac7311d998e69f61156 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Faisal al-otaibi fmalota...@kacst.edu.sa ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: i18npool/source
i18npool/source/localedata/data/list-dateacceptancepattern.awk | 151
++
1 file changed, 102 insertions(+), 49 deletions(-)
New commits:
commit 425e18c231f4f030b278050809ea1fa1f51d4bf2
Author: Eike Rathke er...@redhat.com
Date: Wed Jul 25 14:46:43 2012 +0200
display bequeath indicator and date separator and format code
diff --git a/i18npool/source/localedata/data/list-dateacceptancepattern.awk
b/i18npool/source/localedata/data/list-dateacceptancepattern.awk
index 1d47814..75f5db1 100644
--- a/i18npool/source/localedata/data/list-dateacceptancepattern.awk
+++ b/i18npool/source/localedata/data/list-dateacceptancepattern.awk
@@ -7,12 +7,13 @@
# 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/.
-# Usage: gawk -f list-dateacceptancepattern.awk *.xml [--html]
+# Usage: gawk -f list-dateacceptancepattern.awk *.xml [--sep [--html]]
#
# Outputs three lists of locales, one with DateAcceptancePattern elements
# defined, one with inherited LC_FORMAT elements and thus date patterns, and
# one where no DateAcceptancePattern are defined.
#
+# If --sep is given, display date separator for each locale.
# If --html is given as the last parameter, format output suitable for
# inclusion in HTML.
@@ -22,18 +23,19 @@ BEGIN {
html = 1
--ARGC
}
+sep = 0
+if (ARGV[ARGC-1] == --sep) {
+sep = 1
+--ARGC
+}
file =
offlocale = 0
-offpatterns = 1
+offpatterncount = 1
offinherit = 2
-inheritedcount = 0
-if (html)
-print p
-else
-print
-print Locales with explicit DateAcceptancePattern elements:
-if (html)
-print ul
+offbequeath = 3
+offdatesep = 4
+offdateformat = 5
+offpatterns = 6
}
@@ -41,13 +43,16 @@ file != FILENAME {
if (file)
endFile()
file = FILENAME
-patterns = 0
+patterncount = 0
inherited =
+formatelement = 0
+datesep =
+dateformat =
}
/DateAcceptancePattern/ {
split( $0, a, /|/ )
-pattern[patterns++] = a[3]
+patterns[patterncount++] = a[3]
}
# pattern inherited as well
@@ -56,30 +61,77 @@ file != FILENAME {
inherited = a[2]
}
+/FormatElement[^]* formatindex=21[^]*/ { formatelement = 1 }
+/FormatCode/ {
+if (formatelement)
+{
+formatelement = 0
+split( $0, a, /|/ )
+split( a[3], b, /[0-9A-Za-z\[\~\]]+/ )
+datesep = b[2]
+dateformat = a[3]
+}
+}
+
END {
if (file)
endFile()
-PROCINFO[sorted_in] = @ind_str_asc
-
fillAllInherited()
+PROCINFO[sorted_in] = @ind_str_asc
+
+if (html)
+print p
+else
+print
+printLine( Trailing + indicates that another locale inherits from this. )
+if (sep)
+printLine( Appended is the locale's date separator and edit format
code. )
+printLine()
+printLine( Locales with explicit DateAcceptancePattern elements: )
if (html)
{
+print ul
+for (i in LocaleList)
+{
+if (LocaleList[i][offpatterns][0])
+{
+print li getInheritance( LocaleList[i][offlocale],
LocaleList[i][offlocale])
+print ul
+for (p = 0; p LocaleList[i][offpatterncount]; ++p)
+{
+print li LocaleList[i][offpatterns][p]
+}
+print /ul
+}
+}
print /ul
print \np
}
else
+{
+for (i in LocaleList)
+{
+if (LocaleList[i][offpatterns][0])
+{
+print getInheritance( LocaleList[i][offlocale],
LocaleList[i][offlocale])
+for (p = 0; p LocaleList[i][offpatterncount]; ++p)
+{
+print LocaleList[i][offpatterns][p]
+}
+}
+}
print \n
+}
-print Locales inheriting patterns:
+printLine( Locales inheriting patterns: )
if (html)
{
-print br
for (i in LocaleList)
{
-if (LocaleList[i][offinherit] LocaleList[i][offpatterns])
+if (LocaleList[i][offinherit] LocaleList[i][offpatterncount])
print getInheritance( LocaleList[i][offlocale],
LocaleList[i][offlocale]) nbsp;nbsp;nbsp;
}
print \np
@@ -88,23 +140,20 @@ END {
{
for (i in LocaleList)
{
-if (LocaleList[i][offinherit] LocaleList[i][offpatterns])
+if (LocaleList[i][offinherit] LocaleList[i][offpatterncount])
print getInheritance( LocaleList[i][offlocale],
LocaleList[i][offlocale])
}
print \n
}
-print Locales without explicit DateAcceptancePattern elements:
-if (html)
-print br
-print (one implicit full date pattern is always generated)
-if (html)
-
[ANNOUNCE] libreoffice-3.6.0.3 tag created
Hi,
there have been created the libreoffice-3.6.0.3 tag (aka rc3). The
corresponding official builds will be available within next few days.
It will be used as final if no blocker is found.
See the attached list of changes against 3.6.0.2.
See also http://wiki.documentfoundation.org/ReleaseNotes/3.6
Now, you might switch your current 3-6 source tree to it using:
./g fetch --tags
./g checkout -b tag-libreoffice-3.6.0.3 libreoffice-3.6.0.3
Linux distro packages might find source tarballs at
http://dev-builds.libreoffice.org/pre-releases/src/
They will be available from the official page together with the builds.
See also the schedule at
http://wiki.documentfoundation.org/ReleasePlan#3.6_release
and release criteria at http://wiki.documentfoundation.org/Release_Criteria
Best Regards,
Petr
fdo#38056 ODF import: Page Borders handling broken [Michael Stahl]
fdo#39812 TABLE borders do not terminate where they should with merged cells [Michael Stahl]
fdo#44534 EDITING: Connectors cannot be selected [David Tardon]
fdo#47368 Many crashes when accessibility enabled on MacOS X [Michael Meeks]
fdo#48096 torn off color popups cause interaction difficulties in other windows [Thorsten Behrens]
fdo#50631 Vertical rulers completely unreadable on MacOS X [Thorsten Behrens]
fdo#50975 3.6.0b1: Segfault when accessing the LO About dialog with librsvg ≈ 2.16 [Caolán McNamara]
fdo#51252 LO cannot start (reports runtime error with Visual C++ Runtime Library) [Stephan Bergmann]
fdo#51772 general I/O error when opening a RTF file [Caolán McNamara]
fdo#51890 On MacOS X, the progress bar and the new splash screen graphics are mis-aligned [Stefan Knorr (astron)]
fdo#51943 OSX: Text color setting is broken [Thorsten Behrens]
fdo#52205 EDITING: Regression: reference to CSV becomes a string, not an integer [Eike Rathke]
fdo#52232 Hidden MediaWiki options page [Stephan Bergmann]
fdo#52240 [Task] EDITING: Incomplete Date values are no longer detected [Eike Rathke]
fdo#52241 Numbered bibliographies no longer work with more than a few entries [David Tardon]
fdo#52340 EDITING: CRASH when Copy+Paste row with conditional formatting to other sheet and back to inserted row [Markus Mohrhard]
fdo#52399 EDITING: Report-Builder does not show any properties [Stephan Bergmann]
fdo#52427 UI of Database Report Builder mostly without translations [David Tardon]
* {{fdo|38056}} ODF import: Page Borders handling broken [Michael Stahl]
* {{fdo|39812}} TABLE borders do not terminate where they should with merged
cells [Michael Stahl]
* {{fdo|44534}} EDITING: Connectors cannot be selected [David Tardon]
* {{fdo|47368}} Many crashes when accessibility enabled on MacOS X [Michael
Meeks]
* {{fdo|48096}} torn off color popups cause interaction difficulties in other
windows [Thorsten Behrens]
* {{fdo|50631}} Vertical rulers completely unreadable on MacOS X [Thorsten
Behrens]
* {{fdo|50975}} 3.6.0b1: Segfault when accessing the LO About dialog with
librsvg ≈ 2.16 [Caolán McNamara]
* {{fdo|51252}} LO cannot start (reports runtime error with Visual C++ Runtime
Library) [Stephan Bergmann]
* {{fdo|51772}} general I/O error when opening a RTF file [Caolán McNamara]
* {{fdo|51890}} On MacOS X, the progress bar and the new splash screen graphics
are mis-aligned [Stefan Knorr (astron)]
* {{fdo|51943}} OSX: Text color setting is broken [Thorsten Behrens]
* {{fdo|52205}} EDITING: Regression: reference to CSV becomes a string, not an
integer [Eike Rathke]
* {{fdo|52232}} Hidden MediaWiki options page [Stephan Bergmann]
* {{fdo|52240}} [Task] EDITING: Incomplete Date values are no longer detected
[Eike Rathke]
* {{fdo|52241}} Numbered bibliographies no longer work with more than a few
entries [David Tardon]
* {{fdo|52340}} EDITING: CRASH when Copy+Paste row with conditional formatting
to other sheet and back to inserted row [Markus Mohrhard]
* {{fdo|52399}} EDITING: Report-Builder does not show any properties [Stephan
Bergmann]
* {{fdo|52427}} UI of Database Report Builder mostly without translations
[David Tardon]
+ common
+ version 3.6.0.3, tag libreoffice-3.6.0.3 [Petr Mladek]
+ core
+ added abbreviated date acceptance patterns for [de-{AT,CH,LI,LU}] (fdo#52240) [Eike Rathke]
+ better page descriptor handling in RTF [Michael Stahl]
+ bring community branding in line with actual community logo [Stefan Knorr (astron)]
+ ConfigurationSet wrapper unusable for localized properties (fdo#52232) [Stephan Bergmann]
+ display themed progress meter instead of the native one (fdo#51890) [Stefan Knorr (astron)]
+ do not force all text cells in CSV import (fdo#52205) [Eike Rathke]
+ do not needlessly set DefaultContext of global ServiceManager (fdo#52399) [Stephan Bergmann]
+ failure to import a specific .rtf file (fdo#51772) [Caolán McNamara]
+ fix endless loop in libvisio with text fields in VSD6 [Fridrich Štrba]
+ fix have GetTextBoundRect() properly rotate bounds (fdo#50631) [Thorsten Behrens]
+ fix l10n of
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - vcl/source
vcl/source/app/vclevent.cxx |9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 68a81bb592f269712372173abcc50483dd556d56
Author: Michael Meeks michael.me...@suse.com
Date: Mon Jul 23 14:53:27 2012 +0100
fdo#47368 - fix one potential re-enterancy hazard around even emission
Change-Id: I8be50fb82d1333731dae825b1785e981fe69adbd
Signed-off-by: Norbert Thiebaud nthieb...@gmail.com
diff --git a/vcl/source/app/vclevent.cxx b/vcl/source/app/vclevent.cxx
index 613a659..2656c15 100644
--- a/vcl/source/app/vclevent.cxx
+++ b/vcl/source/app/vclevent.cxx
@@ -69,7 +69,10 @@ void VclEventListeners::Call( VclSimpleEvent* pEvent ) const
ImplDelData aDel( pWinEvent-GetWindow() );
while ( aIter != aCopy.end() ! aDel.IsDead() )
{
-(*aIter).Call( pEvent );
+Link rLink = *aIter;
+// check this hasn't been removed in some re-enterancy scenario
fdo#47368
+if( std::find(m_aListeners.begin(), m_aListeners.end(), rLink) !=
m_aListeners.end() )
+rLink.Call( pEvent );
aIter++;
}
}
@@ -77,7 +80,9 @@ void VclEventListeners::Call( VclSimpleEvent* pEvent ) const
{
while ( aIter != aCopy.end() )
{
-(*aIter).Call( pEvent );
+Link rLink = *aIter;
+if( std::find(m_aListeners.begin(), m_aListeners.end(), rLink) !=
m_aListeners.end() )
+rLink.Call( pEvent );
aIter++;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svtools/source
svtools/source/edit/textview.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit f5a625f61a4f0209a4ec74b919241593a56b5500
Author: Uray M. János uray.ja...@gmail.com
Date: Wed Jul 25 09:42:12 2012 +0200
fdo#40152 replace with empty string in Basic IDE
Change-Id: I2ee41160e5cb10694ccdb5a1cdaf7d4abfeb23bb
diff --git a/svtools/source/edit/textview.cxx b/svtools/source/edit/textview.cxx
index e03ef2e..481572b 100644
--- a/svtools/source/edit/textview.cxx
+++ b/svtools/source/edit/textview.cxx
@@ -1367,7 +1367,7 @@ void TextView::InsertNewText( const rtl::OUString rStr,
sal_Bool bSelect )
*/
sal_Int32 nLen = rStr.getLength();
sal_Int32 nPos = 0;
-while( nLen )
+do
{
sal_Int32 nChunkLen = nLen 65534 ? 65534 : nLen;
String aChunk( rStr.copy( nPos, nChunkLen ) );
@@ -1390,6 +1390,8 @@ void TextView::InsertNewText( const rtl::OUString rStr,
sal_Bool bSelect )
nLen -= nChunkLen;
nPos += nChunkLen;
}
+while( nLen );
+
mpImpl-mpTextEngine-UndoActionEnd();
mpImpl-mpTextEngine-FormatAndUpdate( this );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - l10ntools/source
l10ntools/source/help/HelpIndexer.cxx | 77 +++--
l10ntools/source/help/HelpIndexer_main.cxx | 12
2 files changed, 44 insertions(+), 45 deletions(-)
New commits:
commit e906bcc0c976a8565d05fbf6ef5cdda01642e611
Author: Caolán McNamara caol...@redhat.com
Date: Mon Jul 9 13:41:34 2012 +0100
Resolves: fdo#51572 catch CLuceneError throws and extract the error message
I can't reproduce fdo#51572, but catching the exception in
HelpIndexer::indexDocuments should resolve it anyway and make it non-fatal.
Collect the error message for retrieval via HelpIndexer::getErrorMessage
Change-Id: Id557b9f5ff968c398f76969591f5ee765e56aa5a
(cherry picked from commit 4c912d3d8bd1ae01131e90fb4a2d8371a53ee888)
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/l10ntools/source/help/HelpIndexer.cxx
b/l10ntools/source/help/HelpIndexer.cxx
index 3c595b4..72a0d04 100644
--- a/l10ntools/source/help/HelpIndexer.cxx
+++ b/l10ntools/source/help/HelpIndexer.cxx
@@ -34,7 +34,7 @@
#include rtl/ustrbuf.hxx
#include osl/file.hxx
#include osl/thread.h
-
+#include boost/scoped_ptr.hpp
#include algorithm
#include LuceneHelper.hxx
@@ -51,44 +51,51 @@ HelpIndexer::HelpIndexer(rtl::OUString const lang,
rtl::OUString const module,
d_contentDir = srcDir +
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(/content));
}
-bool HelpIndexer::indexDocuments() {
-if (!scanForFiles()) {
+bool HelpIndexer::indexDocuments()
+{
+if (!scanForFiles())
return false;
-}
-rtl::OUString sLang = d_lang.getToken(0, '-');
-bool bUseCJK = sLang == ja || sLang == ko || sLang == zh;
-
-// Construct the analyzer appropriate for the given language
-lucene::analysis::Analyzer *analyzer;
-if (bUseCJK)
-analyzer = new lucene::analysis::LanguageBasedAnalyzer(Lcjk);
-else
-analyzer = new lucene::analysis::standard::StandardAnalyzer();
-
-rtl::OUString ustrSystemPath;
-osl::File::getSystemPathFromFileURL(d_indexDir, ustrSystemPath);
-
-rtl::OString indexDirStr = rtl::OUStringToOString(ustrSystemPath,
osl_getThreadTextEncoding());
-lucene::index::IndexWriter writer(indexDirStr.getStr(), analyzer, true);
-//Double limit of tokens allowed, otherwise we'll get a too-many-tokens
-//exception for ja help. Could alternative ignore the exception and get
-//truncated results as per java-Lucene apparently
-
writer.setMaxFieldLength(lucene::index::IndexWriter::DEFAULT_MAX_FIELD_LENGTH*2);
-
-// Index the identified help files
-Document doc;
-for (std::setrtl::OUString::iterator i = d_files.begin(); i !=
d_files.end(); ++i) {
-helpDocument(*i, doc);
-writer.addDocument(doc);
-doc.clear();
-}
-writer.optimize();
+try
+{
+rtl::OUString sLang = d_lang.getToken(0, '-');
+bool bUseCJK = sLang == ja || sLang == ko || sLang == zh;
+
+// Construct the analyzer appropriate for the given language
+boost::scoped_ptrlucene::analysis::Analyzer analyzer;
+if (bUseCJK)
+analyzer.reset(new
lucene::analysis::LanguageBasedAnalyzer(Lcjk));
+else
+analyzer.reset(new lucene::analysis::standard::StandardAnalyzer());
-// Optimize the index
-writer.optimize();
+rtl::OUString ustrSystemPath;
+osl::File::getSystemPathFromFileURL(d_indexDir, ustrSystemPath);
+
+rtl::OString indexDirStr = rtl::OUStringToOString(ustrSystemPath,
osl_getThreadTextEncoding());
+lucene::index::IndexWriter writer(indexDirStr.getStr(),
analyzer.get(), true);
+//Double limit of tokens allowed, otherwise we'll get a too-many-tokens
+//exception for ja help. Could alternative ignore the exception and get
+//truncated results as per java-Lucene apparently
+
writer.setMaxFieldLength(lucene::index::IndexWriter::DEFAULT_MAX_FIELD_LENGTH*2);
+
+// Index the identified help files
+Document doc;
+for (std::setrtl::OUString::iterator i = d_files.begin(); i !=
d_files.end(); ++i) {
+helpDocument(*i, doc);
+writer.addDocument(doc);
+doc.clear();
+}
+writer.optimize();
+
+// Optimize the index
+writer.optimize();
+}
+catch (CLuceneError e)
+{
+d_error = rtl::OUString::createFromAscii(e.what());
+return false;
+}
-delete analyzer;
return true;
}
diff --git a/l10ntools/source/help/HelpIndexer_main.cxx
b/l10ntools/source/help/HelpIndexer_main.cxx
index bf42a4c..48e0f3e 100644
--- a/l10ntools/source/help/HelpIndexer_main.cxx
+++ b/l10ntools/source/help/HelpIndexer_main.cxx
@@ -99,16 +99,8 @@ int main(int argc, char **argv) {
rtl::OUString(module.c_str(), module.size(),
osl_getThreadTextEncoding()),
sDir, sDir);
-try
-{
-if (!indexer.indexDocuments()) {
-std::cerr
[PUSHED][3-6] Re: [REVIEW 3-6] fdo#51572 catch CLuceneError exceptions
On 25/07/12 14:38, Caolán McNamara wrote: This has been niggling me a bit since I saw the recent round of apparent startup problems on windows. I don't *think* its related, but on the other hand I couldn't reproduce the original circumstances that causes this indexing help of an extension made clucene throw an exception problem. http://cgit.freedesktop.org/libreoffice/core/commit/?id=4c912d3d8bd1ae01131e90fb4a2d8371a53ee888 just wraps the use of lucene in a try-catch block and makes the exception message available via its HelpIndexer::getErrorMessage so this is called in multiple places, and only one caught the exception; pushed to libreoffice-3-6 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED][PATCH] fdo#40152: replace with empty string in Basic IDE
On 25/07/12 13:01, Noel Power wrote: On 25/07/12 11:34, János Uray wrote: It still works for me. Am I doing something wrong? most likely I am doing something stupid, let me rebuild and try again :-) me stupid :-) but patch pushed Noel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Adding Extension for Experimental Thai Spelling
I'll cc this to the list if you don't mind, in order to archive it. I have no immediate great ideas. But I wonder if a view-word boundaries mode would be helpful, i.e. something that indicates the boundaries of the words that the software thinks exist. On Sun, 2012-07-15 at 21:40 +0700, Nathan Wells wrote: I hope you don't mind if I write and ask some more questions and ask for additional help in making the break iterator more functional in LibreOffice. Thank you again for your help implementing ICU for Khmer in LibreOffice. I downloaded a recent beta build with your code implemented and did some testing – it is great! But it also brought to my attention some issues that hamper the useability of the automatic breaking for Khmer (and I also believe for Thai – see this discussion - http://www.thaivisa.com/forum/topic/444360-thai-in-openoffice-on-ubuntu-lucid-lynx/#entry5160455). An automatic word and line breaker is very necessary for Khmer and Thai because traditionally they have no spaces between words, and so line-breaking and spell checking require the use of a zero-width space between words which is counterintuitive for most native speakers, and so spell checking goes widely unused. But now with the ICU code you implemented, Thai and Khmer can be automatically broken, and the results are quite good. But with its implementation in the real world, I have found some issues that I wanted to raise and also suggest possible solutions. I write this as an end-user, not so much as a programmer, nor do I claim to fully understand the inner-workings of ICU and LibreOffice (because I don't! ). First, I will do my best to explain the current results of the ICU break iterator with Khmer: Input sentence: មានប្រាជ្ញាឈ្លាសវៃឈ្មោះសិវកឥវលិយៈ Current ICU line-breaking: មាន|ប្រាជ្ញាឈ្លាស|វៃ|ឈ្មោះ|សិវ|កឥ|វលិ|យៈ Compared with the sentence manually broken: មាន|ប្រាជ្ញា|ឈ្លាសវៃ| ឈ្មោះ|សិវកឥវលិយៈ The differences should be clear – the ICU break iterator does not break the words with 100% accuracy. But, obviously with a dictionary approach, no automatic word breaker will ever break correctly 100% of the time. There is no solution that will currently automatically break Thai or Khmer 100% correctly (I have used, Hidden Markov Model breakers, dictionary probability breakers, and plain dictionary breakers – none work 100% of a time) because, especially for names and places, words in Khmer can just defy all rules and patterns. Perhaps in the future, a solution will arise that can break Khmer words with 100% accuracy, but at this time, we are far from any such solution. And this is an important reality to remember, because it differentiates Thai and Khmer (and possibly other languages that do not use spaces between words) from Western languages such as English, where a line-breaker and word-breaker can be correct 100% of the time. As an end user, this inability of the ICU break iterator to break Khmer words with 100% causes usability issues when it comes to correcting the automatic breaks that are broken in error. Here are some reasons why: 1. In LibreOffice a user cannot see where the words have been broken, they are invisible. 2. Therefore, trying to use a U+2060 (No Width Word Joiner) to correct an error in order to correctly spell check is very difficult, because the user cannot see where to place the joiner in order to join the word (as in the example case above the word សិវ|កឥ|វលិ|យៈ actually needs three U+2060 characters to join it to be treated as one word, but the end user does not know this because the breaks are invisible. FWIW with view-field shading on you should see a little gray mark where the word joiner exists. At least I do anyway. 1. Even if LibreOffice were able to change their code so that the end user could see the word-breaks, adding three U+2060 characters is quite laborious just to fix one word so that it can be spell checked correctly (as one word, rather than spell checked as four individual words). One possible solution to this issue is by how the ICU Break Iterator interacts with zero-width spaces (U+200B) in LibreOffice. Before ICU code was enabled to automatically break Khmer, if an end-user wanted to spell check Khmer, they had to manually place U+200B characters to separate words. This solution worked quite well, but was counterintuitive to most native speakers, because Khmer has no spaces (as stated before). But with this solution, an end-user could be sure that their document was broken with 100% accuracy, if there was no human error (something automatic solutions cannot do – it is more along the lines of 80% accurate). What I propose, is that the break iterator code in LibreOffice looks for U+200B characters in a given string and considers them as a sign to NOT
Re: Adding Extension for Experimental Thai Spelling
Thanks for your reply. Yes, a view-word boundaries mode would be very helpful (or even incorporating the current view-field shading to include viewing 'gray marks' at the automatic ICU breaking so that users can see what is being done). Would this be hard to implement? Also, we are making some changes to the ICU break iterator dictionary for Khmer - and I've heard there will be some changes in ICU 50 which should improve results for Khmer. If anyone has any ideas - it would be appreciated. Thanks! Nathan On Wed, Jul 25, 2012 at 8:41 PM, Caolán McNamara caol...@redhat.com wrote: I'll cc this to the list if you don't mind, in order to archive it. I have no immediate great ideas. But I wonder if a view-word boundaries mode would be helpful, i.e. something that indicates the boundaries of the words that the software thinks exist. On Sun, 2012-07-15 at 21:40 +0700, Nathan Wells wrote: I hope you don't mind if I write and ask some more questions and ask for additional help in making the break iterator more functional in LibreOffice. Thank you again for your help implementing ICU for Khmer in LibreOffice. I downloaded a recent beta build with your code implemented and did some testing – it is great! But it also brought to my attention some issues that hamper the useability of the automatic breaking for Khmer (and I also believe for Thai – see this discussion - http://www.thaivisa.com/forum/topic/444360-thai-in-openoffice-on-ubuntu-lucid-lynx/#entry5160455 ). An automatic word and line breaker is very necessary for Khmer and Thai because traditionally they have no spaces between words, and so line-breaking and spell checking require the use of a zero-width space between words which is counterintuitive for most native speakers, and so spell checking goes widely unused. But now with the ICU code you implemented, Thai and Khmer can be automatically broken, and the results are quite good. But with its implementation in the real world, I have found some issues that I wanted to raise and also suggest possible solutions. I write this as an end-user, not so much as a programmer, nor do I claim to fully understand the inner-workings of ICU and LibreOffice (because I don't! ). First, I will do my best to explain the current results of the ICU break iterator with Khmer: Input sentence: មានប្រាជ្ញាឈ្លាសវៃឈ្មោះសិវកឥវលិយៈ Current ICU line-breaking: មាន|ប្រាជ្ញាឈ្លាស|វៃ|ឈ្មោះ|សិវ|កឥ|វលិ|យៈ Compared with the sentence manually broken: មាន|ប្រាជ្ញា|ឈ្លាសវៃ| ឈ្មោះ|សិវកឥវលិយៈ The differences should be clear – the ICU break iterator does not break the words with 100% accuracy. But, obviously with a dictionary approach, no automatic word breaker will ever break correctly 100% of the time. There is no solution that will currently automatically break Thai or Khmer 100% correctly (I have used, Hidden Markov Model breakers, dictionary probability breakers, and plain dictionary breakers – none work 100% of a time) because, especially for names and places, words in Khmer can just defy all rules and patterns. Perhaps in the future, a solution will arise that can break Khmer words with 100% accuracy, but at this time, we are far from any such solution. And this is an important reality to remember, because it differentiates Thai and Khmer (and possibly other languages that do not use spaces between words) from Western languages such as English, where a line-breaker and word-breaker can be correct 100% of the time. As an end user, this inability of the ICU break iterator to break Khmer words with 100% causes usability issues when it comes to correcting the automatic breaks that are broken in error. Here are some reasons why: 1. In LibreOffice a user cannot see where the words have been broken, they are invisible. 2. Therefore, trying to use a U+2060 (No Width Word Joiner) to correct an error in order to correctly spell check is very difficult, because the user cannot see where to place the joiner in order to join the word (as in the example case above the word សិវ|កឥ|វលិ|យៈ actually needs three U+2060 characters to join it to be treated as one word, but the end user does not know this because the breaks are invisible. FWIW with view-field shading on you should see a little gray mark where the word joiner exists. At least I do anyway. 1. Even if LibreOffice were able to change their code so that the end user could see the word-breaks, adding three U+2060 characters is quite laborious just to fix one word so that it can be spell checked correctly (as one word, rather than spell checked as four individual words). One possible solution to this issue is by how the ICU Break Iterator interacts with zero-width spaces (U+200B) in LibreOffice. Before ICU code was enabled to
[PATCH] fixed Replace all message in Basic IDE
In Basic IDE, Replace all said Search key replaced times, so without
the number.
This patch fixes it. (The nFound was treated as a character instead of an
integer.)
Uray M. János
From e6266f1374ccb193314dcb8ac882897b2b5150a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Uray=20M.=20J=C3=A1nos?= uray.ja...@gmail.com
Date: Wed, 25 Jul 2012 16:06:39 +0200
Subject: [PATCH] fixed Replace all message in Basic IDE
Change-Id: I3e4fdb07ea5a1d1d47bcf190a5ee96800b44f89b
---
basctl/source/basicide/basides1.cxx |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index 48befb7..940bf80 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -147,7 +147,7 @@ void BasicIDEShell::ExecuteCurrent( SfxRequest rReq )
{
// memorize item because of the adjustments...
BasicIDEGlobals::GetExtraData()-SetSearchItem( (const SvxSearchItem)rItem );
-sal_uInt16 nFound = 0;
+int nFound = 0;
sal_Bool bCanceled = sal_False;
if ( ((const SvxSearchItem)rItem).GetCommand() == SVX_SEARCHCMD_REPLACE_ALL )
{
--
1.7.7
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: cui/source o3tl/inc sw/source
cui/source/tabpages/autocdlg.cxx |8
o3tl/inc/o3tl/sorted_vector.hxx |5 -
sw/source/core/doc/acmplwrd.cxx |3 +--
sw/source/core/doc/docfld.cxx |2 +-
sw/source/core/docnode/nodes.cxx |4 ++--
sw/source/core/fields/fldlst.cxx |2 +-
sw/source/filter/html/htmlfly.cxx |2 +-
7 files changed, 10 insertions(+), 16 deletions(-)
New commits:
commit f317119be32071e9ef82f3d8ff53170a5456ea0c
Author: Michael Stahl mst...@redhat.com
Date: Wed Jul 25 16:21:05 2012 +0200
sorted_vector: MSVC doesn't know which erase to call
Change-Id: Ib81388db2f93db662bb5439565f311835b08073e
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index b2923f8..b770c8c 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -1540,7 +1540,7 @@ sal_Bool OfaAutocorrExceptPage::FillItemSet( SfxItemSet
)
if( !lcl_FindInArray(rArrays.aDoubleCapsStrings, *pString))
{
delete (*pWrdList)[ i ];
- pWrdList-erase( pWrdList-begin() + i );
+ pWrdList-erase(i);
}
}
@@ -1565,7 +1565,7 @@ sal_Bool OfaAutocorrExceptPage::FillItemSet( SfxItemSet
)
if( !lcl_FindInArray(rArrays.aAbbrevStrings, *pString))
{
delete (*pCplList)[ i ];
-pCplList-erase( pCplList-begin() + i );
+pCplList-erase(i);
}
}
@@ -1594,7 +1594,7 @@ sal_Bool OfaAutocorrExceptPage::FillItemSet( SfxItemSet
)
if( USHRT_MAX == aDoubleCapsLB.GetEntryPos(*pString) )
{
delete (*pWrdList)[ i ];
-pWrdList-erase( pWrdList-begin() + i );
+pWrdList-erase(i);
}
}
nCount = aDoubleCapsLB.GetEntryCount();
@@ -1619,7 +1619,7 @@ sal_Bool OfaAutocorrExceptPage::FillItemSet( SfxItemSet
)
if( USHRT_MAX == aAbbrevLB.GetEntryPos(*pString) )
{
delete (*pCplList)[ i ];
-pCplList-erase( pCplList-begin() + i );
+pCplList-erase(i);
}
}
nCount = aAbbrevLB.GetEntryCount();
diff --git a/o3tl/inc/o3tl/sorted_vector.hxx b/o3tl/inc/o3tl/sorted_vector.hxx
index bf1cca5..48ad0bc 100644
--- a/o3tl/inc/o3tl/sorted_vector.hxx
+++ b/o3tl/inc/o3tl/sorted_vector.hxx
@@ -68,11 +68,6 @@ public:
}
// hack: public erase with const_iterator, should not change sort order
-void erase(const_iterator const position)
-{
-base_t::erase(begin_nonconst() + (position - begin()));
-}
-
void erase(const_iterator const first, const_iterator const last)
{
base_t::erase(begin_nonconst() + (first - begin()),
diff --git a/sw/source/core/doc/acmplwrd.cxx b/sw/source/core/doc/acmplwrd.cxx
index 20a43ad..f7ff984 100644
--- a/sw/source/core/doc/acmplwrd.cxx
+++ b/sw/source/core/doc/acmplwrd.cxx
@@ -320,7 +320,7 @@ void SwAutoCompleteWord::SetMaxCount( sal_uInt16 nNewMax )
m_WordList.find(aLRULst[ nLRUIndex++ ]);
OSL_ENSURE( m_WordList.end() != it, String not found );
editeng::IAutoCompleteString *const pDel = *it;
-m_WordList.erase(it);
+m_WordList.erase(it - m_WordList.begin());
delete pDel;
}
aLRULst.erase( aLRULst.begin() + nNewMax - 1, aLRULst.end() );
@@ -383,7 +383,6 @@ void SwAutoCompleteWord::CheckChangedList(
SwAutoCompleteString *const pDel =
dynamic_castSwAutoCompleteString*(m_WordList[nMyPos]);
m_WordList.erase(nMyPos);
-
SwAutoCompleteStringPtrDeque::iterator it = std::find(
aLRULst.begin(), aLRULst.end(), pDel );
OSL_ENSURE( aLRULst.end() != it, String not found );
aLRULst.erase( it );
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index a8ae938..6f1fdf6 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -2191,7 +2191,7 @@ void SwDocUpdtFld::InsDelFldInFldLst( sal_Bool bIns,
const SwTxtFld rFld )
if( rFld == (*pFldSortLst)[ n ]-GetPointer() )
{
delete (*pFldSortLst)[n];
-pFldSortLst-erase( pFldSortLst-begin() + n );
+pFldSortLst-erase(n);
n--; // one field can occur multiple times
}
}
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index d8d53e5..400fe2d 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -1226,7 +1226,7 @@ void SwNodes::Delete(const SwNodeIndex rIndex, sal_uLong
nNodes)
pOutlineNds-Seek_Entry( pNd, nIdxPos ))
{
// loesche die
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - vcl/source vcl/unx
vcl/source/app/settings.cxx |2 ++
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |1 +
2 files changed, 3 insertions(+)
New commits:
commit 38fd6c8498b18121413228a676e0cf7653c299fe
Author: Ruslan Kabatsayev b7.10110...@gmail.com
Date: Tue Jul 17 18:18:35 2012 +0400
Make default dark shadow non-black
Change-Id: If517926b12633a96ad8088e007cfcd6d84e5c919
Signed-off-by: Jan Holesovsky ke...@suse.cz
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 02457d1..dfdfa95 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -474,8 +474,10 @@ void StyleSettings::Set3DColors( const Color rColor )
{
mpData-maLightColor= rColor;
mpData-maShadowColor = rColor;
+mpData-maDarkShadowColor=rColor;
mpData-maLightColor.IncreaseLuminance( 64 );
mpData-maShadowColor.DecreaseLuminance( 64 );
+mpData-maDarkShadowColor.DecreaseLuminance( 100 );
sal_uLong nRed= mpData-maLightColor.GetRed();
sal_uLong nGreen = mpData-maLightColor.GetGreen();
sal_uLong nBlue = mpData-maLightColor.GetBlue();
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index e1c8e2d..4acf112 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -3730,6 +3730,7 @@ void GtkSalGraphics::updateSettings( AllSettings
rSettings )
std::fprintf( stderr, MenuBarTextColor = %x (%d)\n,
(int)aStyleSet.GetMenuBarTextColor().GetColor(),
aStyleSet.GetMenuBarTextColor().GetLuminance() );
std::fprintf( stderr, LightColor = %x (%d)\n,
(int)aStyleSet.GetLightColor().GetColor(),
aStyleSet.GetLightColor().GetLuminance() );
std::fprintf( stderr, ShadowColor = %x (%d)\n,
(int)aStyleSet.GetShadowColor().GetColor(),
aStyleSet.GetShadowColor().GetLuminance() );
+std::fprintf( stderr, DarkShadowColor = %x (%d)\n,
(int)aStyleSet.GetDarkShadowColor().GetColor(),
aStyleSet.GetDarkShadowColor().GetLuminance() );
#endif
// Awful hack for menu separators in the Sonar and similar themes.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 4 commits - i18npool/source
i18npool/source/localedata/data/ak_GH.xml |1 + i18npool/source/localedata/data/ar_DZ.xml |1 + i18npool/source/localedata/data/ar_EG.xml |1 + i18npool/source/localedata/data/ar_OM.xml |1 + i18npool/source/localedata/data/ast_ES.xml |1 + i18npool/source/localedata/data/ee_GH.xml |1 + i18npool/source/localedata/data/el_GR.xml |1 + i18npool/source/localedata/data/en_AU.xml |1 + i18npool/source/localedata/data/en_GH.xml |1 + i18npool/source/localedata/data/en_JM.xml |1 + i18npool/source/localedata/data/en_NA.xml |1 + i18npool/source/localedata/data/en_ZA.xml |1 + i18npool/source/localedata/data/es_AR.xml |1 + i18npool/source/localedata/data/es_BO.xml |1 + i18npool/source/localedata/data/es_CO.xml |1 + i18npool/source/localedata/data/es_CR.xml |1 + i18npool/source/localedata/data/es_DO.xml |1 + i18npool/source/localedata/data/es_EC.xml |1 + i18npool/source/localedata/data/es_GT.xml |1 + i18npool/source/localedata/data/es_PE.xml |1 + i18npool/source/localedata/data/eu.xml |1 + i18npool/source/localedata/data/fa_IR.xml |1 + i18npool/source/localedata/data/fur_IT.xml |1 + i18npool/source/localedata/data/gl_ES.xml |1 + i18npool/source/localedata/data/gug_PY.xml |1 + i18npool/source/localedata/data/ha_GH.xml |1 + i18npool/source/localedata/data/haw_US.xml |1 + i18npool/source/localedata/data/he_IL.xml |1 + i18npool/source/localedata/data/hil_PH.xml |1 + i18npool/source/localedata/data/ht_HT.xml |1 + i18npool/source/localedata/data/hy_AM.xml |1 + i18npool/source/localedata/data/ia.xml |1 + i18npool/source/localedata/data/id_ID.xml |1 + i18npool/source/localedata/data/jbo.xml|1 + i18npool/source/localedata/data/ka_GE.xml |1 + i18npool/source/localedata/data/km_KH.xml |1 + i18npool/source/localedata/data/ko_KR.xml |1 + i18npool/source/localedata/data/ku_TR.xml |1 + i18npool/source/localedata/data/la_VA.xml |1 + i18npool/source/localedata/data/lg_UG.xml |1 + i18npool/source/localedata/data/lif_NP.xml |1 + i18npool/source/localedata/data/lo_LA.xml |1 + i18npool/source/localedata/data/mt_MT.xml |1 + i18npool/source/localedata/data/my_MM.xml |1 + i18npool/source/localedata/data/myv_RU.xml |1 + i18npool/source/localedata/data/ne_NP.xml |1 + i18npool/source/localedata/data/om_ET.xml |1 + i18npool/source/localedata/data/or_IN.xml |1 + i18npool/source/localedata/data/pjt_AU.xml |1 + i18npool/source/localedata/data/rue_SK.xml |1 + i18npool/source/localedata/data/rw_RW.xml |1 + i18npool/source/localedata/data/sc_IT.xml |1 + i18npool/source/localedata/data/sg_CF.xml |1 + i18npool/source/localedata/data/so_SO.xml |1 + i18npool/source/localedata/data/sw_TZ.xml |1 + i18npool/source/localedata/data/th_TH.xml |1 + i18npool/source/localedata/data/ti_ER.xml |1 + i18npool/source/localedata/data/tpi_PG.xml |1 + i18npool/source/localedata/data/uk_UA.xml |1 + i18npool/source/localedata/data/ur_PK.xml |1 + i18npool/source/localedata/data/vi_VN.xml |1 + i18npool/source/localedata/data/wa_BE.xml |1 + i18npool/source/localedata/data/zh_HK.xml |1 + i18npool/source/localedata/data/zh_SG.xml |1 + 64 files changed, 64 insertions(+) New commits: commit 05035c894644f700fdc972b51dbd918f7530b2d5 Author: Eike Rathke er...@redhat.com Date: Wed Jul 25 15:56:12 2012 +0200 fdo#52240 added M/D date acceptance pattern to locales with M/D/Y edit format Change-Id: Ic45b89d5cc1238bb58a29ed0e5fe967e23caefd5 diff --git a/i18npool/source/localedata/data/ak_GH.xml b/i18npool/source/localedata/data/ak_GH.xml index d765e29..be6a4b1 100644 --- a/i18npool/source/localedata/data/ak_GH.xml +++ b/i18npool/source/localedata/data/ak_GH.xml @@ -52,6 +52,7 @@ MeasurementSystemmetric/MeasurementSystem /LC_CTYPE LC_FORMAT replaceFrom=[CURRENCY] replaceTo=[$âµ-62F] +DateAcceptancePatternM/D/DateAcceptancePattern FormatElement msgid=FixedFormatskey1 default=true type=medium usage=FIXED_NUMBER formatindex=0 FormatCodeGeneral/FormatCode /FormatElement diff --git a/i18npool/source/localedata/data/ee_GH.xml b/i18npool/source/localedata/data/ee_GH.xml index 7f1ced1..376b0dc 100644 --- a/i18npool/source/localedata/data/ee_GH.xml +++ b/i18npool/source/localedata/data/ee_GH.xml @@ -52,6 +52,7 @@ MeasurementSystemmetric/MeasurementSystem /LC_CTYPE LC_FORMAT replaceFrom=[CURRENCY] replaceTo=[$âµ-637] +DateAcceptancePatternM/D/DateAcceptancePattern FormatElement msgid=FixedFormatskey1 default=true type=medium usage=FIXED_NUMBER formatindex=0 FormatCodeGeneral/FormatCode /FormatElement diff --git a/i18npool/source/localedata/data/ha_GH.xml b/i18npool/source/localedata/data/ha_GH.xml index 6f46c86..92c3f49 100644 ---
Re: [PATCH (partial)] Writer autocompletion feature
On 23.07.2012 15:24, Michael Meeks wrote: Hi Nico, On Mon, 2012-07-23 at 16:11 +, Nico Weyand wrote: May I ask why it has been decided to switch from LGPL to MPL/LGPL anyway ? Of course ! :-) there is a bit of blurb in the FAQ here: http://wiki.documentfoundation.org/Development/Relicensing As I see it, MPL does grant a much weaker protection for the libreoffice code than LGPL, because one could simply take one of the open source code files from libreoffice and include it within a closed source project without having to release the source code of other files of that project. Sure, right; it is a module-level license. On the other hand, this can also be achieved with the LGPL by simply adding misc. entry points and linking to the module instead of including it. For the strongest protections we'd want the GPL I guess. For a lots of commits, this isn't a big issue, however for a datastructure implementation (like the code I have committed), it is, as it could be used without further changes in a lot of projects... At the moment, one factor is trying to win back IBM who have an outright allergy to anything with GPLv3 on it; the MPLv2 they dislike too - perhaps because it forces them to release their bug-fixes as they ship, and makes it hard for them to compete on quality - but they can at least accept it. Clearly their ideal is the Apache license that is profoundly and unhelpfully weak all over :-) [ IMNSHO ] So; if you're really concerned by people using your data-structure without turning that one module into a libDataStructure and using it like that, then that's fine - but altering the whole project's license to suit your change is rather a big ask :-) I notice you spent a lot of time writing a new tree structure; is there some profile data or detail that explains why that is needed ? is it a space efficiency thing ? or a time / lookup issue ? in general all new pointer manipulation code contains plenty of bugs no matter how clever the author :-) Anyhow - sorry you're out of time to work on this, it looks interesting. All the best, Michael. OK, arguments accepted (even if I am still not convinced 100% :D); I'll post something on the mailing list for dual licensing. As for the reason of this new tree structure, it's quite simple: 1. The current implementation gives the first word that matches a given prefix, so the word you get as a suggestion is in many cases a little suboptimal. My tree gives the most probable answer. 2. I haven't looked into it very deeply, but currently the words seem to be stored within a list. This is inefficient (on a side note: I've got performance issues while typing when using libreoffice in the past on my netbook). This tree on the other hand is supposed to be efficient, especially as it stores both the current position within a word (so we don't need to start reading the tree on its root node each time the user types a new letter) and the most probable next char for each node (so we don't need to compare probabilities etc. to get the next letter in the chain leading to the most probable completion for a given prefix). 3. Currently, autocompletion word list is build each time Libreoffice opens a document and it doesn't seem to differ between the language of the requested word. There has been a request for making these word lists permanent and language dependent, which is why for example I've included a language property within the structure. I hope these are enough arguments for you; they certainly were for me :-) Greetings, Nico ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Relicensing] MPL/LGPLv3+
Hi, I'm hereby declaring that all the code I have committed in the past to the libreoffice project, as well as all the code that I might commit in the future, may be used under the terms and conditions of either (or both) the MPLv2 and LGPLv3+ licenses. Greetings, Nico Weyand ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 5 commits - filter/inc filter/Library_msfilter.mk filter/Package_inc.mk filter/source starmath/source sw/source
filter/Library_msfilter.mk |1
filter/Package_inc.mk |1
filter/inc/filter/msfilter/rtfutil.hxx | 54 +++
filter/source/msfilter/rtfutil.cxx | 151
starmath/source/rtfexport.cxx | 210 ++--
sw/source/filter/ww8/rtfattributeoutput.cxx | 31 ++--
sw/source/filter/ww8/rtfexport.cxx | 129 +
sw/source/filter/ww8/rtfexport.hxx |3
sw/source/filter/ww8/rtfsdrexport.cxx |7
9 files changed, 437 insertions(+), 150 deletions(-)
New commits:
commit 1ec55802d90334d2b6112cfc0df43c4cedcd3d1b
Author: Miklos Vajna vmik...@suse.cz
Date: Wed Jul 25 17:00:45 2012 +0200
export RTF_MLIM and related keywords
Change-Id: I533807168fea34216bfd2a7cf64d13bca4815d25
diff --git a/starmath/source/rtfexport.cxx b/starmath/source/rtfexport.cxx
index dbce7ed..493a483 100644
--- a/starmath/source/rtfexport.cxx
+++ b/starmath/source/rtfexport.cxx
@@ -41,7 +41,7 @@ SmRtfExport::SmRtfExport(const SmNode* pIn)
bool SmRtfExport::ConvertFromStarMath(OStringBuffer rBuffer)
{
-if (m_pTree == NULL)
+if (!m_pTree)
return false;
m_pBuffer = rBuffer;
m_pBuffer-append({ OOO_STRING_SVTOOLS_RTF_IGNORE \\moMath);
@@ -68,6 +68,9 @@ void SmRtfExport::HandleNode(const SmNode* pNode, int nLevel)
case NBRACE:
HandleBrace( static_cast const SmBraceNode* ( pNode ), nLevel );
break;
+case NOPER:
+HandleOperator(static_castconst SmOperNode*(pNode), nLevel);
+break;
case NBINHOR:
HandleBinaryOperation(static_castconst SmBinHorNode*(pNode),
nLevel);
break;
@@ -275,9 +278,78 @@ OString mathSymbolToString(const SmNode* node)
}
}
-void SmRtfExport::HandleOperator(const SmOperNode* /*pNode*/, int /*nLevel*/)
+void SmRtfExport::HandleOperator(const SmOperNode* pNode, int nLevel)
{
-SAL_INFO(starmath.rtf, TODO: OSL_THIS_FUNC);
+SAL_INFO(starmath.rtf, Operator: int(pNode-GetToken().eType));
+switch (pNode-GetToken().eType)
+{
+case TINT:
+case TIINT:
+case TIIINT:
+case TLINT:
+case TLLINT:
+case TLLLINT:
+case TPROD:
+case TCOPROD:
+case TSUM:
+{
+const SmSubSupNode* subsup = pNode-GetSubNode(0)-GetType() ==
NSUBSUP ? static_castconst SmSubSupNode*(pNode-GetSubNode(0)) : 0;
+const SmNode* operation = subsup ? subsup-GetBody() :
pNode-GetSubNode(0);
+m_pBuffer-append({\\mnary );
+m_pBuffer-append({\\mnaryPr );
+m_pBuffer-append({\\mchr );
+m_pBuffer-append(mathSymbolToString(operation));
+m_pBuffer-append(}); // mchr
+if (!subsup || !subsup-GetSubSup(CSUB))
+m_pBuffer-append({\\msubHide 1});
+if (!subsup || !subsup-GetSubSup(CSUP))
+m_pBuffer-append({\\msupHide 1});
+m_pBuffer-append(}); // mnaryPr
+if (!subsup || !subsup-GetSubSup(CSUB))
+m_pBuffer-append({\\msub });
+else
+{
+m_pBuffer-append({\\msub );
+HandleNode(subsup-GetSubSup(CSUB), nLevel + 1);
+m_pBuffer-append(}); // msub
+}
+if (!subsup || !subsup-GetSubSup( CSUP ))
+m_pBuffer-append({\\msup });
+else
+{
+m_pBuffer-append({\\msup );
+HandleNode(subsup-GetSubSup(CSUP), nLevel + 1);
+m_pBuffer-append(}); // msup
+}
+m_pBuffer-append({\\me );
+HandleNode(pNode-GetSubNode(1), nLevel + 1); // body
+m_pBuffer-append(}); // me
+m_pBuffer-append(}); // mnary
+break;
+}
+case TLIM:
+m_pBuffer-append({\\mfunc );
+m_pBuffer-append({\\mfName );
+m_pBuffer-append({\\mlimLow );
+m_pBuffer-append({\\me );
+HandleNode(pNode-GetSymbol(), nLevel + 1);
+m_pBuffer-append(}); // me
+m_pBuffer-append({\\mlim );
+if (const SmSubSupNode* subsup = pNode-GetSubNode(0)-GetType()
== NSUBSUP ? static_castconst SmSubSupNode*( pNode-GetSubNode(0)) : 0)
+if (subsup-GetSubSup(CSUB))
+HandleNode(subsup-GetSubSup(CSUB), nLevel + 1);
+m_pBuffer-append(}); // mlim
+m_pBuffer-append(}); // mlimLow
+m_pBuffer-append(}); // mfName
+m_pBuffer-append({\\me );
+HandleNode(pNode-GetSubNode(1), nLevel + 1); // body
+m_pBuffer-append(}); // me
+m_pBuffer-append(}); // mfunc
+break;
+default:
+SAL_INFO(starmath.rtf, TODO: OSL_THIS_FUNC unhandled
oper type);
+break;
+}
}
void
[Libreoffice-commits] .: 3 commits - setup_native/source solenv/bin
setup_native/source/win32/wintools/msiinfo/msiinfo.c |2 +-
solenv/bin/modules/installer/windows/admin.pm| 17 +
solenv/bin/modules/installer/windows/msiglobal.pm|2 +-
3 files changed, 19 insertions(+), 2 deletions(-)
New commits:
commit 3605cb216faab6659f4bf90e76d9387df3ac08f6
Author: Jan Holesovsky ke...@suse.cz
Date: Wed Jul 25 17:30:14 2012 +0200
More helpful error message.
Change-Id: I009fc8a8b84355a35adc60b7008ebe8b96965c8e
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm
b/solenv/bin/modules/installer/windows/msiglobal.pm
index 30fe348..97edc40 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -988,7 +988,7 @@ sub write_summary_into_msi_database
if ($returnvalue)
{
-$infoline = ERROR: Could not execute $msiinfo!\n;
+$infoline = ERROR: Could not execute $systemcall\n;
push( @installer::globals::logfileinfo, $infoline);
}
else
commit 61b1c24615445d7677dbfe4a702d3dd97eaa4939
Author: Jan Holesovsky ke...@suse.cz
Date: Wed Jul 25 15:00:02 2012 +0200
More full paths for cross msi* tools.
Change-Id: I813d22bc5081a0cc5f1af9fbc6661a970eb16b86
diff --git a/solenv/bin/modules/installer/windows/admin.pm
b/solenv/bin/modules/installer/windows/admin.pm
index 194a65f..e088caf 100644
--- a/solenv/bin/modules/installer/windows/admin.pm
+++ b/solenv/bin/modules/installer/windows/admin.pm
@@ -48,6 +48,11 @@ sub unpack_cabinet_file
push( @installer::globals::logfileinfo, $infoline);
my $expandfile = expand.exe; # Has to be in the path
+if ( $installer::globals::isunix )
+{
+$infoline = ERROR: We need to change this to use cabextract instead
of expand.exe\n;
+push( @installer::globals::logfileinfo, $infoline);
+}
# expand.exe has to be located in the system directory.
# Cygwin has another tool expand.exe, that converts tabs to spaces. This
cannot be used of course.
@@ -104,6 +109,10 @@ sub include_tables_into_pcpfile
my ($fullmsidatabasepath, $workdir, $tables) = @_;
my $msidb = msidb.exe;# Has to be in the path
+if ( $installer::globals::isunix )
+{
+$msidb = $ENV{'OUTDIR_FOR_BUILD'}/bin/msidb.exe;
+}
my $infoline = ;
my $systemcall = ;
my $returnvalue = ;
@@ -159,6 +168,10 @@ sub extract_tables_from_pcpfile
my ($fullmsidatabasepath, $workdir, $tablelist) = @_;
my $msidb = msidb.exe;# Has to be in the path
+if ( $installer::globals::isunix )
+{
+$msidb = $ENV{'OUTDIR_FOR_BUILD'}/bin/msidb.exe;
+}
my $infoline = ;
my $systemcall = ;
my $returnvalue = ;
@@ -699,6 +712,10 @@ sub write_sis_info
if ( ! -f $msidatabase ) { installer::exiter::exit_program(ERROR: Cannot
find file $msidatabase, write_sis_info); }
my $msiinfo = msiinfo.exe;# Has to be in the path
+if ( $installer::globals::isunix )
+{
+$msiinfo = $ENV{'OUTDIR_FOR_BUILD'}/bin/msiinfo.exe;
+}
my $infoline = ;
my $systemcall = ;
my $returnvalue = ;
commit 4c1c5aaa2d0b3c7870d2bd466ce8f2fa9204064a
Author: Jan Holesovsky ke...@suse.cz
Date: Wed Jul 25 14:50:14 2012 +0200
Avoid a crash.
Change-Id: I2ce8be599c9285bd0da039e1ff9c0649a118a8a1
diff --git a/setup_native/source/win32/wintools/msiinfo/msiinfo.c
b/setup_native/source/win32/wintools/msiinfo/msiinfo.c
index f2d388b..2ba88df 100644
--- a/setup_native/source/win32/wintools/msiinfo/msiinfo.c
+++ b/setup_native/source/win32/wintools/msiinfo/msiinfo.c
@@ -204,7 +204,7 @@ int wmain(int argc, WCHAR *argv[])
argv++; argc--;
}
-if (strcmpW(dbfile, h1) == 0 || strcmpW(dbfile, h2) == 0)
+if (!dbfile || strcmpW(dbfile, h1) == 0 || strcmpW(dbfile, h2) == 0)
{
usage();
return 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[REVIEW 3-6][REVIEW 3-6-0] fdo#52240 add uncontroversial date acceptance patterns
Hi, Please review (date acceptance patterns, xml locale data changes only) and cherry-pick to 3-6 and if possible, in case we'll do 3.6.0.4rc, 3-6-0 http://cgit.freedesktop.org/libreoffice/core/commit/?id=7828847618b58ff2009b5ce55416a8b2e5dcf55a http://cgit.freedesktop.org/libreoffice/core/commit/?id=ae660e9efa4994bbfafa6de46b4b18aef2f1bb49 http://cgit.freedesktop.org/libreoffice/core/commit/?id=dc52902eb218095652bf2921d5acfb9d0c863ac9 http://cgit.freedesktop.org/libreoffice/core/commit/?id=05035c894644f700fdc972b51dbd918f7530b2d5 that enable abbreviated date input for locales that use '/' date separator, which, contrary to '.' and '-', are uncontroversial, see https://bugs.freedesktop.org/show_bug.cgi?id=52240 Thanks Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgpTiEX4jKIpp.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#50632 IDE: update Object Catalog when closing a document
This patch fixed this bug:
https://bugs.freedesktop.org/show_bug.cgi?id=50632
The Object Catalog was not updated, because at the point when
onDocumentClosed() event was generated in BasicTreeListBox, the to-be-closed
document is still alive, so UpdateEntries() doesn't remove the entry. I
removed
this entry manually in onDocumentClosed().
Uray M. János
From 133c979a15bbba5bc78400edb9e1dc1cbff9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Uray=20M.=20J=C3=A1nos?= uray.ja...@gmail.com
Date: Tue, 24 Jul 2012 19:27:25 +0200
Subject: [PATCH] fdo#50632 IDE: update Object Catalog when closing a document
Change-Id: Ia635aee1611eaff663906e2238bf23a5013242a3
---
basctl/source/basicide/bastype2.cxx | 34 +++---
basctl/source/basicide/bastype2.hxx |2 ++
2 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx
index 087651e..4c72181 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -559,9 +559,12 @@ void BasicTreeListBox::onDocumentSaveAsDone( const ScriptDocument /*_rDocument*
UpdateEntries();
}
-void BasicTreeListBox::onDocumentClosed( const ScriptDocument /*_rDocument*/ )
+void BasicTreeListBox::onDocumentClosed( const ScriptDocument rDocument )
{
UpdateEntries();
+// The document is not yet actually deleted, so we need to remove its entry
+// manually.
+RemoveEntry(rDocument);
}
void BasicTreeListBox::onDocumentTitleChanged( const ScriptDocument /*_rDocument*/ )
@@ -578,7 +581,7 @@ void BasicTreeListBox::UpdateEntries()
{
BasicEntryDescriptor aCurDesc( GetEntryDescriptor( FirstSelected() ) );
-
+// removing the invalid entries
SvLBoxEntry* pLastValid = 0;
SvLBoxEntry* pEntry = First();
while ( pEntry )
@@ -586,19 +589,36 @@ void BasicTreeListBox::UpdateEntries()
if ( IsValidEntry( pEntry ) )
pLastValid = pEntry;
else
-{
-delete (BasicEntry*)pEntry-GetUserData();
-GetModel()-Remove( pEntry );
-}
+RemoveEntry(pEntry);
pEntry = pLastValid ? Next( pLastValid ) : First();
}
-
ScanAllEntries();
SetCurrentEntry( aCurDesc );
}
+// Removes the entry from the tree.
+void BasicTreeListBox::RemoveEntry (SvLBoxEntry* pEntry)
+{
+// removing the associated user data
+delete (BasicEntry*)pEntry-GetUserData();
+// removing the entry
+GetModel()-Remove( pEntry );
+}
+
+// Removes the entry of rDocument.
+void BasicTreeListBox::RemoveEntry (ScriptDocument const rDocument)
+{
+// finding the entry of rDocument
+for (SvLBoxEntry* pEntry = First(); pEntry; pEntry = Next(pEntry))
+if (rDocument == GetEntryDescriptor(pEntry).GetDocument())
+{
+RemoveEntry(pEntry);
+break;
+}
+}
+
SvLBoxEntry* BasicTreeListBox::CloneEntry( SvLBoxEntry* pSource )
{
SvLBoxEntry* pNew = SvTreeListBox::CloneEntry( pSource );
diff --git a/basctl/source/basicide/bastype2.hxx b/basctl/source/basicide/bastype2.hxx
index 5a3374d..66b031e 100644
--- a/basctl/source/basicide/bastype2.hxx
+++ b/basctl/source/basicide/bastype2.hxx
@@ -195,6 +195,8 @@ public:
SvLBoxEntry*AddEntry( const ::rtl::OUString rText, const Image rImage,
SvLBoxEntry* pParent, bool bChildrenOnDemand,
std::auto_ptr BasicEntry aUserData );
+voidRemoveEntry (SvLBoxEntry*);
+voidRemoveEntry (ScriptDocument const);
::rtl::OUString GetRootEntryName( const ScriptDocument rDocument, LibraryLocation eLocation ) const;
voidGetRootEntryBitmaps( const ScriptDocument rDocument, Image rImage );
--
1.7.7
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH (partial)] Writer autocompletion feature
Hi, I would like to do integrate this code into master if there is nobody already working on this. Regards, Tomaž ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/gsoc_test_improvements3' - sw/qa
sw/qa/extras/ooxmltok/data/all_gaps_word.docx |binary
sw/qa/extras/ooxmltok/ooxmltok.cxx| 146 ++
2 files changed, 146 insertions(+)
New commits:
commit afb8974755ea8aca5d13920df85c7aa2bdb9b6d2
Author: Artur Dorda artur.dorda+l...@gmail.com
Date: Wed Jul 25 18:16:00 2012 +0200
Word format import - new test in ooxml checking top border's widths in
tables
Change-Id: I0e4434e9266190f0719df7fbba9f6f2904da8707
diff --git a/sw/qa/extras/ooxmltok/data/all_gaps_word.docx
b/sw/qa/extras/ooxmltok/data/all_gaps_word.docx
new file mode 100644
index 000..992fc44
Binary files /dev/null and b/sw/qa/extras/ooxmltok/data/all_gaps_word.docx
differ
diff --git a/sw/qa/extras/ooxmltok/ooxmltok.cxx
b/sw/qa/extras/ooxmltok/ooxmltok.cxx
index a3fd38a..69edd57 100644
--- a/sw/qa/extras/ooxmltok/ooxmltok.cxx
+++ b/sw/qa/extras/ooxmltok/ooxmltok.cxx
@@ -43,11 +43,17 @@
#include com/sun/star/text/XTextFramesSupplier.hpp
#include com/sun/star/text/XTextViewCursorSupplier.hpp
#include com/sun/star/style/ParagraphAdjust.hpp
+#include com/sun/star/table/XCell.hpp
+#include com/sun/star/table/BorderLine.hpp
+#include com/sun/star/text/XTextTable.hpp
#include vcl/svapp.hxx
#define TWIP_TO_MM100(TWIP) ((TWIP) = 0 ? (((TWIP)*127L+36L)/72L) :
(((TWIP)*127L-36L)/72L))
+typedef std::maprtl::OUString, com::sun::star::table::BorderLine
BorderLineMap;
+typedef std::pairrtl::OUString, com::sun::star::table::BorderLine
StringBorderPair;
+
using rtl::OString;
using rtl::OUString;
using rtl::OUStringBuffer;
@@ -76,6 +82,7 @@ public:
void testN766481();
void testN766487();
void testN693238();
+void testAllGapsWord();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -100,6 +107,7 @@ public:
CPPUNIT_TEST(testN766481);
CPPUNIT_TEST(testN766487);
CPPUNIT_TEST(testN693238);
+CPPUNIT_TEST(testAllGapsWord);
#endif
CPPUNIT_TEST_SUITE_END();
@@ -678,6 +686,144 @@ void Test::testN693238()
CPPUNIT_ASSERT_EQUAL(sal_Int32(635), nValue);
}
+void Test::testAllGapsWord()
+{
+load(all_gaps_word.docx);
+uno::Referencetext::XTextDocument textDocument(mxComponent,
uno::UNO_QUERY);
+uno::Referencecontainer::XEnumerationAccess
xParaEnumAccess(textDocument-getText(), uno::UNO_QUERY);
+// list of paragraphs
+uno::Referencecontainer::XEnumeration xParaEnum =
xParaEnumAccess-createEnumeration();
+
+// maps containing TopBorder widths for every cell
+// one map for each tables - there are 8 of them, counting from 0
+BorderLineMap map0;
+map0.insert(StringBorderPair(OUString(A1), table::BorderLine(0, 53, 26,
26)));
+map0.insert(StringBorderPair(OUString(B1), table::BorderLine(0, 79, 26,
26)));
+map0.insert(StringBorderPair(OUString(C1), table::BorderLine(0, 106, 26,
26)));
+map0.insert(StringBorderPair(OUString(D1), table::BorderLine(0, 159, 26,
26)));
+map0.insert(StringBorderPair(OUString(E1), table::BorderLine(0, 212, 26,
26)));
+BorderLineMap map1;
+map1.insert(StringBorderPair(OUString(A1), table::BorderLine(0, 9, 9,
9)));
+map1.insert(StringBorderPair(OUString(B1), table::BorderLine(0, 18, 18,
18)));
+map1.insert(StringBorderPair(OUString(C1), table::BorderLine(0, 26, 26,
26)));
+map1.insert(StringBorderPair(OUString(D1), table::BorderLine(0, 53, 53,
53)));
+map1.insert(StringBorderPair(OUString(E1), table::BorderLine(0, 79, 79,
79)));
+map1.insert(StringBorderPair(OUString(F1), table::BorderLine(0, 106,
106, 106)));
+BorderLineMap map2;
+map2.insert(StringBorderPair(OUString(A1), table::BorderLine(0, 9, 5,
5)));
+map2.insert(StringBorderPair(OUString(B1), table::BorderLine(0, 18, 9,
9)));
+map2.insert(StringBorderPair(OUString(C1), table::BorderLine(0, 26, 14,
14)));
+map2.insert(StringBorderPair(OUString(D1), table::BorderLine(0, 35, 18,
18)));
+map2.insert(StringBorderPair(OUString(E1), table::BorderLine(0, 53, 26,
26)));
+map2.insert(StringBorderPair(OUString(F1), table::BorderLine(0, 79, 41,
41)));
+map2.insert(StringBorderPair(OUString(G1), table::BorderLine(0, 106, 53,
53)));
+map2.insert(StringBorderPair(OUString(H1), table::BorderLine(0, 159, 79,
79)));
+map2.insert(StringBorderPair(OUString(I1), table::BorderLine(0, 212,
106, 106)));
+BorderLineMap map3;
+map3.insert(StringBorderPair(OUString(A1), table::BorderLine(0, 53, 26,
9)));
+map3.insert(StringBorderPair(OUString(B1), table::BorderLine(0, 53, 26,
18)));
+map3.insert(StringBorderPair(OUString(C1), table::BorderLine(0, 53, 26,
26)));
+map3.insert(StringBorderPair(OUString(D1), table::BorderLine(0, 53, 26,
35)));
+map3.insert(StringBorderPair(OUString(E1), table::BorderLine(0, 53, 26,
53)));
+map3.insert(StringBorderPair(OUString(F1), table::BorderLine(0, 53, 26,
79)));
+map3.insert(StringBorderPair(OUString(G1), table::BorderLine(0, 53, 26,
106)));
+
Re: [PATCH (partial)] Writer autocompletion feature
Hi Tomaž, On 2012-07-25 at 18:11 +0200, Tomaž Vajngerl wrote: I would like to do integrate this code into master if there is nobody already working on this. That would be great, please go ahead! :-) Nico - thanks again for your license statement! All the best, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/remote' - 5 commits - android/sdremote
android/sdremote/AndroidManifest.xml |
11 -
android/sdremote/res/drawable/actionbar_none.png
|binary
android/sdremote/res/drawable/actionbar_pressed.png
|binary
android/sdremote/res/drawable/actionbar_selected.png
|binary
android/sdremote/res/drawable/actionbar_thumbs.xml |
9
android/sdremote/res/drawable/actionbar_toggle.xml |
8
android/sdremote/res/drawable/empty.png
|binary
android/sdremote/res/drawable/icon_overflow.png
|binary
android/sdremote/res/drawable/icon_thumbs.png
|binary
android/sdremote/res/layout/fragment_presentation.xml|
7
android/sdremote/res/layout/fragment_thumbnail.xml |
1
android/sdremote/res/layout/presentation_actionbar.xml |
25 ++
android/sdremote/res/layout/presentation_clockbar.xml|
30 ++
android/sdremote/res/layout/slide_thumbnail.xml |
3
android/sdremote/res/menu/actionbar_presentation.xml |
21 +
android/sdremote/res/values/strings.xml |
2
android/sdremote/res/values/styles.xml |
28 ++
android/sdremote/src/org/libreoffice/impressremote/ActionBarManager.java |
69 --
android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java |
107 +-
android/sdremote/src/org/libreoffice/impressremote/PresentationFragment.java |
93
android/sdremote/src/org/libreoffice/impressremote/TestClient.java |
1
android/sdremote/src/org/libreoffice/impressremote/ThumbnailFragment.java|
19 +
22 files changed, 289 insertions(+), 145 deletions(-)
New commits:
commit 9a6f7f37961e316b376151fe8d800b5eeca44a55
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date: Wed Jul 25 18:30:43 2012 +0200
Basic clock control bar done.
Change-Id: I Ifd2e56b97f5b53ce29101d9eee7953b7700fb749
diff --git a/android/sdremote/res/layout/presentation_clockbar.xml
b/android/sdremote/res/layout/presentation_clockbar.xml
new file mode 100644
index 000..5ab7081
--- /dev/null
+++ b/android/sdremote/res/layout/presentation_clockbar.xml
@@ -0,0 +1,30 @@
+?xml version=1.0 encoding=utf-8?
+LinearLayout xmlns:android=http://schemas.android.com/apk/res/android;
+android:layout_width=match_parent
+android:layout_height=wrap_content
+android:orientation=horizontal
+android:background=#BB00
+
+ToggleButton
+android:id=@+id/clockbar_toggle_clockmode
+android:layout_width=0dp
+android:layout_height=wrap_content
+android:layout_weight=1
+
+android:text=ToggleButton /
+
+ToggleButton
+android:id=@+id/clockbar_toggle_stopwatchmode
+android:layout_width=0dp
+android:layout_height=wrap_content
+android:layout_weight=1
+android:text=@drawable/actionbar_toggle /
+
+ToggleButton
+android:id=@+id/clockbar_toggle_countdownmode
+android:layout_width=0dp
+android:layout_height=wrap_content
+android:layout_weight=1
+android:text=@drawable/actionbar_toggle /
+
+/LinearLayout
\ No newline at end of file
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
b/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
index 234042d..48e6678 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
@@ -16,6 +16,7 @@ import android.os.IBinder;
import android.os.Message;
import android.os.Messenger;
import android.text.format.DateFormat;
+import android.view.LayoutInflater;
import android.view.Menu;
import android.view.View;
import android.view.View.OnClickListener;
@@ -135,7 +136,7 @@ public class PresentationActivity extends Activity {
mTimeLabel = (ToggleButton)
aBar.getCustomView().findViewById(
R.id.actionbar_time);
- mThumbnailButton.setOnClickListener(this);
+ mTimeLabel.setOnClickListener(this);
// Listen for fragment changes
getFragmentManager().addOnBackStackChangedListener(this);
@@ -184,7 +185,11 @@ public class PresentationActivity extends Activity {
getFragmentManager().popBackStack();
}
} else if (aSource == mTimeLabel) {
-
+ System.out.println(added);
+ LayoutInflater
[Libreoffice-commits] .: 2 commits - comphelper/inc comphelper/source configmgr/source cui/source offapi/com
comphelper/inc/comphelper/configuration.hxx |2
comphelper/source/misc/configuration.cxx | 109 +++---
configmgr/source/access.cxx | 75
configmgr/source/childaccess.cxx | 76
configmgr/source/configmgr.component |2
configmgr/source/readonlyaccess.cxx | 64 ++-
configmgr/source/readwriteaccess.cxx | 74 +++-
cui/source/inc/treeopt.hxx|9
cui/source/options/treeopt.cxx| 318 --
offapi/com/sun/star/configuration/ReadOnlyAccess.idl | 15
offapi/com/sun/star/configuration/ReadWriteAccess.idl | 15
11 files changed, 421 insertions(+), 338 deletions(-)
New commits:
commit cef66a3eed301ab77e02be6d6ba148142051e13d
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Jul 25 19:06:42 2012 +0200
Revert fdo#52232 ConfigurationSet wrapper unusable for localized
properties
This reverts commit aebf5bf22304c73e121b16dc0b51f909c5f34c28, now that
e397a9cfabc2928cd5571309f5b634a7e78098ec Make comphelper/configuration.hxx
work for localized properties fixes the original problem.
Change-Id: If4e187b911510d5932d52cec08d43cb73f6e339c
diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx
index 64d2b9b..38700e6 100644
--- a/cui/source/inc/treeopt.hxx
+++ b/cui/source/inc/treeopt.hxx
@@ -138,7 +138,6 @@ struct LastPageSaver
// class OfaTreeOptionsDialog
namespace com { namespace sun { namespace star { namespace frame { class
XFrame; } } } }
-namespace com { namespace sun { namespace star { namespace container { class
XNameAccess; } } } }
namespace com { namespace sun { namespace star { namespace lang { class
XMultiServiceFactory; } } } }
namespace com { namespace sun { namespace star { namespace awt { class
XContainerWindowProvider; } } } }
@@ -192,12 +191,8 @@ private:
com::sun::star::lang::XMultiServiceFactory xMFac,
const com::sun::star::uno::Reference
com::sun::star::frame::XFrame
xFrame );
-Module* LoadModule( const rtl::OUString rModuleIdentifier,
-const com::sun::star::uno::Reference
-com::sun::star::container::XNameAccess
xRoot );
-voidLoadNodes( const com::sun::star::uno::Reference
-com::sun::star::container::XNameAccess
xRoot,
- Module* pModule,
+Module* LoadModule( const rtl::OUString rModuleIdentifier );
+voidLoadNodes( Module* pModule,
const rtl::OUString rExtensionId,
VectorOfNodes rOutNodeList );
voidInsertNodes( const VectorOfNodes rNodeList );
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index ce34083..9db1841 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -67,11 +67,11 @@
#include com/sun/star/frame/XModuleManager.hpp
#include com/sun/star/loader/CannotActivateFactoryException.hpp
#include com/sun/star/util/XMacroExpander.hpp
-#include comphelper/configurationhelper.hxx
#include comphelper/processfactory.hxx
#include editeng/optitems.hxx
#include editeng/unolingu.hxx
#include linguistic/misc.hxx
+#include officecfg/Office/OptionsDialog.hxx
#include osl/module.hxx
#include osl/process.h
#include rtl/bootstrap.hxx
@@ -1927,18 +1927,12 @@ void OfaTreeOptionsDialog::LoadExtensionOptions( const
rtl::OUString rExtension
{
Module* pModule = NULL;
Reference XMultiServiceFactory xMSFac =
comphelper::getProcessServiceFactory();
-// open optionsdialog.xcu
-Reference XNameAccess xRoot(
-::comphelper::ConfigurationHelper::openConfig(
-xMSFac, C2U(org.openoffice.Office.OptionsDialog),
-::comphelper::ConfigurationHelper::E_READONLY ), UNO_QUERY );
-DBG_ASSERT( xRoot.is(), OfaTreeOptionsDialog::LoadExtensionOptions(): no
config );
// when called by Tools - Options then load nodes of active module
if ( rExtensionId.isEmpty() )
-pModule = LoadModule( GetModuleIdentifier( xMSFac, Reference XFrame
() ), xRoot );
+pModule = LoadModule( GetModuleIdentifier( xMSFac, Reference XFrame
() ) );
VectorOfNodes aNodeList;
-LoadNodes( xRoot, pModule, rExtensionId, aNodeList );
+LoadNodes( pModule, rExtensionId, aNodeList );
InsertNodes( aNodeList );
}
@@ -1977,64 +1971,58 @@ rtl::OUString OfaTreeOptionsDialog::GetModuleIdentifier(
}
Module* OfaTreeOptionsDialog::LoadModule(
-const rtl::OUString rModuleIdentifier, const Reference XNameAccess
xRoot )
+const rtl::OUString rModuleIdentifier )
{
[Libreoffice-commits] .: 2 commits - cui/source
cui/source/customize/eventdlg.hxx |1
cui/source/dialogs/SpellAttrib.hxx |2 -
cui/source/dialogs/commonlingui.hxx | 21 ++---
cui/source/dialogs/thesdlg_impl.hxx |6 ++---
cui/source/inc/about.hxx|2 -
cui/source/inc/acccfg.hxx |6 +
cui/source/inc/autocdlg.hxx | 22 +-
cui/source/inc/backgrnd.hxx | 43 +---
cui/source/inc/bbdlg.hxx|2 -
cui/source/inc/border.hxx | 18 +++
cui/source/inc/cfg.hxx | 12 +-
cui/source/inc/chardlg.hxx |8 +++---
12 files changed, 72 insertions(+), 71 deletions(-)
New commits:
commit 101baf42f931344e4a8330e4c512dc7a4f2fe8a9
Author: Eike Rathke er...@redhat.com
Date: Wed Jul 25 19:11:46 2012 +0200
changes to Modifying comments to follow Doxygen standards
Change-Id: I82c358946c611b5b309d537f76b0b6371c82cbfa
diff --git a/cui/source/customize/eventdlg.hxx
b/cui/source/customize/eventdlg.hxx
index 6c8d9f2..e9f02d2 100644
--- a/cui/source/customize/eventdlg.hxx
+++ b/cui/source/customize/eventdlg.hxx
@@ -46,7 +46,8 @@ class SvxEventConfigPage : public _SvxMacroTabPage
public:
-struct EarlyInit { }; /// this is only to let callers
know that there is a LateInit which *must* be called
+/// this is only to let callers know that there is a
LateInit which *must* be called
+struct EarlyInit { };
SvxEventConfigPage( Window *pParent, const SfxItemSet
rSet, EarlyInit );
~SvxEventConfigPage();
diff --git a/cui/source/dialogs/commonlingui.hxx
b/cui/source/dialogs/commonlingui.hxx
index 81931a9..753db81 100644
--- a/cui/source/dialogs/commonlingui.hxx
+++ b/cui/source/dialogs/commonlingui.hxx
@@ -110,10 +110,7 @@ public:
inline PushButton* GetButton( ButtonType _eType ) {
return implGetButton( _eType ); }
inline const PushButton* GetButton( ButtonType _eType ) const{
return implGetButton( _eType ); }
-/** users of this class may want to insert own controls in some places,
where the ordinary
-Z-Order determined by construction time is not sufficient
-Use the following methods for this
-control groups in this window which cannot be devided (e.g. are
adjacent in the Z order)*/
+/// control groups in this window which cannot be devided (e.g. are
adjacent in the Z order)
enum ControlGroup
{
eLeftRightWords,/// the controls for the two words (original and
suggestion), including the labels
@@ -121,6 +118,11 @@ public:
eActionButtons, /// the group of ignore(all) / change(all)
buttons
eDialogButtons /// the group of dialog control buttons (help and
close)
};
+
+/** Users of this class may want to insert own controls in some places,
+where the ordinary Z-Order determined by construction time is not
+sufficient. Use the following methods for this.
+ */
voidInsertControlGroup( Window _rFirstGroupWindow, Window
_rLastGroupWindow, ControlGroup _eInsertAfter );
/** enlarges the window
diff --git a/cui/source/dialogs/thesdlg_impl.hxx
b/cui/source/dialogs/thesdlg_impl.hxx
index 0c4af35..36ad201 100644
--- a/cui/source/dialogs/thesdlg_impl.hxx
+++ b/cui/source/dialogs/thesdlg_impl.hxx
@@ -68,7 +68,7 @@ class LookUpComboBox_Impl : public ComboBox
Button *m_pBtn;
SvxThesaurusDialog_Implm_rDialogImpl;
-/// disable copy c-factor and assignment operator
+/// disable copy ctor and assignment operator
LookUpComboBox_Impl( const LookUpComboBox_Impl );
LookUpComboBox_Impl operator = ( const LookUpComboBox_Impl );
@@ -90,7 +90,7 @@ class ReplaceEdit_Impl : public Edit
{
Button *m_pBtn;
-/// disable copy c-factor and assignment operator
+/// disable copy ctor and assignment operator
ReplaceEdit_Impl( const ReplaceEdit_Impl );
ReplaceEdit_Impl operator = ( const ReplaceEdit_Impl );
@@ -146,7 +146,7 @@ class ThesaurusAlternativesCtrl_Impl :
typedef std::map const SvLBoxEntry *, AlternativesExtraData
UserDataMap_t;
UserDataMap_t m_aUserData;
-/// disable copy c-factor and assignment operator
+/// disable copy ctor and assignment operator
ThesaurusAlternativesCtrl_Impl( const ThesaurusAlternativesCtrl_Impl );
ThesaurusAlternativesCtrl_Impl operator = ( const
ThesaurusAlternativesCtrl_Impl );
diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx
index 3ee71f2..0ed82cb 100644
--- a/cui/source/inc/acccfg.hxx
+++ b/cui/source/inc/acccfg.hxx
@@ -89,14 +89,13 @@ public:
struct TAccInfo
{
public:
-/** its important to set sal_True as default -
-because only fix entries will be disabled later ...*/
TAccInfo( sal_Int32
[Libreoffice-commits] .: 2 commits - vcl/source
vcl/source/control/button.cxx | 32 +++-
1 file changed, 23 insertions(+), 9 deletions(-)
New commits:
commit ce53472216cab75bfdf04799fb85f375f01af792
Author: Ivan Timofeev timofeev@gmail.com
Date: Wed Jul 25 20:53:37 2012 +0400
changes to previous commit
- bSize is not necessary
- rename bInRect to aHotspotRect
- rewrite the rectangle calculations
- fix the x-coordinate of aStartPt
Change-Id: Id474a3df5242423e5d4b6953af7e58ceeb50b810
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 2944abc..42579ac 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -825,7 +825,6 @@ void PushButton::ImplDrawPushButtonContent( OutputDevice*
pDev, sal_uLong nDrawF
{
const StyleSettingsrStyleSettings = GetSettings().GetStyleSettings();
Rectangle aInRect = rRect;
-Rectangle bInRect = rRect;
Color aColor;
XubString aText = PushButton::GetText(); // PushButton::
wegen MoreButton
sal_uInt16 nTextStyle = ImplGetTextStyle( nDrawFlags );
@@ -854,7 +853,6 @@ void PushButton::ImplDrawPushButtonContent( OutputDevice*
pDev, sal_uLong nDrawF
nStyle = SYMBOL_DRAW_DISABLE;
Size aSize = rRect.GetSize();
-Size bSize = rRect.GetSize();
Point aPos = rRect.TopLeft();
sal_uLong nImageSep = 1 + (pDev-GetTextHeight()-10)/2;
@@ -862,21 +860,23 @@ void PushButton::ImplDrawPushButtonContent( OutputDevice*
pDev, sal_uLong nDrawF
nImageSep = 1;
if ( mnDDStyle == PUSHBUTTON_DROPDOWN_MENUBUTTON )
{
+Rectangle aHotspotRect = rRect;
if ( aText.Len() ! (ImplGetButtonState() BUTTON_DRAW_NOTEXT) )
{
// calculate symbol size
long nSymbolSize= pDev-GetTextHeight() / 2 + 1;
-aInRect.Right()-= 2; //rectangle width
-aInRect.Left() = aInRect.Right() - nSymbolSize;
-//caluclate dimension of recent documents hotspot rectangle
+// caluclate dimension of hotspot rectangle
+aHotspotRect.Left() = aHotspotRect.Right() - 2*nSymbolSize;
-bInRect.Right()+= 10; //rectangle width
-bInRect.Left() = bInRect.Right() - 3*nSymbolSize;
-bSize.Width() -= ( 5 + nSymbolSize );
-ImplDrawAlignedImage( pDev, aPos, bSize, bLayout, nImageSep,
- nDrawFlags, nTextStyle, NULL, true );
+// center symbol rectangle inside hotspot rectangle
+aInRect.Right() = aHotspotRect.Right() - nSymbolSize/2 + 1;
+aInRect.Left() = aInRect.Right() - nSymbolSize;
+
+aSize.Width() -= aHotspotRect.GetWidth();
+ImplDrawAlignedImage( pDev, aPos, aSize, bLayout, nImageSep,
+ nDrawFlags, nTextStyle, NULL, true );
}
else
ImplCalcSymbolRect( aInRect );
@@ -887,15 +887,20 @@ void PushButton::ImplDrawPushButtonContent( OutputDevice*
pDev, sal_uLong nDrawF
DecorationView aDecoView( pDev );
if( bMenuBtnSep )
{
-long nX = bInRect.Left() - 3*nDistance;
-Point aStartPt( nX+10, bInRect.Top()+nDistance );
-Point aEndPt( nX, bInRect.Bottom()-nDistance );
+long nX = aHotspotRect.Left();
+Point aStartPt( nX, aHotspotRect.Top()+nDistance );
+Point aEndPt( nX, aHotspotRect.Bottom()-nDistance );
aDecoView.DrawSeparator( aStartPt, aEndPt );
}
aDecoView.DrawSymbol( aInRect, SYMBOL_SPIN_DOWN, aColor, nStyle );
-bInRect.Left() -= -3*nDistance;
-ImplSetSymbolRect( bInRect );
+
+// hack: include decoration into hotspot rectangle (hopefully +10
is enough)
+aHotspotRect.Right() += 10;
+aHotspotRect.Bottom() += 10;
+aHotspotRect.Top() -= 10;
+
+ImplSetSymbolRect( aHotspotRect );
}
}
commit ad9ca11b6fa7792880571d33750c9f52568b837e
Author: Joel Madero jmadero@gmail.com
Date: Tue Jul 24 23:49:54 2012 -0700
fdo#47164: Increased size of hotspot box for recent documents on Start
Center
Prior to patch hotspot and arrow symbol were being controlled by same
rectangle feature. In order to increase hotspot area but leave arrow at
the same size it was necessary to separate the two, creating a second
rectangle to control hotspot size. New rectangle named bInRect, similarly
bSize had to be created.
Change-Id: Iec27d45e1f538dc0185861be7a988b0851fbb352
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 3dd6097..2944abc 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -825,6 +825,7 @@ void PushButton::ImplDrawPushButtonContent(
[PUSHED] Modifying comments to follow Doxygen standards
From Eike Rathke er...@redhat.com: Eike Rathke has submitted this change and it was merged. Change subject: Modifying comments to follow Doxygen standards .. Modifying comments to follow Doxygen standards Change-Id: Ic87c9c4f51af4da963835ac7311d998e69f61156 --- M cui/source/customize/eventdlg.hxx M cui/source/dialogs/SpellAttrib.hxx M cui/source/dialogs/commonlingui.hxx M cui/source/dialogs/thesdlg_impl.hxx M cui/source/inc/about.hxx M cui/source/inc/acccfg.hxx M cui/source/inc/autocdlg.hxx M cui/source/inc/backgrnd.hxx M cui/source/inc/bbdlg.hxx M cui/source/inc/border.hxx M cui/source/inc/cfg.hxx M cui/source/inc/chardlg.hxx 12 files changed, 71 insertions(+), 74 deletions(-) Approvals: Eike Rathke: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/345 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic87c9c4f51af4da963835ac7311d998e69f61156 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Faisal al-otaibi fmalota...@kacst.edu.sa Gerrit-Reviewer: Eike Rathke er...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#47164: Start Center: Recent Documents picker can not be reached right third of separate button area
Hi Joel, instead of commenting I have pushed it and made some changes in the subsequent commit (probably it is something buggy :). Hmm, I can't access cgit.freedesktop.org, luckily we have a mirror on gitorious. See: http://gitorious.org/libreoffice/core/commit/ad9ca11b6fa7792880571d33750c9f52568b837e (I fixed the commit description) http://gitorious.org/libreoffice/core/commit/ce53472216cab75bfdf04799fb85f375f01af792 Thanks! Ivan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Rainer Bielefeld libreoff...@bielefeldundbuss.de changed: What|Removed |Added Depends on||52393 --- Comment #56 from Rainer Bielefeld libreoff...@bielefeldundbuss.de 2012-07-25 17:25:17 PDT --- Add Bug 52393 - FILEOPEN 3.5.x spreadsheet with wrong row height: Makes CALC nearby completely unusable -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - sc/source
sc/source/filter/excel/xetable.cxx | 51 ++---
1 file changed, 20 insertions(+), 31 deletions(-)
New commits:
commit 4ed0eaca6c14aeb652cbebe18081cc9e7e1444ac
Author: Noel Power noel.po...@novell.com
Date: Wed Jul 25 18:23:38 2012 +0100
hopefully more successful attempt to solve fdo#50304
Change-Id: I86dfff571c14bce97d0851b4093dbc376d8b6ea4
diff --git a/sc/source/filter/excel/xetable.cxx
b/sc/source/filter/excel/xetable.cxx
index e3967f2..d611077 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -2146,14 +2146,26 @@ XclExpDimensions* XclExpRowBuffer::GetDimensions()
XclExpRow XclExpRowBuffer::GetOrCreateRow( sal_uInt32 nXclRow, bool
bRowAlwaysEmpty )
{
-RowMap::iterator itr = maRowMap.find(nXclRow);
-if (itr == maRowMap.end())
+RowMap::iterator itr = maRowMap.begin();
+ScDocument rDoc = GetRoot().GetDoc();
+SCTAB nScTab = GetRoot().GetCurrScTab();
+for ( size_t nFrom = maRowMap.size(); nFrom = nXclRow; ++nFrom )
{
-RowRef p(new XclExpRow(GetRoot(), nXclRow, maOutlineBfr,
bRowAlwaysEmpty));
-::std::pairRowMap::iterator, bool r =
maRowMap.insert(RowMap::value_type(nXclRow, p));
-itr = r.first;
+itr = maRowMap.find(nFrom);
+if ( itr == maRowMap.end() )
+{
+// only create RowMap entries for rows that differ from previous,
+// or if it is the desired row
+if ( !nFrom || ( nFrom == nXclRow ) || ( nFrom (
rDoc.GetRowHeight(nFrom, nScTab, false) != rDoc.GetRowHeight(nFrom-1, nScTab,
false) ) ) )
+{
+RowRef p(new XclExpRow(GetRoot(), nFrom, maOutlineBfr,
bRowAlwaysEmpty));
+maRowMap.insert(RowMap::value_type(nFrom, p));
+}
+}
}
+itr = maRowMap.find(nXclRow);
return *itr-second;
+
}
//
commit cad1ab1f12b01aa0b364697aa63ee2fb73b96dd2
Author: Noel Power noel.po...@novell.com
Date: Tue Jul 24 19:49:49 2012 +0100
Revert fix excel row height export problems ( I hope ) fdo#50304
This reverts commit 9746c6de3a05fe9284d6d6bb2f636bfe912733cd.
diff --git a/sc/source/filter/excel/xetable.cxx
b/sc/source/filter/excel/xetable.cxx
index 69db2be..e3967f2 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -2029,41 +2029,22 @@ void XclExpRowBuffer::Finalize( XclExpDefaultRowData
rDefRowData, const ScfUInt
XclExpDefaultRowData aMaxDefData;
size_t nMaxDefCount = 0;
// only look for default format in existing rows, if there are more than
unused
-bool bSearchExisting = ( maRowMap.size() = ( GetMaxPos().Row() -
maRowMap.size() ) );
-if ( bSearchExisting )
-{
-for (itr = itrBeg; itr != itrEnd; ++itr)
-{
-const RowRef rRow = itr-second;
-if (rRow-IsDefaultable())
-{
-XclExpDefaultRowData aDefData( *rRow );
-size_t rnDefCount = aDefRowMap[ aDefData ];
-++rnDefCount;
-if( rnDefCount nMaxDefCount )
-{
-nMaxDefCount = rnDefCount;
-aMaxDefData = aDefData;
-}
-}
-}
-}
-else
+for (itr = itrBeg; itr != itrEnd; ++itr)
{
-// find a suitable unused row to get the default height from,
-// searching backwards from max row
-for ( SCROW nRow = GetMaxPos().Row(); nRow = 0; --nRow )
+const RowRef rRow = itr-second;
+if (rRow-IsDefaultable())
{
-if ( maRowMap.find( nRow ) == maRowMap.end() )
+XclExpDefaultRowData aDefData( *rRow );
+size_t rnDefCount = aDefRowMap[ aDefData ];
+++rnDefCount;
+if( rnDefCount nMaxDefCount )
{
-// use first encountered unused row height as default
-// I wonder should we do this always ( and abandon the search
-// of exising rows )
-aMaxDefData.mnHeight = GetDoc().GetRowHeight(nRow,
GetCurrScTab(), false);
-break;
+nMaxDefCount = rnDefCount;
+aMaxDefData = aDefData;
}
}
}
+
// return the default row format to caller
rDefRowData = aMaxDefData;
@@ -2165,17 +2146,13 @@ XclExpDimensions* XclExpRowBuffer::GetDimensions()
XclExpRow XclExpRowBuffer::GetOrCreateRow( sal_uInt32 nXclRow, bool
bRowAlwaysEmpty )
{
-RowMap::iterator itr = maRowMap.begin();
-for ( size_t nFrom = maRowMap.size(); nFrom = nXclRow; ++nFrom )
+RowMap::iterator itr = maRowMap.find(nXclRow);
+if (itr == maRowMap.end())
{
-itr = maRowMap.find(nFrom);
-if ( itr == maRowMap.end() )
-{
-RowRef p(new XclExpRow(GetRoot(), nFrom, maOutlineBfr,
Re: [PATCH] fixed Replace all message in Basic IDE
Hi János, On Wednesday, 2012-07-25 16:11:24 +0200, János Uray wrote: In Basic IDE, Replace all said Search key replaced times, so without the number. Hmm.. actually it should be a character corresponding to the value of nFound, not just a blank.. This patch fixes it. (The nFound was treated as a character instead of an integer.) --- a/basctl/source/basicide/basides1.cxx +++ b/basctl/source/basicide/basides1.cxx -sal_uInt16 nFound = 0; +int nFound = 0; valueOf() is defined for sal_... types, so instead of using int here it should be sal_Int32. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgpcQezISQeGF.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - sc/source
sc/source/core/data/conditio.cxx | 13 +++
sc/source/core/inc/refupdat.hxx |2
sc/source/core/tool/rangelst.cxx | 31
sc/source/core/tool/refupdat.cxx | 142 +++
4 files changed, 116 insertions(+), 72 deletions(-)
New commits:
commit 76f56b5e8d4abf17682aa75b7cf183b883809234
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Jul 24 08:54:58 2012 +0200
delete conditional format entries that are removed, fdo#52351
Change-Id: I9ab70d2b7a557ae5f717898edfb6c363343462f6
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index 7444833..3d3611b 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -1588,6 +1588,19 @@ void ScConditionalFormatList::UpdateReference(
UpdateRefMode eUpdateRefMode,
{
for( iterator itr = begin(); itr != end(); ++itr)
itr-UpdateReference( eUpdateRefMode, rRange, nDx, nDy, nDz );
+
+if( eUpdateRefMode == URM_INSDEL )
+{
+// need to check which must be deleted
+iterator itr = begin();
+while(itr != end())
+{
+if(itr-GetRange().empty())
+maConditionalFormats.erase(itr++);
+else
+++itr;
+}
+}
}
void ScConditionalFormatList::RenameCellStyle( const String rOld, const
String rNew )
diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx
index d2bdec3..4ff6ff0 100644
--- a/sc/source/core/tool/rangelst.cxx
+++ b/sc/source/core/tool/rangelst.cxx
@@ -146,6 +146,29 @@ private:
bool mbFirst;
};
+class FindDeletedRange : public ::std::unary_functionbool, const ScRange*
+{
+public:
+FindDeletedRange( SCsCOL nDx, SCsROW nDy): mnDx(nDx), mnDy(nDy) {}
+FindDeletedRange( const FindDeletedRange r) : mnDx(r.mnDx), mnDy(r.mnDy)
{}
+bool operator() (const ScRange* p)
+{
+ScAddress rStart = p-aStart;
+ScAddress rEnd = p-aEnd;
+
+if( rEnd.Col() +mnDx rStart.Col() )
+return true;
+if( rEnd.Row() + mnDy rStart.Row() )
+return true;
+
+return false;
+}
+
+private:
+SCsCOL mnDx;
+SCsROW mnDy;
+};
+
}
// === ScRangeList
@@ -380,6 +403,14 @@ bool ScRangeList::UpdateReference(
SCTAB nTab2;
rWhere.GetVars( nCol1, nRow1, nTab1, nCol2, nRow2, nTab2 );
+// delete all entries that are fully deleted
+if( eUpdateRefMode == URM_INSDEL (nDx 0 || nDy 0) )
+{
+vectorScRange*::iterator itr = std::remove_if(maRanges.begin(),
maRanges.end(), FindDeletedRange(nDx, nDy));
+for_each(itr, maRanges.end(), ScDeleteObjectByPtrScRange());
+maRanges.erase(itr, maRanges.end());
+}
+
vectorScRange*::iterator itr = maRanges.begin(), itrEnd = maRanges.end();
for (; itr != itrEnd; ++itr)
{
commit d619f3a6da2481c6739818a74a328df9ec2bd24d
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Mon Jul 23 23:18:10 2012 +0200
sal_Bool - bool in ScRefUpdate
Change-Id: I2bf6583a465d1aee1b8a8788f52c61059b98de76
diff --git a/sc/source/core/inc/refupdat.hxx b/sc/source/core/inc/refupdat.hxx
index 201ca64..58b4cc9 100644
--- a/sc/source/core/inc/refupdat.hxx
+++ b/sc/source/core/inc/refupdat.hxx
@@ -68,7 +68,7 @@ public:
/// Before calling, the absolute references must be up-to-date!
static ScRefUpdateRes Move( ScDocument* pDoc, const ScAddress rPos,
SCsCOL nDx, SCsROW nDy, SCsTAB nDz,
-ScComplexRefData rRef, sal_Bool bWrap,
sal_Bool bAbsolute );
+ScComplexRefData rRef, bool bWrap, bool
bAbsolute );
static void MoveRelWrap( ScDocument* pDoc, const ScAddress rPos,
SCCOL nMaxCol, SCROW nMaxRow, ScComplexRefData
rRef );
diff --git a/sc/source/core/tool/refupdat.cxx b/sc/source/core/tool/refupdat.cxx
index 34c48a1..38fe766 100644
--- a/sc/source/core/tool/refupdat.cxx
+++ b/sc/source/core/tool/refupdat.cxx
@@ -35,9 +35,9 @@
//
template typename R, typename S, typename U
-sal_Bool lcl_MoveStart( R rRef, U nStart, S nDelta, U nMask )
+bool lcl_MoveStart( R rRef, U nStart, S nDelta, U nMask )
{
-sal_Bool bCut = false;
+bool bCut = false;
if ( rRef = nStart )
rRef = sal::static_int_castR( rRef + nDelta );
else if ( nDelta 0 rRef = nStart + nDelta )
@@ -45,20 +45,20 @@ sal_Bool lcl_MoveStart( R rRef, U nStart, S nDelta, U
nMask )
if ( rRef 0 )
{
rRef = 0;
-bCut = sal_True;
+bCut = true;
}
else if ( rRef nMask )
{
rRef = nMask;
-bCut = sal_True;
+bCut = true;
}
return bCut;
}
template typename R, typename S, typename U
-sal_Bool lcl_MoveEnd( R rRef, U nStart, S nDelta, U nMask
[Libreoffice-commits] .: vcl/inc vcl/source
vcl/inc/vcl/button.hxx |5 ++--
vcl/source/control/button.cxx | 47 -
vcl/source/control/menubtn.cxx |5 +---
3 files changed, 24 insertions(+), 33 deletions(-)
New commits:
commit 452e452d3e9dcc259bc3e58ed6509284004f04fe
Author: Ivan Timofeev timofeev@gmail.com
Date: Wed Jul 25 22:28:48 2012 +0400
refactor the symbol hit test
Change-Id: I739855830a7135c8e0a8d80d4f1f84e5a3901204
diff --git a/vcl/inc/vcl/button.hxx b/vcl/inc/vcl/button.hxx
index 9eb6088..0fd0bcf 100644
--- a/vcl/inc/vcl/button.hxx
+++ b/vcl/inc/vcl/button.hxx
@@ -66,8 +66,9 @@ public:
SAL_DLLPRIVATE const Rectangle ImplGetFocusRect() const;
SAL_DLLPRIVATE void ImplSetSymbolAlign( SymbolAlign eAlign );
SAL_DLLPRIVATE void ImplSetSmallSymbol( sal_Bool bSmall =
sal_True );
-SAL_DLLPRIVATE const Rectangle ImplGetSymbolRect() const;
-SAL_DLLPRIVATE void ImplSetSymbolRect(const Rectangle);
+/// The x-coordinate of the vertical separator line, use in MenuButton
subclass only.
+SAL_DLLPRIVATE long ImplGetSeparatorX() const;
+SAL_DLLPRIVATE void ImplSetSeparatorX( long nX );
protected:
Button( WindowType nType );
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 42579ac..406377b 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -72,7 +72,7 @@ class ImplCommonButtonData
{
public:
Rectangle maFocusRect;
-Rectangle maSymbolRect;
+longmnSeparatorX;
sal_uInt16 mnButtonState;
sal_BoolmbSmallSymbol;
@@ -223,14 +223,14 @@ void Button::SetFocusRect( const Rectangle rFocusRect )
// ---
-const Rectangle Button::ImplGetSymbolRect() const
+long Button::ImplGetSeparatorX() const
{
-return mpButtonData-maSymbolRect;
+return mpButtonData-mnSeparatorX;
}
-void Button::ImplSetSymbolRect( const Rectangle i_rRect )
+void Button::ImplSetSeparatorX( long nX )
{
-mpButtonData-maSymbolRect = i_rRect;
+mpButtonData-mnSeparatorX = nX;
}
// ---
@@ -860,47 +860,39 @@ void PushButton::ImplDrawPushButtonContent( OutputDevice*
pDev, sal_uLong nDrawF
nImageSep = 1;
if ( mnDDStyle == PUSHBUTTON_DROPDOWN_MENUBUTTON )
{
-Rectangle aHotspotRect = rRect;
+long nSeparatorX = 0;
+Rectangle aSymbolRect = aInRect;
if ( aText.Len() ! (ImplGetButtonState() BUTTON_DRAW_NOTEXT) )
{
// calculate symbol size
long nSymbolSize= pDev-GetTextHeight() / 2 + 1;
-// caluclate dimension of hotspot rectangle
-aHotspotRect.Left() = aHotspotRect.Right() - 2*nSymbolSize;
+nSeparatorX = aInRect.Right() - 2*nSymbolSize;
+aSize.Width() -= 2*nSymbolSize;
-// center symbol rectangle inside hotspot rectangle
-aInRect.Right() = aHotspotRect.Right() - nSymbolSize/2 + 1;
-aInRect.Left() = aInRect.Right() - nSymbolSize;
-
-aSize.Width() -= aHotspotRect.GetWidth();
+// center symbol rectangle in the separated area
+aSymbolRect.Right() -= nSymbolSize/2;
+aSymbolRect.Left() = aSymbolRect.Right() - nSymbolSize;
ImplDrawAlignedImage( pDev, aPos, aSize, bLayout, nImageSep,
nDrawFlags, nTextStyle, NULL, true );
}
else
-ImplCalcSymbolRect( aInRect );
+ImplCalcSymbolRect( aSymbolRect );
if( ! bLayout )
{
-long nDistance = (aInRect.GetHeight() 10) ? 2 : 1;
+long nDistance = (aSymbolRect.GetHeight() 10) ? 2 : 1;
DecorationView aDecoView( pDev );
-if( bMenuBtnSep )
+if( bMenuBtnSep nSeparatorX 0 )
{
-long nX = aHotspotRect.Left();
-Point aStartPt( nX, aHotspotRect.Top()+nDistance );
-Point aEndPt( nX, aHotspotRect.Bottom()-nDistance );
+Point aStartPt( nSeparatorX, aSymbolRect.Top()+nDistance );
+Point aEndPt( nSeparatorX, aSymbolRect.Bottom()-nDistance );
aDecoView.DrawSeparator( aStartPt, aEndPt );
}
+ImplSetSeparatorX( nSeparatorX );
-aDecoView.DrawSymbol( aInRect, SYMBOL_SPIN_DOWN, aColor, nStyle );
-
-// hack: include decoration into hotspot rectangle (hopefully +10
is enough)
-aHotspotRect.Right() += 10;
-aHotspotRect.Bottom() += 10;
-aHotspotRect.Top() -= 10;
-
-ImplSetSymbolRect( aHotspotRect );
+aDecoView.DrawSymbol( aSymbolRect, SYMBOL_SPIN_DOWN, aColor,
nStyle );
}
}
@@ -916,7 +908,6
Re: [PATCH] Fix for sw_filter_test crash due to ambiguous FieldEntry destructor
On 24/07/12 15:20, Stephan Bergmann wrote: On 07/23/2012 05:28 PM, Stephan Bergmann wrote: On 07/23/2012 04:40 PM, Michael Stahl wrote: On 22/07/12 11:25, Kristian Rietveld wrote: (Please keep me on CC as I am not subscribed to the list) [...] that is really not supposed to happen, we really should build everything with -fvisibility=hidden on all platforms where unnecessarily exported symbols cause such problems (guess that means everything but Windows). on master and libreoffice-3-6, in solenv/gbuild/platform/macosx.mk the -fvisibility=hidden is inside: ifeq ($(HAVE_GCC_VISIBILITY_FEATURE),TRUE) can you check that that is actually detected properly for your compiler? Explicitly disabled for Clang on Mac OS X in configure.in, see http://cgit.freedesktop.org/libreoffice/core/commit/?id=e5143062887093037cab8f936288af8408576ea8 Visibility doesn't seem to work as we want in Apple's Clang. :( and if you revert that (leading to HAVE_GCC_VISIBILITY_FEATURE=TRUE and HAVE_GCC_VISIBILITY_BROKEN=TRUE), the build starts to break as e.g. libxolo.dylib contains __ZN4cppu15WeakImplHelper6IN3com3sun4star8document7XFilterENS3_4lang12XServiceInfoENS4_9XExporterENS6_15XInitializationENS3_9container6XNamedENS6_10XUnoTunnelEE14queryInterfaceERKNS3_3uno4TypeE (aka cppu::WeakImplHelper6com::sun::star::document::XFilter, com::sun::star::lang::XServiceInfo, com::sun::star::document::XExporter, com::sun::star::lang::XInitialization, com::sun::star::container::XNamed, com::sun::star::lang::XUnoTunnel::queryInterface(com::sun::star::uno::Type const)) as t (nm: non-external text section symbol), causing the linking of liblnglo.dylib (module linguistic) to fail with Undefined symbols for architecture i386: 'cppu::WeakImplHelper6com::sun::star::document::XFilter, com::sun::star::lang::XServiceInfo, com::sun::star::document::XExporter, com::sun::star::lang::XInitialization, com::sun::star::container::XNamed, com::sun::star::lang::XUnoTunnel::queryInterface(com::sun::star::uno::Type const)', referenced from: vtable for ConvDicXMLExport in convdicxml.o etc. With a Clang 3.1 build on Linux, on the other hand, that queryInterface symbol is exported from libxolo.so as W (nm: external weak symbol), so liblnglo.so can link against it. problem is here in linguistic: class ConvDicXMLExport : public SvXMLExport aha... hmm... so this is a problem for template base classes, and we have a lot of those WeakImplHelperN base classes. it appears that at least GCC supports a weak attribute; perhaps somebody could try out what happens with clang when it is added to the definition of SAL_DLLPUBLIC_TEMPLATE. diff --git a/sal/inc/sal/types.h b/sal/inc/sal/types.h index 3db8cf4..28a908d 100644 --- a/sal/inc/sal/types.h +++ b/sal/inc/sal/types.h @@ -273,7 +273,7 @@ typedef void * sal_Handle; # define SAL_DLLPUBLIC_EXPORT __attribute__ ((visibility(default))) # define SAL_DLLPUBLIC_IMPORT __attribute__ ((visibility(default))) # define SAL_DLLPRIVATE__attribute__ ((visibility(hidden))) -# define SAL_DLLPUBLIC_TEMPLATE __attribute__ ((visibility(default))) +# define SAL_DLLPUBLIC_TEMPLATE __attribute__ ((visibility(default),weak)) # else # define SAL_DLLPUBLIC_EXPORT # define SAL_DLLPUBLIC_IMPORT ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Newbie Q - autogen.sh. Can't execute.
Hello, I'm new here, and new to LibreOffice development. I've been working my way through the steps to build LO by following the description on the wiki (http://wiki.documentfoundation.org/Development/Native_Build). I have git cloned the source code to my local Ubuntu 12.04 machine, and am working with the master branch by default (i.e. I did not change my working copy/checkout a release branch). I've hit a wall when trying to execute autogen.sh: jim@JimdJ-Linux:/media/DEV/libo$ ls -l autogen.sh -rw--- 1 jim jim 5556 Jul 24 16:54 autogen.sh jim@JimdJ-Linux:/media/DEV/libo$ chmod 777 autogen.sh jim@JimdJ-Linux:/media/DEV/libo$ ls -l autogen.sh -rw--- 1 jim jim 5556 Jul 24 16:54 autogen.sh jim@JimdJ-Linux:/media/DEV/libo$ sudo chmod 777 autogen.sh jim@JimdJ-Linux:/media/DEV/libo$ ls -l autogen.sh -rw--- 1 jim jim 5556 Jul 24 16:54 autogen.sh jim@JimdJ-Linux:/media/DEV/libo$ ./autogen.sh bash: ./autogen.sh: Permission denied jim@JimdJ-Linux:/media/DEV/libo$ ./autogen.sh --help bash: ./autogen.sh: Permission denied jim@JimdJ-Linux:/media/DEV/libo$ sudo ./autogen.sh sudo: ./autogen.sh: command not found jim@JimdJ-Linux:/media/DEV/libo$ sudo autogen.sh sudo: autogen.sh: command not found (Forgive the 777 for now, please.) Did I miss something? Is it possible I need to explicitly checkout the master branch after cloning? Jim ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Newbie Q - autogen.sh. Can't execute.
Hello Jim, On 07/25/2012 01:08 PM, Jim deJonge wrote: jim@JimdJ-Linux:/media/DEV/libo$ ls -l autogen.sh ^ This tells me that you are trying to execute a script on an external volume. The first thing I would check is if you have noexec option specified when mounting this volume. Try writing any script, turn the exec bit on and try to run it on that volume. Does that run at all? Or perhaps that volume uses a FAT file system and IIRC you can't execute anything from FAT. Anyway, these are my first guesses. Kohei -- Kohei Yoshida, LibreOffice hacker, Calc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Newbie Q - autogen.sh. Can't execute.
On Wed, Jul 25, 2012 at 12:08 PM, Jim deJonge jimdejo...@hotmail.com wrote: Hello, I'm new here, and new to LibreOffice development. I've been working my way through the steps to build LO by following the description on the wiki (http://wiki.documentfoundation.org/Development/Native_Build). I have git cloned the source code to my local Ubuntu 12.04 machine, and am working with the master branch by default (i.e. I did not change my working copy/checkout a release branch). I've hit a wall when trying to execute autogen.sh: jim@JimdJ-Linux:/media/DEV/libo$ ls -l autogen.sh -rw--- 1 jim jim 5556 Jul 24 16:54 autogen.sh jim@JimdJ-Linux:/media/DEV/libo$ chmod 777 autogen.sh jim@JimdJ-Linux:/media/DEV/libo$ ls -l autogen.sh -rw--- 1 jim jim 5556 Jul 24 16:54 autogen.sh to me that indicate that somehow the filesystem you are in just ignore +x mod. since it is /media... my bet is that is mounted -noexec Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] Native background for some more widgets
Hello Ruslan, On 12.07.2012 14:50, Ruslan Kabatsayev wrote: These patches make TabBar and ToolBox have correct native background (needed for bg gradients and other non-flat-colored backgrounds). this patch a bit breaks a toolbar look to me. (on Linux, the default Ubuntu's Ambiance theme, have not tried on windows, where it is now completely broken I guess). vcl/source/window/toolbox.cxx:575: // toolbars known to the dockingmanager will be drawn using NWF or a gradient // docked toolbars are transparent and NWF is already used in the docking area which is their common background // so NWF is used here for floating toolbars only So I'd revert that change it toolbox.cxx. Opinions? Regards, Ivan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Adding bibisect repository support to tinbuild2
On 21/07/12 23:12, Norbert Thiebaud wrote: So... I committed you patch, and then refactored it 'a bit' First I separated the operation in 3 differents operations: 1/ the need to make the install: I added in Makefile.top a new install-tb target that avoid the 'rebuilding' for nothing, and just do make dev-install (except that on linux it does not use the 'link to solver' abilities, to not screw up the cp -R later) is a new make target substantially duplicating an existing one really necessary? there is a configure option --disable-linkoo to have a solver installation without symlinks, couldn't the tinderboxes that do bibisect just set that? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Adding bibisect repository support to tinbuild2
On Wed, Jul 25, 2012 at 2:47 PM, Michael Stahl mst...@redhat.com wrote: On 21/07/12 23:12, Norbert Thiebaud wrote: So... I committed you patch, and then refactored it 'a bit' First I separated the operation in 3 differents operations: 1/ the need to make the install: I added in Makefile.top a new install-tb target that avoid the 'rebuilding' for nothing, and just do make dev-install (except that on linux it does not use the 'link to solver' abilities, to not screw up the cp -R later) is a new make target substantially duplicating an existing one really necessary? there is a configure option --disable-linkoo to have a solver installation without symlinks, couldn't the tinderboxes that do bibisect just set that? 1/ this step is purely for the mechanic of the tinderbox it is not intended to test any thing specific... so the less susceptible the tinderboxes are to the whim of the day, the better. 2/ I think the cost to not to high to keep the tb setup 'simple'... iow a 'it just just work'. the way it is now, all you have to do to start a bibisect repo is to create an empty repo, create a dummy commit, set the ARTIFACTDIR variable in the config file of the tb and use -x when running it. I prefer to avoid depending on configure option that may or may not be there tomorrow , that may or may not mean the same thing tomorrow, as much as I can. 3/ all that being said... if you feel strongly about it I can learn to live with --disable-linkoo Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Adding bibisect repository support to tinbuild2
On 25/07/12 22:01, Norbert Thiebaud wrote: On Wed, Jul 25, 2012 at 2:47 PM, Michael Stahl mst...@redhat.com wrote: On 21/07/12 23:12, Norbert Thiebaud wrote: So... I committed you patch, and then refactored it 'a bit' First I separated the operation in 3 differents operations: 1/ the need to make the install: I added in Makefile.top a new install-tb target that avoid the 'rebuilding' for nothing, and just do make dev-install (except that on linux it does not use the 'link to solver' abilities, to not screw up the cp -R later) is a new make target substantially duplicating an existing one really necessary? there is a configure option --disable-linkoo to have a solver installation without symlinks, couldn't the tinderboxes that do bibisect just set that? 1/ this step is purely for the mechanic of the tinderbox it is not intended to test any thing specific... so the less susceptible the tinderboxes are to the whim of the day, the better. 2/ I think the cost to not to high to keep the tb setup 'simple'... iow a 'it just just work'. the way it is now, all you have to do to start a bibisect repo is to create an empty repo, create a dummy commit, set the ARTIFACTDIR variable in the config file of the tb and use -x when running it. I prefer to avoid depending on configure option that may or may not be there tomorrow , that may or may not mean the same thing tomorrow, as much as I can. 3/ all that being said... if you feel strongly about it I can learn to live with --disable-linkoo the problem with the duplication is that the next time somebody fixes a problem with the dev-install target they will probably forget to fix the install-tb target as well, and if the problem affects tinderboxes as well then they will remain broken. whether that is more likely, or whether a change to --disable-linkoo is more likely, is of course speculative. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 3 commits - forms/source sfx2/inc sfx2/source sw/source
forms/source/component/clickableimage.cxx | 21 -
sfx2/inc/sfx2/docfile.hxx |1 -
sfx2/inc/sfx2/objsh.hxx |1 -
sfx2/source/appl/fileobj.cxx |2 --
sfx2/source/bastyp/sfxhtml.cxx| 10 +-
sfx2/source/doc/docfile.cxx | 11 ---
sfx2/source/doc/objmisc.cxx | 14 --
sfx2/source/doc/objstor.cxx |5 +
sw/source/core/unocore/unocrsrhelper.cxx |1 -
sw/source/filter/html/htmlcss1.cxx|4
sw/source/ui/uiview/view2.cxx |2 +-
11 files changed, 3 insertions(+), 69 deletions(-)
New commits:
commit 3824ec8ea57db309f00b79337c81b7401dc19c58
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Wed Jul 25 16:24:31 2012 -0400
Fix the dbgutil build.
Change-Id: Ic6142550a7e76b2b1cd8ff6d53d503d771c32b7c
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index c5645fd..ed80ba2 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -1643,7 +1643,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl
else if (!pMedium-GetName().isEmpty()
|| ( pMedium-HasStorage_Impl()
pMedium-WillDisposeStorageOnClose_Impl() ) )
{
-OSL_ENSURE( pMedium-GetName().Len(), Fallback is used,
the medium without name should not dispose the storage!\n );
+OSL_ENSURE(!pMedium-GetName().isEmpty(), Fallback is
used, the medium without name should not dispose the storage!\n);
// copy storage of old medium to new temporary storage and
take this over
if( !ConnectTmpStorage_Impl( pMedium-GetStorage(),
pMedium ) )
{
commit 73bc1c8b7a43ce74540556ef458212c1873d9160
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Wed Jul 25 16:23:13 2012 -0400
Referer was set to SfxMedium but was never used. Removing it.
Change-Id: I88ab874d4efc60d58722f0bb175d14a4d443398b
diff --git a/forms/source/component/clickableimage.cxx
b/forms/source/component/clickableimage.cxx
index 8896be8..e58d914 100644
--- a/forms/source/component/clickableimage.cxx
+++ b/forms/source/component/clickableimage.cxx
@@ -790,26 +790,12 @@ namespace frm
#ifdef USE_REGISTER_TRANSFER
if( pObjSh )
{
-// Medium registrieren, damit abgebrochen werden kann
-pObjSh-RegisterTransfer( *m_pMedium );
-
// Target-Frame uebertragen, damit auch javascript:-URLs
// geladen werden koennen.
const SfxMedium *pShMedium = pObjSh-GetMedium();
if( pShMedium )
m_pMedium-SetLoadTargetFrame(pShMedium-GetLoadTargetFrame());
}
-else
-{
-// Keine Object-Shell, aber ein Medium? Dann uebernehmen wir
-// zumindest den Referer.
-if( xModel.is() )
-{
-::rtl::OUString sReferer( xModel-getURL() );
-if( sReferer.getLength() )
-m_pMedium-SetReferer( OUStringToString(sReferer,
CHARSET_SYSTEM) );
-}
-}
#else
if( pObjSh )
{
@@ -819,13 +805,6 @@ namespace frm
if( pShMedium )
m_pMedium-SetLoadTargetFrame(pShMedium-GetLoadTargetFrame());
}
-
-if( xModel.is() )
-{
-::rtl::OUString sReferer( xModel-getURL() );
-if( !sReferer.isEmpty() )
-m_pMedium-SetReferer( sReferer );
-}
#endif
// Downloading-Flag auf sal_True setzen. Es werden dann auch
diff --git a/sfx2/inc/sfx2/docfile.hxx b/sfx2/inc/sfx2/docfile.hxx
index deaa077..abf61a0 100644
--- a/sfx2/inc/sfx2/docfile.hxx
+++ b/sfx2/inc/sfx2/docfile.hxx
@@ -122,7 +122,6 @@ public:
voidSetLoadTargetFrame(SfxFrame* pFrame );
SfxFrame* GetLoadTargetFrame() const;
-voidSetReferer( const String rRefer );
voidSetFilter(const SfxFilter *pFlt, sal_Bool bResetOrig =
sal_False);
const SfxFilter* GetFilter() const;
const SfxFilter * GetOrigFilter( sal_Bool bNotCurrent = sal_False )
const;
diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx
index 1fad0b6..29710c6 100644
--- a/sfx2/inc/sfx2/objsh.hxx
+++ b/sfx2/inc/sfx2/objsh.hxx
@@ -433,7 +433,6 @@ public:
// Transfer IFace
voidAbortImport();
sal_BoolIsAbortingImport() const;
-voidRegisterTransfer( SfxMedium rMedium );
sal_BoolIsReloading() const;
voidFinishedLoading( sal_uInt16 nWhich =
SFX_LOADED_ALL );
void
[Libreoffice-commits] .: sfx2/inc sfx2/source sw/source
sfx2/inc/sfx2/sfxhtml.hxx |2 +-
sfx2/source/bastyp/sfxhtml.cxx |2 +-
sw/source/filter/html/htmlcss1.cxx |2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit c07fe0d98b14bce18ba676b7dcec6c6245b55660
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Wed Jul 25 16:29:26 2012 -0400
Remove unused parameter.
Change-Id: Ib6539528655c5def0d0802602ec913799f0ab07a
diff --git a/sfx2/inc/sfx2/sfxhtml.hxx b/sfx2/inc/sfx2/sfxhtml.hxx
index e0ccf59..971d793 100644
--- a/sfx2/inc/sfx2/sfxhtml.hxx
+++ b/sfx2/inc/sfx2/sfxhtml.hxx
@@ -81,7 +81,7 @@ protected:
// up by FinishFileDownload. To cancel the download should a shell be
// left. It can only exist a single download at the same time, For every
// started download FinshFileDownload must be called.
-void StartFileDownload( const String rURL, SfxObjectShell *pSh=0 );
+void StartFileDownload(const OUString rURL);
// End of an asynchronous file download. Returns TRUE if the download
// was successful. The read file is then passed into String.
diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx
index fd6578d..9c64259 100644
--- a/sfx2/source/bastyp/sfxhtml.cxx
+++ b/sfx2/source/bastyp/sfxhtml.cxx
@@ -225,7 +225,7 @@ IMAPOBJ_SETEVENT:
return bNewArea;
}
-void SfxHTMLParser::StartFileDownload( const String rURL, SfxObjectShell*
/*pSh*/ )
+void SfxHTMLParser::StartFileDownload(const OUString rURL)
{
DBG_ASSERT( !pDLMedium, StartFileDownload when active Download );
if( pDLMedium )
diff --git a/sw/source/filter/html/htmlcss1.cxx
b/sw/source/filter/html/htmlcss1.cxx
index ecc0f58..f3fe2b6 100644
--- a/sw/source/filter/html/htmlcss1.cxx
+++ b/sw/source/filter/html/htmlcss1.cxx
@@ -1821,7 +1821,7 @@ void SwHTMLParser::InsertLink()
if( GetMedium() )
{
// Download des Style-Source starten
-StartFileDownload(sHRef, pDoc-GetDocShell());
+StartFileDownload(sHRef);
if( IsParserWorking() )
{
// Der Style wurde synchron geladen und wir koennen
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sfx2/inc sfx2/source
sfx2/inc/sfx2/docfile.hxx |1 -
sfx2/source/doc/docfile.cxx | 11 ---
sfx2/source/doc/objmisc.cxx | 12
3 files changed, 24 deletions(-)
New commits:
commit 07c1dac0d8844b48290bac4b55c055cc897e61af
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Wed Jul 25 16:41:45 2012 -0400
Likewise, CharSet was set in SfxMedium but never used. Removing.
Change-Id: Ie7e6564ab1efa855df0202b88b7ff80ec71b8cb5
diff --git a/sfx2/inc/sfx2/docfile.hxx b/sfx2/inc/sfx2/docfile.hxx
index abf61a0..b4da325 100644
--- a/sfx2/inc/sfx2/docfile.hxx
+++ b/sfx2/inc/sfx2/docfile.hxx
@@ -201,7 +201,6 @@ public:
::rtl::OUString SwitchDocumentToTempFile();
sal_BoolSwitchDocumentToFile( ::rtl::OUString aURL );
-voidSetCharset( ::rtl::OUString );
::rtl::OUString GetBaseURL( bool bForSaving=false );
#if _SOLAR__PRIVATE
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index e8534ad..d6a0864 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -254,7 +254,6 @@ public:
bool bIsStorage:1;
bool bUseInteractionHandler:1;
bool bAllowDefaultIntHdl:1;
-bool bIsCharsetInitialized:1;
bool bDisposeStorage:1;
bool bStorageBasedOnInStream:1;
bool m_bSalvageMode:1;
@@ -305,7 +304,6 @@ public:
uno::Reference io::XStream m_xLockingStream;
sal_uInt32 nLastStorageError;
-::rtl::OUString aCharset;
::com::sun::star::uno::Reference
::com::sun::star::task::XInteractionHandler xInteraction;
@@ -336,7 +334,6 @@ SfxMedium_Impl::SfxMedium_Impl( SfxMedium* pAntiImplP ) :
bIsStorage( false ),
bUseInteractionHandler( true ),
bAllowDefaultIntHdl( false ),
-bIsCharsetInitialized( false ),
bStorageBasedOnInStream( false ),
m_bSalvageMode( false ),
m_bVersionsAlreadyLoaded( false ),
@@ -3070,8 +3067,6 @@ SvKeyValueIterator* SfxMedium::GetHeaderAttributes_Impl()
if ( GetContent().is() )
{
-pImp-bIsCharsetInitialized = true;
-
try
{
Any aAny = pImp-aContent.getPropertyValue(
::rtl::OUString(MediaType) );
@@ -3414,12 +3409,6 @@ void SfxMedium::CreateTempFileNoCopy()
CloseStorage();
}
-void SfxMedium::SetCharset( ::rtl::OUString aChs )
-{
-pImp-bIsCharsetInitialized = true;
-pImp-aCharset = aChs;
-}
-
sal_Bool SfxMedium::SignContents_Impl( sal_Bool bScriptingContent, const
::rtl::OUString aODFVersion, sal_Bool bHasValidDocumentSignature )
{
bool bChanges = false;
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 5aa85a2..8eada23 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -1668,18 +1668,6 @@ void SfxHeaderAttributes_Impl::SetAttribute( const
SvKeyValue rKV )
pDoc-GetMedium()-SetExpired_Impl( Date( 1, 1, 1970 ) );
}
}
-else if( rKV.GetKey().CompareIgnoreCaseToAscii( content-type ) ==
COMPARE_EQUAL )
-{
-String sType, sSubType;
-INetContentTypeParameterList aParameters;
-
-if (INetContentTypes::parse(aValue, sType, sSubType, aParameters))
-{
-const INetContentTypeParameter * pCharset =
aParameters.find(charset);
-if (pCharset != 0)
-pDoc-GetMedium()-SetCharset( pCharset-m_sValue );
-}
-}
}
void SfxHeaderAttributes_Impl::Append( const SvKeyValue rKV )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: o3tl/inc
o3tl/inc/o3tl/sorted_vector.hxx | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 8f5b707d905f84f0102d1fdf365761ca03688742
Author: Michael Stahl mst...@redhat.com
Date: Wed Jul 25 22:55:09 2012 +0200
sorted_vector: removing the vector::ersase makes more sense
Change-Id: Id70e87ab1b7f6a55ad2374cab05fa7f3bdef2cc4
diff --git a/o3tl/inc/o3tl/sorted_vector.hxx b/o3tl/inc/o3tl/sorted_vector.hxx
index 48ad0bc..0fe46cf 100644
--- a/o3tl/inc/o3tl/sorted_vector.hxx
+++ b/o3tl/inc/o3tl/sorted_vector.hxx
@@ -34,7 +34,6 @@ public:
typedef typename std::vectorValue::size_type size_type;
using base_t::clear;
-using base_t::erase;
using base_t::empty;
using base_t::size;
@@ -56,7 +55,7 @@ public:
iterator it = lower_bound_nonconst( x );
if (it != base_t::end() !less_than(x, *it))
{
-erase( it );
+base_t::erase(it);
return 1;
}
return 0;
@@ -67,7 +66,12 @@ public:
base_t::erase( begin_nonconst() + index );
}
-// hack: public erase with const_iterator, should not change sort order
+// like C++ 2011: erase with const_iterator (doesn't change sort order)
+void erase(const_iterator const position)
+{ // C++98 has vector::erase(iterator), so call that
+base_t::erase(begin_nonconst() + (position - begin()));
+}
+
void erase(const_iterator const first, const_iterator const last)
{
base_t::erase(begin_nonconst() + (first - begin()),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Adding bibisect repository support to tinbuild2
On Wed, Jul 25, 2012 at 3:09 PM, Michael Stahl mst...@redhat.com wrote: the problem with the duplication is that the next time somebody fixes a problem with the dev-install target they will probably forget to fix the install-tb target as well, and if the problem affects tinderboxes as well then they will remain broken. whether that is more likely, or whether a change to --disable-linkoo is more likely, is of course speculative. True... There is one aspect we missed... install-tb does _not_ depend on the 'build' target (and no -o build did not prevent the whole shebang to be built) so make install-tb does just that... install. adding --disable-linkoo would probably get around the 'divergence' in install-tb vs dev-install but that would not be enough to provided the needed functions. Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Adding bibisect repository support to tinbuild2
On 25/07/12 23:35, Norbert Thiebaud wrote: On Wed, Jul 25, 2012 at 3:09 PM, Michael Stahl mst...@redhat.com wrote: the problem with the duplication is that the next time somebody fixes a problem with the dev-install target they will probably forget to fix the install-tb target as well, and if the problem affects tinderboxes as well then they will remain broken. whether that is more likely, or whether a change to --disable-linkoo is more likely, is of course speculative. True... There is one aspect we missed... install-tb does _not_ depend on the 'build' target (and no -o build did not prevent the whole shebang to be built) yes, the problem is that make does not propagate some options like -W and -o to sub-makes, and the top-level Makefile only handles rebuilding configure; the workaround is to invoke it like this: make -f Makefile.top dev-install -o build ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: svtools/source vcl/inc vcl/source
svtools/source/graphic/grfmgr2.cxx | 41 ---
vcl/inc/vcl/bitmapex.hxx |2
vcl/source/gdi/bitmap3.cxx | 191 ++---
vcl/source/gdi/bitmapex.cxx| 15 +-
4 files changed, 47 insertions(+), 202 deletions(-)
New commits:
commit 085e747b6ca4148b35f37daf622a5ee79710cd66
Author: Tomaž Vajngerl qui...@gmail.com
Date: Wed Jul 25 23:50:33 2012 +0200
Fix bitmap resizing issue when using ScaleRotateCrop with BitmapEx.
Change-Id: I1fd08d94c506580ed7557066448ccb10adb9b16d
diff --git a/svtools/source/graphic/grfmgr2.cxx
b/svtools/source/graphic/grfmgr2.cxx
index f3b6a07..dc6c3c7 100644
--- a/svtools/source/graphic/grfmgr2.cxx
+++ b/svtools/source/graphic/grfmgr2.cxx
@@ -304,11 +304,11 @@ sal_Bool GraphicManager::ImplCreateOutput( OutputDevice*
pOutputDevice,
boolisHorizontalMirrored = ( rAttributes.GetMirrorFlags()
BMP_MIRROR_HORZ ) != 0;
boolisVerticalMirrored = ( rAttributes.GetMirrorFlags()
BMP_MIRROR_VERT ) != 0;
-Rectangle aBitmapRectangle( aOutPointInPixels, aOutSizeInPixels );
// calculate output sizes
if( !pResultBitmapEx )
{
+Rectangle aBitmapRectangle( aOutPointInPixels, aOutSizeInPixels );
Rectangle aOutRect( Point(), pOutputDevice-GetOutputSizePixel() );
if( pOutputDevice-GetOutDevType() == OUTDEV_WINDOW )
@@ -332,7 +332,6 @@ sal_Bool GraphicManager::ImplCreateOutput( OutputDevice*
pOutputDevice,
aOutRect.Top()- aBitmapRectangle.Top(),
aOutRect.Right() - aBitmapRectangle.Left(),
aOutRect.Bottom() - aBitmapRectangle.Top() );
-
}
}
else
@@ -352,14 +351,11 @@ sal_Bool GraphicManager::ImplCreateOutput( OutputDevice*
pOutputDevice,
// do transformation
-// #105229# Don't scale if output size equals bitmap size
-// #107226# Copy through only if we're not mirroring
if( !isHorizontalMirrored
!isVerticalMirrored
-aOutSizeInPixels == rBitmapSizePixels
-!nRotation)
+!nRotation
+aOutSizeInPixels == rBitmapSizePixels)
{
-// #107226# Use original dimensions when just copying through
aOutPoint = pOutputDevice-PixelToLogic( aOutPointInPixels );
aOutSize = pOutputDevice-PixelToLogic( aOutSizeInPixels );
bRet = true;
@@ -374,20 +370,33 @@ sal_Bool GraphicManager::ImplCreateOutput( OutputDevice*
pOutputDevice,
if( isHorizontalMirrored || isVerticalMirrored )
bRet = aBitmapEx.Mirror( rAttributes.GetMirrorFlags() );
-// depending on the flags, scale the image to the desired proportions
-// use FAST scale if no smooth scale is desired
-if( nFlags GRFMGR_DRAW_SMOOTHSCALE)
+if (nRotation)
{
Polygon aPoly( Rectangle( Point(), aUnrotatedSizeInPixels) );
aPoly.Rotate( Point(), nRotation );
Rectangle aNewBound( aPoly.GetBoundRect() );
-Rectangle aCropRectangle2 (
-aCropRectangle.Left() + aNewBound.Left(),
-aCropRectangle.Top() + aNewBound.Top(),
-aCropRectangle.Right() + aNewBound.Left(),
-aCropRectangle.Bottom() + aNewBound.Top());
-bRet = aBitmapEx.ScaleCropRotate( fScaleX, fScaleY,
aCropRectangle2, nRotation, COL_TRANSPARENT );
+aCropRectangle = Rectangle (
+aCropRectangle.Left() + aNewBound.Left(),
+aCropRectangle.Top()+ aNewBound.Top(),
+aCropRectangle.Right() + aNewBound.Left(),
+aCropRectangle.Bottom() + aNewBound.Top() );
+}
+if( nFlags GRFMGR_DRAW_SMOOTHSCALE)
+{
+bRet = aBitmapEx.ScaleCropRotate( fScaleX, fScaleY,
aCropRectangle, nRotation, COL_TRANSPARENT );
+}
+else
+{
+aCropRectangle = Rectangle (
+aCropRectangle.Left() / fScaleX,
+aCropRectangle.Right() / fScaleX,
+aCropRectangle.Top()/ fScaleY,
+aCropRectangle.Bottom() / fScaleY );
+
+bRet = aBitmapEx.Crop( aCropRectangle );
+if (bRet)
+bRet = aBitmapEx.Scale( fScaleX, fScaleY );
}
}
diff --git a/vcl/inc/vcl/bitmapex.hxx b/vcl/inc/vcl/bitmapex.hxx
index a29c271..437c70a 100644
--- a/vcl/inc/vcl/bitmapex.hxx
+++ b/vcl/inc/vcl/bitmapex.hxx
@@ -60,7 +60,7 @@ private:
SizeaBitmapSize;
Color aTransparentColor;
TransparentType eTransparent;
-sal_BoolbAlpha;
+sal_BoolbAlpha;
public:
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx
index b1a028c..edae9e1 100644
--- a/vcl/source/gdi/bitmap3.cxx
+++
[Libreoffice-commits] .: sfx2/source
sfx2/source/doc/docfile.cxx |4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit a201c00b9330f6e765d9fe10b5a6c120f49a6da8
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Wed Jul 25 17:50:09 2012 -0400
The impl class is never null. No point checking for it.
Change-Id: I992e335bf217f3df30356f260ef1eb0f94d40233
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index d6a0864..21f93ab 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -2387,15 +2387,13 @@ sal_Bool SfxMedium::IsRemote()
void SfxMedium::SetUpdatePickList(sal_Bool bVal)
{
-if(!pImp)
-pImp = new SfxMedium_Impl( this );
pImp-bUpdatePickList = bVal;
}
//--
sal_Bool SfxMedium::IsUpdatePickList() const
{
-return pImp? pImp-bUpdatePickList: true;
+return pImp-bUpdatePickList;
}
void SfxMedium::SetLongName(const OUString rName)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Adding bibisect repository support to tinbuild2
On Wed, Jul 25, 2012 at 4:53 PM, Michael Stahl mst...@redhat.com wrote: On 25/07/12 23:35, Norbert Thiebaud wrote: On Wed, Jul 25, 2012 at 3:09 PM, Michael Stahl mst...@redhat.com wrote: the problem with the duplication is that the next time somebody fixes a problem with the dev-install target they will probably forget to fix the install-tb target as well, and if the problem affects tinderboxes as well then they will remain broken. whether that is more likely, or whether a change to --disable-linkoo is more likely, is of course speculative. True... There is one aspect we missed... install-tb does _not_ depend on the 'build' target (and no -o build did not prevent the whole shebang to be built) yes, the problem is that make does not propagate some options like -W and -o to sub-makes, and the top-level Makefile only handles rebuilding configure; the workaround is to invoke it like this: make -f Makefile.top dev-install -o build Thanks, good to know... but let me ask you then: what is more likely: - that someone changed the way that dev-install works in the Makefile and missed install-tb in the same make file a bit below... or - that someone change how the Makefile recursion thingy works and forget to update bin/tinbuild_phases.sh (*) in the contrib/buildbot repo ? :-D Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/mork' - connectivity/source scp2/source
connectivity/source/drivers/mork/MConnection.cxx | 44 ---
scp2/source/ooo/file_library_ooo.scp | 15 +--
scp2/source/ooo/module_hidden_ooo.scp| 34 -
3 files changed, 44 insertions(+), 49 deletions(-)
New commits:
commit 0455098f73efbb26bacbc6b2c15d725932a0ae01
Author: David Ostrovsky da...@ostrovsky.org
Date: Thu Jul 26 00:10:06 2012 +0200
mork driver: scp2 module added
Change-Id: I3ca649a125af7a2533b4353815459179647a8a32
diff --git a/connectivity/source/drivers/mork/MConnection.cxx
b/connectivity/source/drivers/mork/MConnection.cxx
index 848ced5..2d1cde8 100644
--- a/connectivity/source/drivers/mork/MConnection.cxx
+++ b/connectivity/source/drivers/mork/MConnection.cxx
@@ -15,6 +15,8 @@
#include connectivity/dbexception.hxx
#include connectivity/sqlerror.hxx
+#include resource/common_res.hrc
+
#include com/sun/star/sdbc/ColumnValue.hpp
#include com/sun/star/sdbc/XRow.hpp
#include com/sun/star/sdbc/TransactionIsolation.hpp
@@ -67,9 +69,43 @@ void SAL_CALL OConnection::release() throw()
void OConnection::construct(const ::rtl::OUString url,const Sequence
PropertyValue info) throw(SQLException)
{
(void) info; // avoid warnings
-OSL_TRACE(IN OConnection::construct() );
+SAL_INFO(mork, IN OConnection::construct() );
// open file
setURL(url);
+//
+// Skip 'sdbc:mozab: part of URL
+//
+sal_Int32 nLen = url.indexOf(':');
+nLen = url.indexOf(':',nLen+1);
+OSL_ENSURE( url.copy( 0, nLen ) == sdbc:address,
OConnection::construct: invalid start of the URI - should never have survived
XDriver::acceptsURL! );
+
+::rtl::OUString aAddrbookURI(url.copy(nLen+1));
+// Get Scheme
+nLen = aAddrbookURI.indexOf(':');
+::rtl::OUString aAddrbookScheme;
+::rtl::OUString sAdditionalInfo;
+if ( nLen == -1 )
+{
+// There isn't any subschema: - but could be just subschema
+if ( !aAddrbookURI.isEmpty() )
+{
+aAddrbookScheme= aAddrbookURI;
+}
+else
+{
+SAL_WARN(mork, No subschema given!!!);
+throwGenericSQLException( STR_URI_SYNTAX_ERROR, *this );
+}
+}
+else
+{
+aAddrbookScheme = aAddrbookURI.copy(0, nLen);
+sAdditionalInfo = aAddrbookURI.copy( nLen + 1 );
+}
+
+SAL_INFO(mork, URI = ((OUtoCStr(aAddrbookURI)) ?
(OUtoCStr(aAddrbookURI)):(NULL)) );
+SAL_INFO(mork, Scheme = ((OUtoCStr(aAddrbookScheme)) ?
(OUtoCStr(aAddrbookScheme)):(NULL)) );
+
}
// XServiceInfo
//
@@ -94,7 +130,7 @@ Reference XPreparedStatement SAL_CALL
OConnection::prepareStatement( const ::
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OConnection_BASE::rBHelper.bDisposed);
-OSL_TRACE(OConnection::prepareStatement( %s ), OUtoCStr( _sSql ) );
+SAL_INFO(mork, OConnection::prepareStatement( OUtoCStr( _sSql )
));
return NULL;
}
//
@@ -102,7 +138,7 @@ Reference XPreparedStatement SAL_CALL
OConnection::prepareCall( const ::rtl::
{
OSL_UNUSED( _sSql );
::dbtools::throwFeatureNotImplementedException(
XConnection::prepareCall, *this );
-OSL_TRACE(OConnection::prepareCall( %s ), OUtoCStr( _sSql ) );
+SAL_INFO(mork, OConnection::prepareCall( OUtoCStr( _sSql )
));
return NULL;
}
//
@@ -110,7 +146,7 @@ Reference XPreparedStatement SAL_CALL
OConnection::prepareCall( const ::rtl::
{
::osl::MutexGuard aGuard( m_aMutex );
// when you need to transform SQL92 to you driver specific you can do it
here
-OSL_TRACE(OConnection::nativeSQL( %s ), OUtoCStr( _sSql ) );
+SAL_INFO(OConnection::nativeSQL( %s ), OUtoCStr( _sSql ) );
return _sSql;
}
diff --git a/scp2/source/ooo/file_library_ooo.scp
b/scp2/source/ooo/file_library_ooo.scp
index 0594120..58642f0 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -880,26 +880,17 @@ File gid_File_Lib_Mcnttype
#endif
End
-#if !defined(SYSTEM_MOZILLA) !defined(WITHOUT_MOZILLA) !defined(MACOSX)
-// #i91209#
-STD_LIB_FILE(gid_File_Lib_Mozab,mozab2)
-STD_LIB_FILE(gid_File_Lib_Mozabdrv,mozabdrv)
-
-#else
-
-File gid_File_Lib_Mozbootstrap
+File gid_File_Lib_Mork
LIB_FILE_BODY;
Styles = (PACKED);
Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
-Name = STRING(CONCAT2(libmozbootstrap,UNXSUFFIX));
+Name = STRING(CONCAT2(libmork,UNXSUFFIX));
#else
-Name = mozbootstrap.dll;
+Name = mork.dll;
#endif
End
-#endif
-
STD_LIB_FILE(gid_File_Lib_WpftWriter,wpftwriter)
STD_LIB_FILE(gid_File_Lib_T602Filter,t602filter)
diff --git a/scp2/source/ooo/module_hidden_ooo.scp
[Libreoffice-commits] .: 2 commits - Library_merged.mk tubes/CppunitTest_tubes_test.mk tubes/Library_tubes.mk tubes/Module_tubes.mk tubes/qa tubes/source
Library_merged.mk |4
tubes/CppunitTest_tubes_test.mk | 20 +-
tubes/Library_tubes.mk |1
tubes/Module_tubes.mk |6
tubes/qa/test_manager.cxx | 287 +---
tubes/source/manager.cxx|7
6 files changed, 118 insertions(+), 207 deletions(-)
New commits:
commit 19f92976d8612b9b70264cc33151e944c52124e1
Author: Matúš Kukan matus.ku...@gmail.com
Date: Wed Jul 25 22:48:42 2012 +0200
tubes: resurrect unit test to serve again
- make it subsequent test to be less annoying
- we again inherit from CppUnit::TestFixture
- currently there is no test that we've received the sent packet
- nor any test for received file
- to prevent exporting more symbols we link directly tubes' object files
Change-Id: I79edf0c701f8c46eb45d507266f6dafc0c8eeea2
diff --git a/tubes/CppunitTest_tubes_test.mk b/tubes/CppunitTest_tubes_test.mk
index b2c90d4..c229b2a 100644
--- a/tubes/CppunitTest_tubes_test.mk
+++ b/tubes/CppunitTest_tubes_test.mk
@@ -30,10 +30,15 @@ $(eval $(call
gb_CppunitTest_add_exception_objects,tubes_test, \
tubes/qa/test_manager \
))
-$(eval $(call gb_CppunitTest_add_linked_libs,tubes_test, \
+$(eval $(call gb_CppunitTest_use_packages,tubes_test,tubes_inc))
+
+$(eval $(call gb_CppunitTest_use_library_objects,tubes_test,tubes))
+
+$(eval $(call gb_CppunitTest_use_libraries,tubes_test, \
+ comphelper \
+ cppu \
sal \
- tubes \
- unotest \
+ utl \
$(gb_STDLIBS) \
))
@@ -41,13 +46,6 @@ $(eval $(call gb_CppunitTest_use_externals,tubes_test,\
telepathy \
))
-$(eval $(call gb_CppunitTest_set_include,tubes_test,\
- -I$(SRCDIR)/tubes/inc \
- $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_add_api,tubes_test, \
- udkapi \
-))
+$(eval $(call gb_CppunitTest_use_udk_api,tubes_test))
# vim: set noet sw=4 ts=4:
diff --git a/tubes/Library_tubes.mk b/tubes/Library_tubes.mk
index e101a71..0acd0a9 100644
--- a/tubes/Library_tubes.mk
+++ b/tubes/Library_tubes.mk
@@ -43,7 +43,6 @@ $(eval $(call gb_Library_use_libraries,tubes,\
comphelper \
cppu \
sal \
- salhelper \
))
$(eval $(call gb_Library_use_externals,tubes,\
diff --git a/tubes/Module_tubes.mk b/tubes/Module_tubes.mk
index 0fc35c4..bc54f18 100644
--- a/tubes/Module_tubes.mk
+++ b/tubes/Module_tubes.mk
@@ -35,9 +35,9 @@ $(eval $(call gb_Module_add_targets,tubes,\
Executable_liboapprover \
))
-# $(eval $(call gb_Module_add_check_targets,tubes,\
-#CppunitTest_tubes_test \
-# ))
+$(eval $(call gb_Module_add_subsequentcheck_targets,tubes,\
+ CppunitTest_tubes_test \
+))
endif
diff --git a/tubes/qa/test_manager.cxx b/tubes/qa/test_manager.cxx
index 6f9a7ba..81298d0 100644
--- a/tubes/qa/test_manager.cxx
+++ b/tubes/qa/test_manager.cxx
@@ -26,101 +26,75 @@
* instead of those above.
*/
-#include sal/precppunit.hxx
+#include sal/types.h
-#include tubes/contact-list.hxx
-#include tubes/manager.hxx
-
-#include cppunit/TestAssert.h
#include cppunit/TestFixture.h
#include cppunit/extensions/HelperMacros.h
#include cppunit/plugin/TestPlugIn.h
+
+#include rtl/bootstrap.hxx
#include rtl/string.hxx
#include rtl/ustring.hxx
-#include rtl/bootstrap.hxx
-#include unotest/bootstrapfixturebase.hxx
+#include tubes/conference.hxx
+#include tubes/contact-list.hxx
+#include tubes/manager.hxx
+#include unotools/localfilehelper.hxx
+
+#include telepathy-glib/telepathy-glib.h
namespace {
-class TestTeleTubes: public test::BootstrapFixtureBase
+class TestTeleTubes: public CppUnit::TestFixture
{
public:
-TestTeleTubes();
-~TestTeleTubes();
-void testSetupManager1();
-void testSetupManager2();
-void testCreateAccountManager1();
-void testCreateAccountManager2();
-void testRegisterClients1();
-void testRegisterClients2();
+TestTeleTubes() {}
+~TestTeleTubes() {}
+// This could happen in costructor wasn't there TestTeleTubes instance for
each test:
+void testInitialize();
+void testCreateAccountManager();
+void testRegisterClients();
void testContactList();
-void testPrepareAccountManager1();
-void testPrepareAccountManager2();
-void testStartBuddySession1();
-void testStartBuddySession2();
+void testPrepareAccountManager();
+void testStartBuddySession();
void testSendPacket();
void testReceivePacket();
void testSendFile();
-void testDestroyManager1();
-void testDestroyManager2();
-void testDestroyAccepterContact();
+void testDestroyTeleTubes();
void testFailAlways();
-void ReceiverCallback( TeleConference* pConference, const TelePacket
rPacket );
-
-GMainLoop* mpMainLoop;
-void spinMainLoop();
-
+void ReceiverCallback( const OString rPacket );
static void FileSent( bool success, void *user_data);
-void FileReceived( rtl::OUString aUri
[Libreoffice-commits] .: 2 commits - basctl/source
basctl/source/basicide/basidesh.cxx |8 +++---
basctl/source/basicide/basobj2.cxx |6 ++--
basctl/source/basicide/basobj3.cxx |8 +++---
basctl/source/basicide/bastype2.cxx |6 ++--
basctl/source/basicide/bastype2.hxx |2 -
basctl/source/basicide/bastypes.cxx |2 -
basctl/source/basicide/iderdll.cxx |7 +
basctl/source/basicide/iderdll2.hxx | 11 +++-
basctl/source/basicide/macrodlg.cxx | 46 ++--
basctl/source/basicide/macrodlg.hxx |8 +++---
basctl/source/inc/bastypes.hxx |6 ++--
11 files changed, 52 insertions(+), 58 deletions(-)
New commits:
commit 9e65cab1e7d10d8864c394db364a802ba5ec
Author: Takeshi Abe t...@fixedpoint.jp
Date: Thu Jul 26 01:28:37 2012 +0900
sal_Bool - bool
Change-Id: I32f56e8577264eb9d125dbe3fcba2af7a4361713
diff --git a/basctl/source/basicide/basidesh.cxx
b/basctl/source/basicide/basidesh.cxx
index e2a0884..c8d117c 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -176,7 +176,7 @@ void BasicIDEShell::Init()
SvxSearchDialogWrapper::RegisterChildWindow( sal_False );
-BasicIDEGlobals::GetExtraData()-ShellInCriticalSection() = sal_True;
+BasicIDEGlobals::GetExtraData()-ShellInCriticalSection() = true;
SetName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( BasicIDE ) ) );
SetHelpId( SVX_INTERFACE_BASIDE_VIEWSH );
@@ -205,7 +205,7 @@ void BasicIDEShell::Init()
BasicIDEGlobals::ShellCreated(this);
-BasicIDEGlobals::GetExtraData()-ShellInCriticalSection() = sal_False;
+BasicIDEGlobals::GetExtraData()-ShellInCriticalSection() = false;
// It's enough to create the controller ...
// It will be public by using magic :-)
@@ -225,7 +225,7 @@ BasicIDEShell::~BasicIDEShell()
BasicIDEGlobals::ShellDestroyed(this);
// so that on a basic saving error, the shell doesn't pop right up again
-BasicIDEGlobals::GetExtraData()-ShellInCriticalSection() = sal_True;
+BasicIDEGlobals::GetExtraData()-ShellInCriticalSection() = true;
SetWindow( 0 );
SetCurWindow( 0 );
@@ -246,7 +246,7 @@ BasicIDEShell::~BasicIDEShell()
if ( pListener )
pListener-removeContainerListener( m_aCurDocument, m_aCurLibName
);
-BasicIDEGlobals::GetExtraData()-ShellInCriticalSection() = sal_False;
+BasicIDEGlobals::GetExtraData()-ShellInCriticalSection() = false;
GnBasicIDEShellCount--;
}
diff --git a/basctl/source/basicide/basobj2.cxx
b/basctl/source/basicide/basobj2.cxx
index ac384bb..b355d1a 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -265,13 +265,13 @@ namespace
BasicIDEGlobals::ensure();
-BasicIDEGlobals::GetExtraData()-ChoosingMacro() = sal_True;
+BasicIDEGlobals::GetExtraData()-ChoosingMacro() = true;
String aScriptURL;
sal_Bool bError = sal_False;
SbMethod* pMethod = NULL;
-::std::auto_ptr MacroChooser pChooser( new MacroChooser( NULL, sal_True
) );
+::std::auto_ptr MacroChooser pChooser( new MacroChooser( NULL, true ) );
if ( bChooseOnly || !SvtModuleOptions().IsBasicIDE() )
pChooser-SetMode( MACROCHOOSER_CHOOSEONLY );
@@ -281,7 +281,7 @@ namespace
short nRetValue = pChooser-Execute();
-BasicIDEGlobals::GetExtraData()-ChoosingMacro() = sal_False;
+BasicIDEGlobals::GetExtraData()-ChoosingMacro() = false;
switch ( nRetValue )
{
diff --git a/basctl/source/basicide/basobj3.cxx
b/basctl/source/basicide/basobj3.cxx
index 088ff07..2c19187 100644
--- a/basctl/source/basicide/basobj3.cxx
+++ b/basctl/source/basicide/basobj3.cxx
@@ -92,7 +92,7 @@ SbMethod* CreateMacro( SbModule* pModule, const String
rMacroName )
aMacroName = String( RTL_CONSTASCII_USTRINGPARAM( Main ) );
else
{
-sal_Bool bValid = sal_False;
+bool bValid = false;
String aStdMacroText( RTL_CONSTASCII_USTRINGPARAM( Macro ) );
sal_uInt16 nMacro = 1;
while ( !bValid )
@@ -100,7 +100,7 @@ SbMethod* CreateMacro( SbModule* pModule, const String
rMacroName )
aMacroName = aStdMacroText;
aMacroName += String::CreateFromInt32( nMacro );
// test whether existing...
-bValid = pModule-GetMethods()-Find( aMacroName,
SbxCLASS_METHOD ) ? sal_False : sal_True;
+bValid = pModule-GetMethods()-Find( aMacroName,
SbxCLASS_METHOD ) ? false : true;
nMacro++;
}
}
@@ -432,7 +432,7 @@ long HandleBasicError( StarBASIC* pBasic )
BasicManager* pBasMgr = BasicIDE::FindBasicManager( pBasic );
if ( pBasMgr )
{
-sal_Bool bProtected = sal_False;
+bool bProtected = false;
ScriptDocument aDocument(
ScriptDocument::getDocumentForBasicManager( pBasMgr ) );
OSL_ENSURE( aDocument.isValid(),
[Libreoffice-commits] .: 4 commits - forms/source sfx2/inc sfx2/source
forms/source/component/clickableimage.cxx | 10 -
forms/source/component/clickableimage.hxx |2 -
sfx2/inc/sfx2/docfile.hxx |1
sfx2/source/appl/fileobj.cxx | 54 --
sfx2/source/appl/fileobj.hxx |1
sfx2/source/doc/docfile.cxx | 18 --
6 files changed, 86 deletions(-)
New commits:
commit 66e4540041f09b4e779d27190f0925479f74103b
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Wed Jul 25 20:37:27 2012 -0400
aDataAvailableLink in SfxMedium was never called.
Also remove all callback functions that would never get called
because of this.
Change-Id: I5dd5d64ccca9dd3d655428218957753d3200299e
diff --git a/forms/source/component/clickableimage.cxx
b/forms/source/component/clickableimage.cxx
index e58d914..783a13f 100644
--- a/forms/source/component/clickableimage.cxx
+++ b/forms/source/component/clickableimage.cxx
@@ -739,8 +739,6 @@ namespace frm
delete m_pMedium;
m_pMedium = new SfxMedium(rURL, STREAM_STD_READ);
-m_pMedium-SetDataAvailableLink(
-STATIC_LINK(this, OClickableImageBaseModel,
DataAvailableLink));
// Das XModel suchen, um an die Object-Shell oder zumindest den
// Referer zu gelangen.
@@ -848,14 +846,6 @@ namespace frm
}
//--
-IMPL_STATIC_LINK( OClickableImageBaseModel, DataAvailableLink, void*,
EMPTYARG )
-{
-::osl::MutexGuard aGuard( pThis-m_aMutex );
-pThis-DataAvailable();
-return 0;
-}
-
-
//--
void OClickableImageBaseModel::_propertyChanged( const
PropertyChangeEvent rEvt )
throw( RuntimeException )
{
diff --git a/forms/source/component/clickableimage.hxx
b/forms/source/component/clickableimage.hxx
index 09105c2..45e5115 100644
--- a/forms/source/component/clickableimage.hxx
+++ b/forms/source/component/clickableimage.hxx
@@ -74,8 +74,6 @@ namespace frm
::com::sun::star::uno::Reference
::com::sun::star::form::submission::XSubmission
m_xSubmissionDelegate;
-
-DECL_STATIC_LINK( OClickableImageBaseModel, DataAvailableLink, void* );
DECL_STATIC_LINK( OClickableImageBaseModel, DownloadDoneLink, void* );
inline ImageProducer* GetImageProducer() { return m_pProducer; }
diff --git a/sfx2/inc/sfx2/docfile.hxx b/sfx2/inc/sfx2/docfile.hxx
index b4da325..044ae4b 100644
--- a/sfx2/inc/sfx2/docfile.hxx
+++ b/sfx2/inc/sfx2/docfile.hxx
@@ -145,7 +145,6 @@ public:
sal_BoolIsOpen() const; // { return aStorage.Is() ||
pInStream; }
voidDownLoad( const Link aLink = Link());
voidSetDoneLink( const Link rLink );
-voidSetDataAvailableLink( const Link rLink );
sal_uInt32 GetErrorCode() const;
sal_uInt32 GetError() const
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index 9a9c6ff..d715f4d 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -81,7 +81,6 @@ SvFileObject::~SvFileObject()
{
if ( xMed.Is() )
{
-xMed-SetDataAvailableLink( Link() );
xMed-SetDoneLink( Link() );
xMed.Clear();
}
@@ -274,7 +273,6 @@ sal_Bool SvFileObject::LoadFile_Impl()
bWaitForData = sal_True;
SfxMediumRef xTmpMed = xMed;
-xMed-SetDataAvailableLink( STATIC_LINK( this, SvFileObject,
LoadGrfNewData_Impl ) );
bInCallDownLoad = sal_True;
xMed-DownLoad( STATIC_LINK( this, SvFileObject, LoadGrfReady_Impl ) );
bInCallDownLoad = sal_False;
@@ -337,7 +335,6 @@ sal_Bool SvFileObject::GetGraphic_Impl( Graphic rGrf,
SvStream* pStream )
if( !pDownLoadData-aGrf.GetContext() )
{
-xMed-SetDataAvailableLink( Link() );
delete pDownLoadData, pDownLoadData = 0;
bDataReady = sal_True;
bWaitForData = sal_False;
@@ -513,7 +510,6 @@ IMPL_STATIC_LINK( SvFileObject, LoadGrfReady_Impl, void*,
EMPTYARG )
pThis-bLoadAgain = sal_True;
if( pThis-xMed.Is() )
{
-pThis-xMed-SetDataAvailableLink( Link() );
pThis-xMed-SetDoneLink( Link() );
Application::PostUserEvent(
@@ -535,56 +531,6 @@ IMPL_STATIC_LINK( SvFileObject, DelMedium_Impl,
SfxMediumRef*, pDelMed )
return 0;
}
-IMPL_STATIC_LINK( SvFileObject, LoadGrfNewData_Impl, void*, EMPTYARG )
-{
-// When we come form here there it can not be an error no more.
-if( pThis-bInNewData )
-return 0;
-
-pThis-bInNewData = sal_True;
-pThis-bLoadError = sal_False;
-
-if( !pThis-pDownLoadData )
-{
-pThis-pDownLoadData = new
