[Libreoffice-commits] core.git: cppcanvas/source
cppcanvas/source/mtfrenderer/emfplus.cxx |6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) New commits: commit 9abd09f04b9a1a3bdde3b24bc03d67319bb25953 Author: Stephan Bergmann Date: Tue Nov 26 09:02:05 2013 +0100 -Werror,-Wunused-const-variable Change-Id: I25fa3ea9e0101de7b17c17ef44da6d7b26a46017 diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx index 4907b6f..f4730e6 100644 --- a/cppcanvas/source/mtfrenderer/emfplus.cxx +++ b/cppcanvas/source/mtfrenderer/emfplus.cxx @@ -105,10 +105,8 @@ const sal_uInt32 EmfPlusCustomLineCapDataTypeAdjustableArrow = 0x0001; const sal_uInt32 EmfPlusCustomLineCapDataFillPath = 0x0001; const sal_uInt32 EmfPlusCustomLineCapDataLinePath = 0x0002; -const sal_uInt32 EmfPlusLineCapTypeFlat = 0x; const sal_uInt32 EmfPlusLineCapTypeSquare = 0x0001; const sal_uInt32 EmfPlusLineCapTypeRound = 0x0002; -const sal_uInt32 EmfPlusLineCapTypeTriangle = 0x0003; const sal_uInt32 EmfPlusLineJoinTypeMiter = 0x; const sal_uInt32 EmfPlusLineJoinTypeBevel = 0x0001; @@ -615,8 +613,8 @@ namespace cppcanvas case EmfPlusLineCapTypeRound: return rendering::PathCapType::ROUND; } -// we have no mapping for EmfPlusLineCapTypeTriangle, so return -// BUTT always +// we have no mapping for EmfPlusLineCapTypeTriangle = 0x0003, +// so return BUTT always return rendering::PathCapType::BUTT; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/00/0021.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b0dd80238089dfcc0b3bf7bed99564adce649397 Author: Stanislav Horacek Date: Mon Nov 25 13:38:12 2013 +0100 add location of PrettyPrinting property in Expert Config it is hard to find it without location or searching Change-Id: If13b9dfc0b4048f7b1367147f5342f6d069eadb9 Reviewed-on: https://gerrit.libreoffice.org/6799 Reviewed-by: Andras Timar Tested-by: Andras Timar diff --git a/source/text/shared/00/0021.xhp b/source/text/shared/00/0021.xhp index a85b95e..7ce3468 100644 --- a/source/text/shared/00/0021.xhp +++ b/source/text/shared/00/0021.xhp @@ -238,7 +238,7 @@ The text content of the document is located in content.xml. -By default, content.xml is stored without formatting elements like indentation or line breaks to minimize the time for saving and opening the document. On the %PRODUCTNAME - PreferencesTools - Options - $[officename] - Expert Config tab page you can activate the use of indentations and line breaks by setting the property PrettyPrinting to true. +By default, content.xml is stored without formatting elements like indentation or line breaks to minimize the time for saving and opening the document. On the %PRODUCTNAME - PreferencesTools - Options - $[officename] - Expert Config tab page you can activate the use of indentations and line breaks by setting the property /org.openoffice.Office.Common/Save/Document PrettyPrinting to true. The file meta.xml contains the meta information of the document, which you can enter under File - Properties. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3723f2794df7394b79b697b09a8059f12dff8345 Author: Stanislav Horacek Date: Mon Nov 25 13:38:12 2013 +0100 Updated core Project: help b0dd80238089dfcc0b3bf7bed99564adce649397 add location of PrettyPrinting property in Expert Config it is hard to find it without location or searching Change-Id: If13b9dfc0b4048f7b1367147f5342f6d069eadb9 Reviewed-on: https://gerrit.libreoffice.org/6799 Reviewed-by: Andras Timar Tested-by: Andras Timar diff --git a/helpcontent2 b/helpcontent2 index 1fbc939..b0dd802 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 1fbc93982ca787e8be5b38b6a6729850009c7866 +Subproject commit b0dd80238089dfcc0b3bf7bed99564adce649397 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cppcanvas/source
cppcanvas/source/mtfrenderer/emfplus.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b64d5dc6a4fd48a7fa5bd475211a4af55f4cba3a
Author: Tor Lillqvist
Date: Tue Nov 26 10:03:01 2013 +0200
WaE: potentially uninitialized local variable 'pPattern' used
Change-Id: Ic000edc60a9c5ae7d64fab9bf8b6c2a88bcec223
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index f4730e6..f3f6b50 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -793,7 +793,7 @@ namespace cppcanvas
const float dashdotdot[] = {3, 3, 1, 3, 1, 3};
sal_Int32 nLen = 0;
-const float *pPattern;
+const float *pPattern = NULL;
switch (dashStyle)
{
case EmfPlusLineStyleDash: nLen =
SAL_N_ELEMENTS(dash); pPattern = dash; break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sal/osl
sal/osl/w32/signal.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit a90627af85f61dd2d791098320c1a9e13dc4dbf9
Author: Herbert Dürr
Date: Tue Nov 26 07:57:55 2013 +
#i123747# mark SEH translator's pExcPtrs argument as unused
diff --git a/sal/osl/w32/signal.cxx b/sal/osl/w32/signal.cxx
index 57031ce..019f8eb 100644
--- a/sal/osl/w32/signal.cxx
+++ b/sal/osl/w32/signal.cxx
@@ -428,6 +428,7 @@ oslSignalAction SAL_CALL osl_raiseSignal(sal_Int32
UserSignal, void* UserData)
void win_seh_translator( unsigned nSEHCode, _EXCEPTION_POINTERS* pExcPtrs)
{
+(void*)pExcPtrs; // currently unused, but useful inside a debugger
const char* pSEHName = NULL;
switch( nSEHCode)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/formulagroup.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit b9b8e26aa0ff86b131c9da84f33ee3ce397104d6 Author: Tor Lillqvist Date: Tue Nov 26 10:08:11 2013 +0200 WaE: unused parameter 'bForceEvaluation' Change-Id: I402ccfa2e24240347985d9fda7adf4e2c01712fd diff --git a/sc/source/core/tool/formulagroup.cxx b/sc/source/core/tool/formulagroup.cxx index aa6e8e7..0fed853 100644 --- a/sc/source/core/tool/formulagroup.cxx +++ b/sc/source/core/tool/formulagroup.cxx @@ -651,6 +651,8 @@ bool FormulaGroupInterpreter::switchOpenCLDevice(const OUString& rDeviceId, bool return bSuccess; #endif } +#else +(void) bForceEvaluation; #endif return false; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/qa
chart2/qa/extras/chart2export.cxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit 6e0e5503a998b6b0996d1f8013cdd963576b840e
Author: Tor Lillqvist
Date: Tue Nov 26 10:17:19 2013 +0200
WaE: unused variable 'aService' [loplugin]
Change-Id: Ifc907dad0849f17aec728b9f0e85d44048755a14
diff --git a/chart2/qa/extras/chart2export.cxx
b/chart2/qa/extras/chart2export.cxx
index f46ab1a..b28034b 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -100,7 +100,6 @@ void checkCommonTrendline(
void checkNameAndType(Reference xProperties, OUString
aExpectedName, OUString aExpectedServiceName)
{
-OUString aService;
Reference< lang::XServiceName > xServiceName( xProperties, UNO_QUERY );
CPPUNIT_ASSERT(xServiceName.is());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: footnotes (Replacing one DLL from official build)
On Mon, Nov 25, 2013 at 02:01:26PM +0100, Pavel Laštovička wrote: > Regarding the mentioned commit, I wonder for which file formats is > SwXMLImport::SetConfigurationSettings called? I tried to open a MS > Word 2003 XML file and the method was not called. SwXMLImport is the Writer ODF import filter. signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - i18npool/source
i18npool/source/search/textsearch.cxx | 26 --
1 file changed, 24 insertions(+), 2 deletions(-)
New commits:
commit b103d14aaac3d96f7b60ce1baa9c581a102a1e63
Author: Eike Rathke
Date: Tue Nov 26 00:18:46 2013 +0100
set a 23 enigma timeout at RegexMatcher, fdo#70627
Change-Id: I390bfec0d36dcc9529785e97994dad2b0704dc80
(cherry picked from commit d838ea200e7d6060d4a759616f9e1fcbf3c36c8e)
Reviewed-on: https://gerrit.libreoffice.org/6808
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
diff --git a/i18npool/source/search/textsearch.cxx
b/i18npool/source/search/textsearch.cxx
index 7762832..91a770b 100644
--- a/i18npool/source/search/textsearch.cxx
+++ b/i18npool/source/search/textsearch.cxx
@@ -764,8 +764,30 @@ void TextSearch::RESrchPrepare( const
::com::sun::star::util::SearchOptions& rOp
aChevronMatcherE.reset();
#endif
pRegexMatcher = new RegexMatcher( aIcuSearchPatStr, nIcuSearchFlags,
nIcuErr);
-if( nIcuErr)
-{ delete pRegexMatcher; pRegexMatcher = NULL;}
+if (nIcuErr)
+{
+delete pRegexMatcher;
+pRegexMatcher = NULL;
+}
+else
+{
+// Pathological patterns may result in exponential run time making the
+// application appear to be frozen. Limit that. Documentation for this
+// call says
+//
https://ssl.icu-project.org/apiref/icu4c/classicu_1_1RegexMatcher.html#a6ebcfcab4fe6a38678c0291643a03a00
+// "The units of the limit are steps of the match engine.
+// Correspondence with actual processor time will depend on the speed
+// of the processor and the details of the specific pattern, but will
+// typically be on the order of milliseconds."
+// Just what is a good value? 42 is always an answer ... the 23 enigma
+// as well.. which on the dev's machine is roughly 50 seconds with the
+// pattern of fdo#70627.
+/* TODO: make this a configuration settable value and possibly take
+ * complexity of expression into account and maybe even length of text
+ * to be matched; currently (2013-11-25) that is at most one 64k
+ * paragraph per RESrchFrwrd()/RESrchBkwrd() call. */
+pRegexMatcher->setTimeLimit( 23*1000, nIcuErr);
+}
}
//---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sal sc/source
include/sal/log-areas.dox|1 +
sc/source/core/opencl/formulagroupcl.cxx | 10 ++
2 files changed, 3 insertions(+), 8 deletions(-)
New commits:
commit 90c03dd6281434bd2d8c7f05c3c2c808b298a272
Author: Tor Lillqvist
Date: Tue Nov 26 11:08:57 2013 +0200
Reduce verbosity a bit
Still lots of gratuitous unconditional writing to std:cerr in there. But
maybe that's what we want.
Change-Id: I28a65d6535c814bf5c047a7255dd3970fffda5dc
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 7d8d70f..97d2f3c 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -84,6 +84,7 @@ certain functionality.
@li @c sc
@li @c sc.opencl
+@li @c sc.opencl.source
@li @c sc.opencl.thread
@li @c sc.qa
@li @c sc.core
diff --git a/sc/source/core/opencl/formulagroupcl.cxx
b/sc/source/core/opencl/formulagroupcl.cxx
index c87badc..c4290f4 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -2514,9 +2514,8 @@ public:
decl << ") {\n\tint gid0 = get_global_id(0);\n\tresult[gid0] = " <<
DK->GenSlidingWindowDeclRef(false) << ";\n}\n";
mFullProgramSrc = decl.str();
-#if 1
-std::cerr<< "Program to be compiled = \n" << mFullProgramSrc << "\n";
-#endif
+
+SAL_INFO("sc.opencl.source", "Program to be compiled:\n" <<
mFullProgramSrc);
}
/// Produce kernel hash
std::string GetMD5(void)
@@ -2590,15 +2589,12 @@ private:
DynamicKernel::~DynamicKernel()
{
if (mpResClmem) {
-std::cerr<<"Freeing kernel "<< GetMD5() << " result buffer\n";
clReleaseMemObject(mpResClmem);
}
if (mpKernel) {
-std::cerr<<"Freeing kernel "<< GetMD5() << " kernel\n";
clReleaseKernel(mpKernel);
}
if (mpProgram) {
-std::cerr<<"Freeing kernel "<< GetMD5() << " program\n";
clReleaseProgram(mpProgram);
}
if (mpCode)
@@ -2647,13 +2643,11 @@ const DynamicKernelArgument *SymbolTable::DeclRefArg(
ArgumentMap::iterator it = mSymbols.find(ref);
if (it == mSymbols.end()) {
// Allocate new symbols
-std::cerr << "DeclRefArg: Allocate a new symbol:";
std::stringstream ss;
ss << "tmp"<< mCurId++;
boost::shared_ptr new_arg(new T(ss.str(), t,
pCodeGen));
mSymbols[ref] = new_arg;
mParams.push_back(new_arg);
-std::cerr << ss.str() <<"\n";
return new_arg.get();
} else {
return it->second.get();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - a9/0627af85f61dd2d791098320c1a9e13dc4dbf9
a9/0627af85f61dd2d791098320c1a9e13dc4dbf9 |1 + 1 file changed, 1 insertion(+) New commits: commit 7a60d66ed87a49e6a17934693f3002963825e007 Author: Caolán McNamara Date: Tue Nov 26 09:14:34 2013 + Notes added by 'git notes add' diff --git a/a9/0627af85f61dd2d791098320c1a9e13dc4dbf9 b/a9/0627af85f61dd2d791098320c1a9e13dc4dbf9 new file mode 100644 index 000..4ebdf14 --- /dev/null +++ b/a9/0627af85f61dd2d791098320c1a9e13dc4dbf9 @@ -0,0 +1 @@ +prefer: d6421cf8468487e43185717b00f7135a77b37b33 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-commits] Resolves: #i123747# allow treating Window's SEH events as C++ exceptions
Is this sound? I am no expert with Windows SEH, does it actually
guarantee that the low-level process state is also a valid state at the
higher-level C++ semantics when a SEH exception is thrown? (That would
be a prerequisite for this patch, and e.g. the missing guarantee about
that consistency for C/POSIX signals is the reason why we cannot
automatically translate such signals into C++ exceptions.)
Stephan
On 11/25/2013 03:26 PM, Herbert Dürr wrote:
commit e79af02bb0e8de14c881f5071a519f6fadedc828
Author: Herbert Dürr
Date: Mon Nov 25 13:29:47 2013 +
Resolves: #i123747# allow treating Window's SEH events as C++ exceptions
The crash reporter facility can provide much better details about crashes.
But if that facility is disabled then handling SEH events such as
div-by-zero
as C++ exceptions is a worthwhile alternative. It can provide a few
interesting
details and it allows a graceful shutdown of the application.
(cherry picked from commit c9d10b167b37a9cb0bb310cafc8e80b6cce8ea7a)
Conflicts:
sal/osl/w32/signal.cxx
Change-Id: I25324d6e02ab8acd8fd2b036b77039aac87cf262
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index ee3b4d5..79fdc50 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1488,11 +1488,8 @@ int Desktop::Main()
// set static variable to enabled/disable crash reporter
retrieveCrashReporterState();
-if ( !isCrashReporterEnabled() )
-{
-osl_setErrorReporting( sal_False );
-// disable stack trace feature
-}
+const bool bCrashReporterEnabled = isCrashReporterEnabled();
+osl_setErrorReporting( !bCrashReporterEnabled );
// create title string
LanguageTag aLocale( LANGUAGE_SYSTEM);
diff --git a/sal/osl/w32/signal.cxx b/sal/osl/w32/signal.cxx
index f13a78a..51e08bc 100644
--- a/sal/osl/w32/signal.cxx
+++ b/sal/osl/w32/signal.cxx
@@ -33,6 +33,8 @@
#include
#include
#include
+#include
+#include
typedef struct _oslSignalHandlerImpl
{
@@ -398,11 +400,50 @@ oslSignalAction SAL_CALL osl_raiseSignal(sal_Int32
UserSignal, void* UserData)
/*/
/* osl_setErrorReporting */
/*/
+
+void win_seh_translator( unsigned nSEHCode, _EXCEPTION_POINTERS* pExcPtrs)
+{
+const char* pSEHName = NULL;
+switch( nSEHCode) {
+case EXCEPTION_ACCESS_VIOLATION: pSEHName = "SEH Exception: ACCESS
VIOLATION"; break;
+case EXCEPTION_DATATYPE_MISALIGNMENT:pSEHName = "SEH Exception:
DATATYPE MISALIGNMENT"; break;
+// case EXCEPTION_BREAKPOINT: pSEHName = "SEH Exception:
BREAKPOINT"; break;
+// case EXCEPTION_SINGLE_STEP: pSEHName = "SEH Exception: SINGLE
STEP"; break;
+case EXCEPTION_ARRAY_BOUNDS_EXCEEDED:pSEHName = "SEH Exception: ARRAY
BOUNDS EXCEEDED"; break;
+case EXCEPTION_FLT_DENORMAL_OPERAND: pSEHName = "SEH Exception:
DENORMAL FLOAT OPERAND"; break;
+case EXCEPTION_FLT_DIVIDE_BY_ZERO: pSEHName = "SEH Exception: FLOAT
DIVIDE_BY_ZERO"; break;
+case EXCEPTION_FLT_INEXACT_RESULT: pSEHName = "SEH Exception: FLOAT
INEXACT RESULT"; break;
+case EXCEPTION_FLT_INVALID_OPERATION:pSEHName = "SEH Exception: INVALID
FLOAT OPERATION"; break;
+case EXCEPTION_FLT_OVERFLOW: pSEHName = "SEH Exception: FLOAT
OVERFLOW"; break;
+case EXCEPTION_FLT_STACK_CHECK: pSEHName = "SEH Exception: FLOAT
STACK_CHECK"; break;
+case EXCEPTION_FLT_UNDERFLOW:pSEHName = "SEH Exception: FLOAT
UNDERFLOW"; break;
+case EXCEPTION_INT_DIVIDE_BY_ZERO: pSEHName = "SEH Exception: INTEGER
DIVIDE_BY_ZERO"; break;
+case EXCEPTION_INT_OVERFLOW: pSEHName = "SEH Exception: INTEGER
OVERFLOW"; break;
+case EXCEPTION_PRIV_INSTRUCTION: pSEHName = "SEH Exception:
PRIVILEDGED INSTRUCTION"; break;
+case EXCEPTION_IN_PAGE_ERROR:pSEHName = "SEH Exception:
IN_PAGE_ERROR"; break;
+case EXCEPTION_ILLEGAL_INSTRUCTION: pSEHName = "SEH Exception: ILLEGAL
INSTRUCTION"; break;
+case EXCEPTION_NONCONTINUABLE_EXCEPTION: pSEHName = "SEH Exception:
NONCONTINUABLE EXCEPTION"; break;
+case EXCEPTION_STACK_OVERFLOW: pSEHName = "SEH Exception: STACK
OVERFLOW"; break;
+case EXCEPTION_INVALID_DISPOSITION: pSEHName = "SEH Exception: INVALID
DISPOSITION"; break;
+case EXCEPTION_GUARD_PAGE: pSEHName = "SEH Exception: GUARD
PAGE"; break;
+case EXCEPTION_INVALID_HANDLE: pSEHName = "SEH Exception: INVALID
HANDLE"; break;
+// case EXCEPTION_POSSIBLE_DEADLOCK:pSEHName = "SEH Exception:
POSSIBLE DEADLOCK"; break;
+default:
[Libreoffice-commits] core.git: include/sal
include/sal/log-areas.dox |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 9219b5d00460db1004ec0834be7ff0b37aa32fa9 Author: Tor Lillqvist Date: Tue Nov 26 11:36:32 2013 +0200 Add descriptions for the sc.opencl log areas Change-Id: I9b6157dd9836f889d54b3dbabc0e0aaada63bd1b diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox index 97d2f3c..b01651d 100644 --- a/include/sal/log-areas.dox +++ b/include/sal/log-areas.dox @@ -83,9 +83,9 @@ certain functionality. @section Calc @li @c sc -@li @c sc.opencl -@li @c sc.opencl.source -@li @c sc.opencl.thread +@li @c sc.opencl - OpenCL-related stuff in general +@li @c sc.opencl.source - Generated OpenCL source code +@li @c sc.opencl.thread - Background thread to compile OpenCL kernels @li @c sc.qa @li @c sc.core @li @c sc.filter - Calc filter ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/qa
chart2/qa/extras/chart2export.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 40e98f439f892af47b508968aaa25c2327b97868 Author: Tor Lillqvist Date: Tue Nov 26 11:38:10 2013 +0200 Blind fix for sal_Int32/int confusion Change-Id: Ia052922ec323220b8785b1a156e5bc2fbf44c11b diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index b28034b..fa4d619 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -176,7 +176,7 @@ void checkTrendlinesInChart(uno::Reference< chart2::XChartDocument > xChartDoc) CPPUNIT_ASSERT( xRegressionCurveContainer.is() ); Sequence< Reference< chart2::XRegressionCurve > > xRegressionCurveSequence = xRegressionCurveContainer->getRegressionCurves(); -CPPUNIT_ASSERT_EQUAL(3, xRegressionCurveSequence.getLength()); +CPPUNIT_ASSERT_EQUAL((sal_Int32) 3, xRegressionCurveSequence.getLength()); Reference xCurve; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
LibreOffice 4.1: Mozilla build option to ignore
Hi everyone, I was building LO 4.1 version and i've found this option in distro-configs\LibreOfficeWin32.conf: --enable-win-mozab-driver According to the wiki: https://wiki.documentfoundation.org/Development/Windows_Build_Dependencies#Install_Windows_Build_Requirements, Mozilla build tooling is only used for LibreOffice versions older than 4.1. I propose to remove this option from the file (LibreOfficeWin32.conf). We also need to modify the autogen.lastrun for builds at this link: http://dev-builds.libreoffice.org/daily/libreoffice-4-1/Win-x86_9-Voreppe/2013-11-11_21.19.15/libreoffice-4-1~2013-11-11_21.19.15_build_info.txt Actually, we have in the same file: "--enable-win-mozab-driver" and "--disable-win-mozab-driver" By the way, is it normal that we can't see any build in this directory: http://dev-builds.libreoffice.org/daily/libreoffice-4-1/Win-x86@42 ? Thanks ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: idlc/test unoidl/source
idlc/test/parser/interfaceinheritance.tests |8
unoidl/source/sourceprovider-parser.y |1 -
2 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit e14e4f5351cb9a6c3977abf20f9a255d8493dd57
Author: Stephan Bergmann
Date: Tue Nov 26 11:03:41 2013 +0100
Duplicate base checking code already covers check for opt base != XInterface
Change-Id: Icd47d87f93641a0b24a96a4be8d3d120f0405f2d
diff --git a/idlc/test/parser/interfaceinheritance.tests
b/idlc/test/parser/interfaceinheritance.tests
index a7b8412..f9cac4c 100644
--- a/idlc/test/parser/interfaceinheritance.tests
+++ b/idlc/test/parser/interfaceinheritance.tests
@@ -269,3 +269,11 @@ interface Derived {
interface Hidden;
interface Base;
};
+
+
+EXPECT FAILURE "interfaceinheritance.tests 30":
+interface Base {};
+interface Derived {
+interface Base;
+[optional] interface com::sun::star::uno::XInterface;
+};
diff --git a/unoidl/source/sourceprovider-parser.y
b/unoidl/source/sourceprovider-parser.y
index f7f022f..8e6c0c4 100644
--- a/unoidl/source/sourceprovider-parser.y
+++ b/unoidl/source/sourceprovider-parser.y
@@ -4113,7 +4113,6 @@ bool SourceProviderInterfaceTypeEntityPad::addDirectBase(
addOptionalBaseMembers(
location, yyscanner, data, base.name, base.entity);
}
-//TODO: check that opt base != XInterface
(optional ? directOptionalBases : directMandatoryBases).push_back(base);
return true;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.0' - 4 commits - cppcanvas/source vcl/source
cppcanvas/source/inc/implrenderer.hxx|9
cppcanvas/source/mtfrenderer/emfplus.cxx | 365 ---
vcl/source/filter/wmf/enhwmf.cxx | 14 -
vcl/source/filter/wmf/winmtf.cxx | 146
vcl/source/filter/wmf/winmtf.hxx | 20 +
vcl/source/filter/wmf/winwmf.cxx |1
6 files changed, 462 insertions(+), 93 deletions(-)
New commits:
commit 3a7c314e77ef2e619136f00c949aee30b1ae9cd1
Author: Jan Holesovsky
Date: Fri Nov 22 17:06:10 2013 +0100
EMF+: Parse and render custom line cap data.
Contains the following commits:
* EMF+: Small cleanup & more logging in preparation for line starts & ends.
* EMF+: Parse custom line cap data for start and end line caps.
* EMF+: Render custom line cap data.
* EMF+: Set the stroke attributes on the custom line caps.
Change-Id: If35ef1c44f34f5d5e6c50789c907105d03e96fca
diff --git a/cppcanvas/source/inc/implrenderer.hxx
b/cppcanvas/source/inc/implrenderer.hxx
index 4d5918b..786af41 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -276,7 +276,14 @@ static float GetSwapFloat( SvStream& rSt )
/* EMF+ */
void processEMFPlus( MetaCommentAction* pAct, const
ActionFactoryParameters& rFactoryParms, OutDevState& rState, const
CanvasSharedPtr& rCanvas );
double setFont( sal_uInt8 objectId, const ActionFactoryParameters&
rParms, OutDevState& rState );
-void EMFPPlusDrawPolygon (::basegfx::B2DPolyPolygon& polygon,
const ActionFactoryParameters& rParms, OutDevState& rState, const
CanvasSharedPtr& rCanvas, sal_uInt32 penIndex);
+
+/// Render LineCap, like the start or end arrow of a polygon.
+void EMFPPlusDrawLineCap(const ::basegfx::B2DPolygon& rPolygon,
double fPolyLength,
+const ::basegfx::B2DPolyPolygon& rLineCap, bool bStart,
+const com::sun::star::rendering::StrokeAttributes&
rAttributes,
+const ActionFactoryParameters& rParms, OutDevState&
rState);
+
+void EMFPPlusDrawPolygon (const ::basegfx::B2DPolyPolygon&
polygon, const ActionFactoryParameters& rParms, OutDevState& rState, const
CanvasSharedPtr& rCanvas, sal_uInt32 penIndex);
void EMFPPlusFillPolygon (::basegfx::B2DPolyPolygon& polygon,
const ActionFactoryParameters& rParms, OutDevState& rState, const
CanvasSharedPtr& rCanvas, bool isColor, sal_uInt32 brushIndexOrColor);
ActionVector maActions;
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 72926a0..f663638 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -28,6 +28,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -36,8 +37,10 @@
#include
#include
-#include
+#include
+#include
#include
+#include
#include
#include
@@ -99,6 +102,22 @@ const sal_Int32 EmfPlusLineStyleDashDot = 0x0003;
const sal_Int32 EmfPlusLineStyleDashDotDot = 0x0004;
const sal_Int32 EmfPlusLineStyleCustom = 0x0005;
+const sal_uInt32 EmfPlusCustomLineCapDataTypeDefault = 0x;
+const sal_uInt32 EmfPlusCustomLineCapDataTypeAdjustableArrow = 0x0001;
+
+const sal_uInt32 EmfPlusCustomLineCapDataFillPath = 0x0001;
+const sal_uInt32 EmfPlusCustomLineCapDataLinePath = 0x0002;
+
+const sal_uInt32 EmfPlusLineCapTypeFlat = 0x;
+const sal_uInt32 EmfPlusLineCapTypeSquare = 0x0001;
+const sal_uInt32 EmfPlusLineCapTypeRound = 0x0002;
+const sal_uInt32 EmfPlusLineCapTypeTriangle = 0x0003;
+
+const sal_uInt32 EmfPlusLineJoinTypeMiter = 0x;
+const sal_uInt32 EmfPlusLineJoinTypeBevel = 0x0001;
+const sal_uInt32 EmfPlusLineJoinTypeRound = 0x0002;
+const sal_uInt32 EmfPlusLineJoinTypeMiterClipped = 0x0003;
+
#if OSL_DEBUG_LEVEL > 1
#define EMFP_DEBUG(x) x
#else
@@ -582,6 +601,137 @@ namespace cppcanvas
}
};
+/// Convert stroke caps between EMF+ and rendering API
+sal_Int8 lcl_convertStrokeCap(sal_uInt32 nEmfStroke)
+{
+switch (nEmfStroke)
+{
+case EmfPlusLineCapTypeSquare: return
rendering::PathCapType::SQUARE;
+case EmfPlusLineCapTypeRound: return
rendering::PathCapType::ROUND;
+}
+
+// we have no mapping for EmfPlusLineCapTypeTriangle, so return
+// BUTT always
+return rendering::PathCapType::BUTT;
+}
+
+struct EMFPCustomLineCap : public EMFPObject
+{
+sal_uInt32 type;
+sal_uInt32 strokeStartCap, strokeEndCap, strokeJoin;
+float miterLimit;
+basegfx::B2DPolyPolygon polygon;
+
+public:
+EMFPCustomLineCap() : EMFPObject()
+{
+}
+
+~EMFPCustomLineCap()
+{
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - vcl/source
vcl/source/filter/wmf/enhwmf.cxx | 14 +--
vcl/source/filter/wmf/winmtf.cxx | 146 ++-
vcl/source/filter/wmf/winmtf.hxx | 20 -
vcl/source/filter/wmf/winwmf.cxx |1
4 files changed, 123 insertions(+), 58 deletions(-)
New commits:
commit a39079ec9c3a017c912e45126ae980ff56127099
Author: Jan Holesovsky
Date: Mon Nov 25 16:21:12 2013 +0100
fdo#61272: Do the mapping correctly both for WMF and EMF.
Turns out that for the WMF, we already had everything set up correctly, we
were just overwriting the right settings with default data again :-) - fix
that.
Includes the following commits:
* Revert "wmf-mm-text-1.diff: Fix WMF rendering, n#417818"
* Revert "wmf-mm-text.diff: Fix WMF rendering, n#417818"
* fdo#56886 EMF: Fixes some scaling problems of clipped regions, Twips
Change-Id: I14b0c12b10f58eb7031f9da712dee76344c75159
Reviewed-on: https://gerrit.libreoffice.org/6802
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index f8b9884..541d68d 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -485,8 +485,8 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
EMFP_DEBUG(printf ("\t\tunknown id: 0x%x\n",(unsigned int)
id));
}
}
-} else if( !bEMFPlus || bHaveDC || nRecType == EMR_EOF )
-
+}
+else if( !bEMFPlus || bHaveDC || nRecType == EMR_EOF )
switch( nRecType )
{
case EMR_POLYBEZIERTO :
@@ -518,14 +518,14 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
case EMR_SETWINDOWEXTEX :
{ // #75383#
*pWMF >> nW >> nH;
-pOut->SetWinExt( Size( nW, nH ) );
+pOut->SetWinExt( Size( nW, nH ), true);
}
break;
case EMR_SETWINDOWORGEX :
{
*pWMF >> nX32 >> nY32;
-pOut->SetWinOrg( Point( nX32, nY32 ) );
+pOut->SetWinOrg( Point( nX32, nY32 ), true);
}
break;
@@ -917,7 +917,7 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
PolyPolygon aPolyPoly;
if ( cbRgnData )
ImplReadRegion( aPolyPoly, *pWMF, nRecSize );
-pOut->SetClipPath( aPolyPoly, iMode, sal_False );
+pOut->SetClipPath( aPolyPoly, iMode, sal_True );
}
break;
@@ -1352,7 +1352,7 @@ sal_Bool EnhWMFReader::ReadHeader()
return sal_False;
// bound size
-Rectangle rclBounds;// rectangle in logical units 1/100th mm
+Rectangle rclBounds;// rectangle in logical units
*pWMF >> nLeft >> nTop >> nRight >> nBottom;
rclBounds.Left() = nLeft;
rclBounds.Top() = nTop;
@@ -1360,7 +1360,7 @@ sal_Bool EnhWMFReader::ReadHeader()
rclBounds.Bottom() = nBottom;
// picture frame size
-Rectangle rclFrame; // rectangle in device units
+Rectangle rclFrame; // rectangle in device units 1/100th mm
*pWMF >> nLeft >> nTop >> nRight >> nBottom;
rclFrame.Left() = nLeft;
rclFrame.Top() = nTop;
diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx
index 63b0996..fc972e8 100644
--- a/vcl/source/filter/wmf/winmtf.cxx
+++ b/vcl/source/filter/wmf/winmtf.cxx
@@ -352,6 +352,20 @@ Color WinMtf::ReadColor()
//---
//---
+Point WinMtfOutput::ImplScale( const Point& rPt)//Hack to set varying defaults
for incompletely defined files.
+{
+if (mbIsMapDevSet && mbIsMapWinSet)
+{
+return
Point((rPt.X())*mnWinExtX/mnDevWidth-mrclFrame.Left(),(rPt.Y())*mnWinExtY/mnDevHeight-mrclFrame.Top());
+}
+else
+{
+return
Point((rPt.X())*UNDOCUMENTED_WIN_RCL_RELATION-mrclFrame.Left(),(rPt.Y())*UNDOCUMENTED_WIN_RCL_RELATION-mrclFrame.Top());
+}
+}
+
+//---
+
Point WinMtfOutput::ImplMap( const Point& rPt )
{
if ( mnWinExtX && mnWinExtY )
@@ -366,35 +380,32 @@ Point WinMtfOutput::ImplMap( const Point& rPt )
{
switch( mnMapMode )
{
-case MM_TEXT:
+case MM_LOENGLISH :
+{
fX2 -= mnWinOrgX;
-fY2 -= mnWinOrgY;
-if( mnDevWidth != 1 || mnDevHeight != 1 ) {
-fX2 *= 2540.0/mnUnitsPerInch;
-fY2 *= 2540.0/mnUnitsPerInch;
-}
+fY2 = mnWinOrgY-fY2;
+fX2 *= HUNDREDTH_MILLIMETERS_PER_MILLIINCH*10;
+
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - cppcanvas/source
cppcanvas/source/mtfrenderer/emfplus.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e6685ba6808a1315ebf0c8f988ef8533be193857
Author: Jan Holesovsky
Date: Tue Nov 19 10:02:12 2013 +0100
EMF+: Stroke size is always supposed to be absolute.
Conflicts:
cppcanvas/source/mtfrenderer/emfplus.cxx
Change-Id: I7221311e5dee6384dc2d1c071bf6f1c61811895a
Reviewed-on: https://gerrit.libreoffice.org/6801
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 6ca731a..b0acbd3 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -609,7 +609,7 @@ namespace cppcanvas
void SetStrokeAttributes (rendering::StrokeAttributes&
rStrokeAttributes, ImplRenderer& rR, const OutDevState& rState)
{
EMFP_DEBUG (if (width == 0.0) printf ("EMF+\tTODO: pen with
zero width - using minimal which might not be correct\n"));
-rStrokeAttributes.StrokeWidth = (rState.mapModeTransform *
rR.MapSize (width == 0.0 ? 0.05 : width, 0)).getX ();
+rStrokeAttributes.StrokeWidth = fabs((rState.mapModeTransform
* rR.MapSize (width == 0.0 ? 0.05 : width, 0)).getX());
}
void Read (SvStream& s, ImplRenderer& rR, sal_Int32, sal_Int32 )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - cppcanvas/source
cppcanvas/source/mtfrenderer/emfplus.cxx | 51 +--
1 file changed, 49 insertions(+), 2 deletions(-)
New commits:
commit d1f3dc8b43f65c6c16b6f58f3d5ee84f22001163
Author: Jan Holesovsky
Date: Fri Nov 22 12:01:15 2013 +0100
EMF+: Implement line dashing.
Conflicts:
cppcanvas/source/mtfrenderer/emfplus.cxx
Change-Id: I9eb21c0a8b5baa5b0080845f61b12fc65034d959
Reviewed-on: https://gerrit.libreoffice.org/6803
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index b0acbd3..4968a6f 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -92,6 +92,13 @@
#define EmfPlusRegionInitialStateEmpty 0x1002
#define EmfPlusRegionInitialStateInfinite 0x1003
+const sal_Int32 EmfPlusLineStyleSolid = 0x;
+const sal_Int32 EmfPlusLineStyleDash = 0x0001;
+const sal_Int32 EmfPlusLineStyleDot = 0x0002;
+const sal_Int32 EmfPlusLineStyleDashDot = 0x0003;
+const sal_Int32 EmfPlusLineStyleDashDotDot = 0x0004;
+const sal_Int32 EmfPlusLineStyleCustom = 0x0005;
+
#if OSL_DEBUG_LEVEL > 1
#define EMFP_DEBUG(x) x
#else
@@ -610,6 +617,34 @@ namespace cppcanvas
{
EMFP_DEBUG (if (width == 0.0) printf ("EMF+\tTODO: pen with
zero width - using minimal which might not be correct\n"));
rStrokeAttributes.StrokeWidth = fabs((rState.mapModeTransform
* rR.MapSize (width == 0.0 ? 0.05 : width, 0)).getX());
+
+// set dashing
+if (dashStyle != EmfPlusLineStyleSolid)
+{
+const float dash[] = {3, 3};
+const float dot[] = {1, 3};
+const float dashdot[] = {3, 3, 1, 3};
+const float dashdotdot[] = {3, 3, 1, 3, 1, 3};
+
+sal_Int32 nLen = 0;
+const float *pPattern;
+switch (dashStyle)
+{
+case EmfPlusLineStyleDash: nLen =
SAL_N_ELEMENTS(dash); pPattern = dash; break;
+case EmfPlusLineStyleDot:nLen =
SAL_N_ELEMENTS(dot); pPattern = dot; break;
+case EmfPlusLineStyleDashDot:nLen =
SAL_N_ELEMENTS(dashdot); pPattern = dashdot; break;
+case EmfPlusLineStyleDashDotDot: nLen =
SAL_N_ELEMENTS(dashdotdot); pPattern = dashdotdot; break;
+case EmfPlusLineStyleCustom: nLen =
dashPatternLen; pPattern = dashPattern; break;
+}
+if (nLen > 0)
+{
+uno::Sequence aDashArray(nLen);
+for (int i = 0; i < nLen; ++i)
+aDashArray[i] = pPattern[i];
+
+rStrokeAttributes.DashArray = aDashArray;
+}
+}
}
void Read (SvStream& s, ImplRenderer& rR, sal_Int32, sal_Int32 )
@@ -645,7 +680,10 @@ namespace cppcanvas
mitterLimit = 0;
if (penFlags & 32)
+{
s >> dashStyle;
+SAL_INFO("cppcanvas.emf", "EMF+\t\tdashStyle: 0x" <<
std::hex << dashStyle);
+}
else
dashStyle = 0;
@@ -659,14 +697,23 @@ namespace cppcanvas
else
dashOffset = 0;
-if (penFlags & 256) {
+if (penFlags & 256)
+{
+dashStyle = EmfPlusLineStyleCustom;
+
s >> dashPatternLen;
+SAL_INFO("cppcanvas.emf", "EMF+\t\tdashPatternLen: " <<
dashPatternLen);
+
if( dashPatternLen<0 ||
sal_uInt32(dashPatternLen)>SAL_MAX_INT32/sizeof(float) )
dashPatternLen = SAL_MAX_INT32/sizeof(float);
dashPattern = new float [dashPatternLen];
for (i = 0; i < dashPatternLen; i++)
+{
s >> dashPattern [i];
-} else
+SAL_INFO("cppcanvas.emf", "EMF+\t\t\tdashPattern[" <<
i << "]: " << dashPattern[i]);
+}
+}
+else
dashPatternLen = 0;
if (penFlags & 512)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - cppcanvas/source
cppcanvas/source/inc/implrenderer.hxx|9
cppcanvas/source/mtfrenderer/emfplus.cxx | 314 +++
2 files changed, 290 insertions(+), 33 deletions(-)
New commits:
commit 3541cefc54c9cdac06b2139b16eb0f37ac9d85d8
Author: Jan Holesovsky
Date: Fri Nov 22 17:06:10 2013 +0100
EMF+: Parse and render custom line cap data.
Contains the following commits:
* EMF+: Small cleanup & more logging in preparation for line starts & ends.
* EMF+: Parse custom line cap data for start and end line caps.
* EMF+: Render custom line cap data.
* EMF+: Set the stroke attributes on the custom line caps.
Change-Id: If35ef1c44f34f5d5e6c50789c907105d03e96fca
Reviewed-on: https://gerrit.libreoffice.org/6806
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/cppcanvas/source/inc/implrenderer.hxx
b/cppcanvas/source/inc/implrenderer.hxx
index 4537368..82099a2 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -272,7 +272,14 @@ static float GetSwapFloat( SvStream& rSt )
/* EMF+ */
void processEMFPlus( MetaCommentAction* pAct, const
ActionFactoryParameters& rFactoryParms, OutDevState& rState, const
CanvasSharedPtr& rCanvas );
double setFont( sal_uInt8 objectId, const ActionFactoryParameters&
rParms, OutDevState& rState );
-void EMFPPlusDrawPolygon (::basegfx::B2DPolyPolygon& polygon,
const ActionFactoryParameters& rParms, OutDevState& rState, const
CanvasSharedPtr& rCanvas, sal_uInt32 penIndex);
+
+/// Render LineCap, like the start or end arrow of a polygon.
+void EMFPPlusDrawLineCap(const ::basegfx::B2DPolygon& rPolygon,
double fPolyLength,
+const ::basegfx::B2DPolyPolygon& rLineCap, bool bStart,
+const com::sun::star::rendering::StrokeAttributes&
rAttributes,
+const ActionFactoryParameters& rParms, OutDevState&
rState);
+
+void EMFPPlusDrawPolygon (const ::basegfx::B2DPolyPolygon&
polygon, const ActionFactoryParameters& rParms, OutDevState& rState, const
CanvasSharedPtr& rCanvas, sal_uInt32 penIndex);
void EMFPPlusFillPolygon (::basegfx::B2DPolyPolygon& polygon,
const ActionFactoryParameters& rParms, OutDevState& rState, const
CanvasSharedPtr& rCanvas, bool isColor, sal_uInt32 brushIndexOrColor);
ActionVector maActions;
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 4968a6f..3943bea 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -28,6 +28,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -36,8 +37,10 @@
#include
#include
-#include
+#include
+#include
#include
+#include
#include
#include
@@ -99,6 +102,22 @@ const sal_Int32 EmfPlusLineStyleDashDot = 0x0003;
const sal_Int32 EmfPlusLineStyleDashDotDot = 0x0004;
const sal_Int32 EmfPlusLineStyleCustom = 0x0005;
+const sal_uInt32 EmfPlusCustomLineCapDataTypeDefault = 0x;
+const sal_uInt32 EmfPlusCustomLineCapDataTypeAdjustableArrow = 0x0001;
+
+const sal_uInt32 EmfPlusCustomLineCapDataFillPath = 0x0001;
+const sal_uInt32 EmfPlusCustomLineCapDataLinePath = 0x0002;
+
+const sal_uInt32 EmfPlusLineCapTypeFlat = 0x;
+const sal_uInt32 EmfPlusLineCapTypeSquare = 0x0001;
+const sal_uInt32 EmfPlusLineCapTypeRound = 0x0002;
+const sal_uInt32 EmfPlusLineCapTypeTriangle = 0x0003;
+
+const sal_uInt32 EmfPlusLineJoinTypeMiter = 0x;
+const sal_uInt32 EmfPlusLineJoinTypeBevel = 0x0001;
+const sal_uInt32 EmfPlusLineJoinTypeRound = 0x0002;
+const sal_uInt32 EmfPlusLineJoinTypeMiterClipped = 0x0003;
+
#if OSL_DEBUG_LEVEL > 1
#define EMFP_DEBUG(x) x
#else
@@ -587,6 +606,137 @@ namespace cppcanvas
}
};
+/// Convert stroke caps between EMF+ and rendering API
+sal_Int8 lcl_convertStrokeCap(sal_uInt32 nEmfStroke)
+{
+switch (nEmfStroke)
+{
+case EmfPlusLineCapTypeSquare: return
rendering::PathCapType::SQUARE;
+case EmfPlusLineCapTypeRound: return
rendering::PathCapType::ROUND;
+}
+
+// we have no mapping for EmfPlusLineCapTypeTriangle, so return
+// BUTT always
+return rendering::PathCapType::BUTT;
+}
+
+struct EMFPCustomLineCap : public EMFPObject
+{
+sal_uInt32 type;
+sal_uInt32 strokeStartCap, strokeEndCap, strokeJoin;
+float miterLimit;
+basegfx::B2DPolyPolygon polygon;
+
+public:
+EMFPCustomLineCap() : EMFPObject()
+{
+}
+
+~EMFPCustomLineCap()
+{
+}
+
+void SetAttributes(rendering::StrokeAttributes& aAttributes)
+
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/aqua
vcl/aqua/source/window/salframeview.mm | 37 +
1 file changed, 37 insertions(+)
New commits:
commit 5677b7a9e4d33d07e1f5ad9e5d591beb242c2dd6
Author: Caolán McNamara
Date: Mon Nov 25 11:04:41 2013 +
Resolves: fdo#41169 fix MacOSX non-Latin keyboard layout with Latin
shortcuts
Change-Id: I168de52d6185d5df9c41fd2d7a68c0ff3f733852
(cherry picked from commit 82b5172954261e030a42bd6b3f4acc99807d0ee5)
Reviewed-on: https://gerrit.libreoffice.org/6798
Reviewed-by: Tor Lillqvist
Tested-by: Tor Lillqvist
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/vcl/aqua/source/window/salframeview.mm
b/vcl/aqua/source/window/salframeview.mm
index a0715d5..610eb93 100644
--- a/vcl/aqua/source/window/salframeview.mm
+++ b/vcl/aqua/source/window/salframeview.mm
@@ -105,6 +105,38 @@ static sal_uInt16 ImplMapCharCode( sal_Unicode aCode )
return nKeyCode;
}
+static sal_uInt16 ImplMapKeyCode(sal_uInt16 nKeyCode)
+{
+/*
+
http://stackoverflow.com/questions/2080312/where-can-i-find-a-list-of-key-codes-for-use-with-cocoas-nsevent-class/2080324#2080324
+
/System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/HIToolbox.framework/Versions/A/Headers/Events.h
+ */
+
+static sal_uInt16 aKeyCodeMap[ 0x80 ] =
+{
+KEY_A, KEY_S, KEY_D,KEY_F, KEY_H,
KEY_G,KEY_Z, KEY_X,
+KEY_C, KEY_V, 0,KEY_B, KEY_Q,
KEY_W,KEY_E, KEY_R,
+KEY_Y, KEY_T, KEY_1,KEY_2, KEY_3,
KEY_4,KEY_6, KEY_5,
+KEY_EQUAL, KEY_9, KEY_7, KEY_SUBTRACT, KEY_8,
KEY_0, KEY_BRACKETRIGHT, KEY_0,
+KEY_U, KEY_BRACKETLEFT, KEY_I,KEY_P, KEY_RETURN,
KEY_L,KEY_J, KEY_QUOTELEFT,
+KEY_K, KEY_SEMICOLON, 0,KEY_COMMA, KEY_DIVIDE,
KEY_N,KEY_M, KEY_POINT,
+KEY_TAB, KEY_SPACE, KEY_TILDE, KEY_DELETE, 0,
KEY_ESCAPE,0, 0,
+ 0, KEY_CAPSLOCK, 0,0, 0,
0,0, 0,
+KEY_F17, KEY_DECIMAL, 0, KEY_MULTIPLY, 0,
KEY_ADD, 0, 0,
+ 0, 0, 0, KEY_DIVIDE, KEY_RETURN,
0, KEY_SUBTRACT, KEY_F18,
+KEY_F19, KEY_EQUAL, 0,0, 0,
0,0, 0,
+ 0, 0, KEY_F20,0, 0,
0,0, 0,
+ KEY_F5,KEY_F6,KEY_F7, KEY_F3, KEY_F8,
KEY_F9,0, KEY_F11,
+ 0, KEY_F13, KEY_F16, KEY_F14, 0,
KEY_F10,0, KEY_F12,
+ 0, KEY_F15, KEY_HELP, KEY_HOME, KEY_PAGEUP,
KEY_DELETE, KEY_F4, KEY_END,
+ KEY_F2, KEY_PAGEDOWN,KEY_F1, KEY_LEFT, KEY_RIGHT,
KEY_DOWN, KEY_UP,0
+};
+
+if (nKeyCode < SAL_N_ELEMENTS(aKeyCodeMap))
+return aKeyCodeMap[nKeyCode];
+return 0;
+}
+
// store the frame the mouse last entered
static AquaSalFrame* s_pMouseFrame = NULL;
// store the last pressed button for enter/exit events
@@ -1444,6 +1476,11 @@ private:
{
unichar keyChar = [pUnmodifiedString characterAtIndex: 0];
sal_uInt16 nKeyCode = ImplMapCharCode( keyChar );
+if (nKeyCode == 0)
+{
+sal_uInt16 nOtherKeyCode = [pEvent keyCode];
+nKeyCode = ImplMapKeyCode(nOtherKeyCode);
+}
if( nKeyCode != 0 )
{
// don't send unicodes in the private use area
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - vcl/aqua
vcl/aqua/source/window/salframeview.mm | 37 +
1 file changed, 37 insertions(+)
New commits:
commit 341dfe3a2e0f6f9e5bc1e7985cc4ccd00cf733ee
Author: Caolán McNamara
Date: Mon Nov 25 11:04:41 2013 +
Resolves: fdo#41169 fix MacOSX non-Latin keyboard layout with Latin
shortcuts
Change-Id: I168de52d6185d5df9c41fd2d7a68c0ff3f733852
(cherry picked from commit 82b5172954261e030a42bd6b3f4acc99807d0ee5)
Reviewed-on: https://gerrit.libreoffice.org/6797
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/vcl/aqua/source/window/salframeview.mm
b/vcl/aqua/source/window/salframeview.mm
index 31b87e2..4bb1dfde 100644
--- a/vcl/aqua/source/window/salframeview.mm
+++ b/vcl/aqua/source/window/salframeview.mm
@@ -113,6 +113,38 @@ static sal_uInt16 ImplMapCharCode( sal_Unicode aCode )
return nKeyCode;
}
+static sal_uInt16 ImplMapKeyCode(sal_uInt16 nKeyCode)
+{
+/*
+
http://stackoverflow.com/questions/2080312/where-can-i-find-a-list-of-key-codes-for-use-with-cocoas-nsevent-class/2080324#2080324
+
/System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/HIToolbox.framework/Versions/A/Headers/Events.h
+ */
+
+static sal_uInt16 aKeyCodeMap[ 0x80 ] =
+{
+KEY_A, KEY_S, KEY_D,KEY_F, KEY_H,
KEY_G,KEY_Z, KEY_X,
+KEY_C, KEY_V, 0,KEY_B, KEY_Q,
KEY_W,KEY_E, KEY_R,
+KEY_Y, KEY_T, KEY_1,KEY_2, KEY_3,
KEY_4,KEY_6, KEY_5,
+KEY_EQUAL, KEY_9, KEY_7, KEY_SUBTRACT, KEY_8,
KEY_0, KEY_BRACKETRIGHT, KEY_0,
+KEY_U, KEY_BRACKETLEFT, KEY_I,KEY_P, KEY_RETURN,
KEY_L,KEY_J, KEY_QUOTELEFT,
+KEY_K, KEY_SEMICOLON, 0,KEY_COMMA, KEY_DIVIDE,
KEY_N,KEY_M, KEY_POINT,
+KEY_TAB, KEY_SPACE, KEY_TILDE, KEY_DELETE, 0,
KEY_ESCAPE,0, 0,
+ 0, KEY_CAPSLOCK, 0,0, 0,
0,0, 0,
+KEY_F17, KEY_DECIMAL, 0, KEY_MULTIPLY, 0,
KEY_ADD, 0, 0,
+ 0, 0, 0, KEY_DIVIDE, KEY_RETURN,
0, KEY_SUBTRACT, KEY_F18,
+KEY_F19, KEY_EQUAL, 0,0, 0,
0,0, 0,
+ 0, 0, KEY_F20,0, 0,
0,0, 0,
+ KEY_F5,KEY_F6,KEY_F7, KEY_F3, KEY_F8,
KEY_F9,0, KEY_F11,
+ 0, KEY_F13, KEY_F16, KEY_F14, 0,
KEY_F10,0, KEY_F12,
+ 0, KEY_F15, KEY_HELP, KEY_HOME, KEY_PAGEUP,
KEY_DELETE, KEY_F4, KEY_END,
+ KEY_F2, KEY_PAGEDOWN,KEY_F1, KEY_LEFT, KEY_RIGHT,
KEY_DOWN, KEY_UP,0
+};
+
+if (nKeyCode < SAL_N_ELEMENTS(aKeyCodeMap))
+return aKeyCodeMap[nKeyCode];
+return 0;
+}
+
// store the frame the mouse last entered
static AquaSalFrame* s_pMouseFrame = NULL;
// store the last pressed button for enter/exit events
@@ -1490,6 +1522,11 @@ private:
{
unichar keyChar = [pUnmodifiedString characterAtIndex: 0];
sal_uInt16 nKeyCode = ImplMapCharCode( keyChar );
+if (nKeyCode == 0)
+{
+sal_uInt16 nOtherKeyCode = [pEvent keyCode];
+nKeyCode = ImplMapKeyCode(nOtherKeyCode);
+}
if( nKeyCode != 0 )
{
// don't send unicodes in the private use area
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - svl/inc svl/source
svl/inc/svl/smplhint.hxx |6 +++---
svl/source/notify/smplhint.cxx |9 -
2 files changed, 3 insertions(+), 12 deletions(-)
New commits:
commit 5cd09cc74da93da4c91c665822b6ab9a0d704a7a
Author: Herbert Dürr
Date: Tue Nov 26 09:00:15 2013 +
#i123753# WaE: fix unoedhlp.hxx declaration of 'nId' shadowing a member of
SimpleHint
Happy new times: Now even simple compiler warning fixes need their own
issue.
diff --git a/svl/inc/svl/smplhint.hxx b/svl/inc/svl/smplhint.hxx
index da3d712..fdf5ac9 100644
--- a/svl/inc/svl/smplhint.hxx
+++ b/svl/inc/svl/smplhint.hxx
@@ -64,11 +64,11 @@
class SVL_DLLPUBLIC SfxSimpleHint: public SfxHint
{
private:
-sal_uLong nId;
+sal_uLong mnId;
public:
TYPEINFO();
-SfxSimpleHint( sal_uLong nId );
-sal_uLong GetId() const { return nId; }
+SfxSimpleHint( sal_uLong nId ) { mnId = nId; }
+sal_uLong GetId() const { return mnId; }
};
//
diff --git a/svl/source/notify/smplhint.cxx b/svl/source/notify/smplhint.cxx
index 227174e..a582b3a 100644
--- a/svl/source/notify/smplhint.cxx
+++ b/svl/source/notify/smplhint.cxx
@@ -32,12 +32,3 @@
TYPEINIT1(SfxSimpleHint, SfxHint);
-//
-// creates a SimpleHint with the type nId
-
-SfxSimpleHint::SfxSimpleHint( sal_uLong nIdP )
-{
-nId = nIdP;
-}
-
-
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - 6 commits - cppcanvas/source vcl/source
cppcanvas/source/inc/implrenderer.hxx|9
cppcanvas/source/mtfrenderer/emfplus.cxx | 353 ---
vcl/source/filter/wmf/enhwmf.cxx | 102
vcl/source/filter/wmf/winmtf.cxx | 34 --
vcl/source/filter/wmf/winmtf.hxx | 14 -
5 files changed, 378 insertions(+), 134 deletions(-)
New commits:
commit aa58872593822206e2f0a2bc0322954d4bf7685b
Author: Jan Holesovsky
Date: Mon Nov 25 22:09:48 2013 +0100
EMF+: Set the stroke attributes on the custom line caps.
This finally makes the rendering of the custom line caps nice & complete.
Change-Id: If35ef1c44f34f5d5e6c50789c907105d03e96fca
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 2fa121f0..4907b6f 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -37,8 +37,10 @@
#include
#include
-#include
+#include
+#include
#include
+#include
#include
#include
@@ -103,6 +105,16 @@ const sal_uInt32
EmfPlusCustomLineCapDataTypeAdjustableArrow = 0x0001;
const sal_uInt32 EmfPlusCustomLineCapDataFillPath = 0x0001;
const sal_uInt32 EmfPlusCustomLineCapDataLinePath = 0x0002;
+const sal_uInt32 EmfPlusLineCapTypeFlat = 0x;
+const sal_uInt32 EmfPlusLineCapTypeSquare = 0x0001;
+const sal_uInt32 EmfPlusLineCapTypeRound = 0x0002;
+const sal_uInt32 EmfPlusLineCapTypeTriangle = 0x0003;
+
+const sal_uInt32 EmfPlusLineJoinTypeMiter = 0x;
+const sal_uInt32 EmfPlusLineJoinTypeBevel = 0x0001;
+const sal_uInt32 EmfPlusLineJoinTypeRound = 0x0002;
+const sal_uInt32 EmfPlusLineJoinTypeMiterClipped = 0x0003;
+
using namespace ::com::sun::star;
using namespace ::basegfx;
@@ -594,9 +606,25 @@ namespace cppcanvas
}
};
+/// Convert stroke caps between EMF+ and rendering API
+sal_Int8 lcl_convertStrokeCap(sal_uInt32 nEmfStroke)
+{
+switch (nEmfStroke)
+{
+case EmfPlusLineCapTypeSquare: return
rendering::PathCapType::SQUARE;
+case EmfPlusLineCapTypeRound: return
rendering::PathCapType::ROUND;
+}
+
+// we have no mapping for EmfPlusLineCapTypeTriangle, so return
+// BUTT always
+return rendering::PathCapType::BUTT;
+}
+
struct EMFPCustomLineCap : public EMFPObject
{
sal_uInt32 type;
+sal_uInt32 strokeStartCap, strokeEndCap, strokeJoin;
+float miterLimit;
basegfx::B2DPolyPolygon polygon;
public:
@@ -608,6 +636,22 @@ namespace cppcanvas
{
}
+void SetAttributes(rendering::StrokeAttributes& aAttributes)
+{
+aAttributes.StartCapType =
lcl_convertStrokeCap(strokeStartCap);
+aAttributes.EndCapType = lcl_convertStrokeCap(strokeEndCap);
+
+switch (strokeJoin)
+{
+case EmfPlusLineJoinTypeMiter:// fall-through
+case EmfPlusLineJoinTypeMiterClipped: aAttributes.JoinType
= rendering::PathJoinType::MITER; break;
+case EmfPlusLineJoinTypeBevel:aAttributes.JoinType
= rendering::PathJoinType::BEVEL; break;
+case EmfPlusLineJoinTypeRound:aAttributes.JoinType
= rendering::PathJoinType::ROUND; break;
+}
+
+aAttributes.MiterLimit = miterLimit;
+}
+
void ReadPath(SvStream& s, ImplRenderer& rR, bool bClosed)
{
sal_Int32 pathLength;
@@ -648,13 +692,12 @@ namespace cppcanvas
{
sal_uInt32 customLineCapDataFlags, baseCap;
float baseInset;
-sal_uInt32 strokeStartCap, strokeEndCap, strokeJoin;
-float strokeMiterLimit, widthScale;
+float widthScale;
float fillHotSpotX, fillHotSpotY, strokeHotSpotX,
strokeHotSpotY;
s >> customLineCapDataFlags >> baseCap >> baseInset
>> strokeStartCap >> strokeEndCap >> strokeJoin
- >> strokeMiterLimit >> widthScale
+ >> miterLimit >> widthScale
>> fillHotSpotX >> fillHotSpotY >> strokeHotSpotX >>
strokeHotSpotY;
SAL_INFO("cppcanvas.emf", "EMF+\t\tcustomLineCapDataFlags:
0x" << std::hex << customLineCapDataFlags);
@@ -663,7 +706,7 @@ namespace cppcanvas
SAL_INFO("cppcanvas.emf", "EMF+\t\tstrokeStartCap: 0x" <<
std::hex << strokeStartCap);
SAL_INFO("cppcanvas.emf", "EMF+\t\tstrokeEndCap: 0x" <<
std::hex << strokeEndCap);
SAL_INFO("cppcanvas.emf", "EMF+\t\tstrokeJoin: 0x" <<
std::hex << strokeJoin);
-SAL_INFO("cppcanvas.emf", "EMF+
[Libreoffice-commits] core.git: sw/source
sw/source/core/view/vnew.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 1d648282596ec06fdfd111e29c8328c1f3c07500 Author: Caolán McNamara Date: Tue Nov 26 10:23:06 2013 + mbTiledRendering is uninitialized Change-Id: I98f1d81aa58d013c5f2042e2c4b76c4ebccf7120 diff --git a/sw/source/core/view/vnew.cxx b/sw/source/core/view/vnew.cxx index 1efee42..990a5dfb 100644 --- a/sw/source/core/view/vnew.cxx +++ b/sw/source/core/view/vnew.cxx @@ -157,6 +157,7 @@ SwViewShell::SwViewShell( SwDoc& rDocument, Window *pWindow, mbShowHeaderSeparator( false ), mbShowFooterSeparator( false ), mbHeaderFooterEdit( false ), +mbTiledRendering(false), mpTargetPaintWindow(0), // #i74769# mpBufferedOut(0), // #i74769# mpDoc( &rDocument ), ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: LibreOffice 4.1: Mozilla build option to ignore
On 26/11/13 10:49, Mohamed-Ali BEN MANSOUR wrote: > > Hi everyone, > > I was building LO 4.1 version and i've found this option in > distro-configs\LibreOfficeWin32.conf: > --enable-win-mozab-driver > > According to the wiki: > https://wiki.documentfoundation.org/Development/Windows_Build_Dependencies#Install_Windows_Build_Requirements > , Mozilla build tooling is only used for LibreOffice versions older than > 4.1. that is true, but... > I propose to remove this option from the file (LibreOfficeWin32.conf).. ... what it actually means is that in contemporary releases it's no longer possible to build the mozilla stuff from source (hence no need for the tools); what --enable-win-mozab-driver does instead is to download and unpack pre-built binaries and put them into the installation set. of course if we had somebody implement native Outlook / Outlook Express address book driver we could remove that too :) > We also need to modify the autogen.lastrun for builds at this link: > http://dev-builds.libreoffice.org/daily/libreoffice-4-1/Win-x86_9-Voreppe/2013-11-11_21.19.15/libreoffice-4-1~2013-11-11_21.19.15_build_info.txt > Actually, we have in the same file: "--enable-win-mozab-driver" and > "--disable-win-mozab-driver" that is indeed funny to have both of these in there. > By the way, is it normal that we can't see any build in this directory: > http://dev-builds.libreoffice.org/daily/libreoffice-4-1/Win-x86@42 ? that's a good question - Thorsten, why isn't Win-x86@42 doing uploads? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - b9/89f4074ea70729d527b307bfbe49e01a0d3646 e2/f90c93c97f3cf137c348ed302c6470f398aa70
b9/89f4074ea70729d527b307bfbe49e01a0d3646 |1 + e2/f90c93c97f3cf137c348ed302c6470f398aa70 |1 + 2 files changed, 2 insertions(+) New commits: commit e208354c24d16800179ffdf6fac0b545c02629a0 Author: Caolán McNamara Date: Tue Nov 26 10:46:34 2013 + Notes added by 'git notes add' diff --git a/b9/89f4074ea70729d527b307bfbe49e01a0d3646 b/b9/89f4074ea70729d527b307bfbe49e01a0d3646 new file mode 100644 index 000..6947c0d --- /dev/null +++ b/b9/89f4074ea70729d527b307bfbe49e01a0d3646 @@ -0,0 +1 @@ +merged as: efb23f29983f87104a684e7fab00b84fc59d131d commit 4b40d8f81337ff8aedea76c9b340197b2fdbf7d6 Author: Caolán McNamara Date: Tue Nov 26 10:46:20 2013 + Notes added by 'git notes add' diff --git a/e2/f90c93c97f3cf137c348ed302c6470f398aa70 b/e2/f90c93c97f3cf137c348ed302c6470f398aa70 new file mode 100644 index 000..6947c0d --- /dev/null +++ b/e2/f90c93c97f3cf137c348ed302c6470f398aa70 @@ -0,0 +1 @@ +merged as: efb23f29983f87104a684e7fab00b84fc59d131d ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - include/svl include/toolkit svl/source toolkit/source
include/svl/smplhint.hxx |6 +--
include/toolkit/awt/vclxwindows.hxx|4 ++
svl/source/notify/smplhint.cxx | 10 --
toolkit/source/awt/vclxaccessiblecomponent.cxx | 39 -
toolkit/source/awt/vclxwindows.cxx | 22 ++
5 files changed, 67 insertions(+), 14 deletions(-)
New commits:
commit 968a76817340cafaeb239b71164974e3c0c43f04
Author: Steve Yin
Date: Tue Nov 26 10:51:41 2013 +
Integrate branch of IAccessible2
Change-Id: I95b681a7aa171c321a876e6a38392e30583d7a5b
diff --git a/include/toolkit/awt/vclxwindows.hxx
b/include/toolkit/awt/vclxwindows.hxx
index 74b6482..641383d 100644
--- a/include/toolkit/awt/vclxwindows.hxx
+++ b/include/toolkit/awt/vclxwindows.hxx
@@ -961,6 +961,8 @@ public:
class TOOLKIT_DLLPUBLIC VCLXDateField : public
::com::sun::star::awt::XDateField,
public VCLXFormattedSpinField
{
+protected:
+virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext();
public:
VCLXDateField();
~VCLXDateField();
@@ -1007,6 +1009,8 @@ public:
class VCLXTimeField : public ::com::sun::star::awt::XTimeField,
public VCLXFormattedSpinField
{
+protected:
+virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext();
public:
VCLXTimeField();
~VCLXTimeField();
diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx
b/toolkit/source/awt/vclxaccessiblecomponent.cxx
index e1be4c1..c087b14 100644
--- a/toolkit/source/awt/vclxaccessiblecomponent.cxx
+++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx
@@ -31,6 +31,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -436,13 +437,46 @@ void VCLXAccessibleComponent::FillAccessibleStateSet(
utl::AccessibleStateSetHel
if ( pWindow->GetStyle() & WB_SIZEABLE )
rStateSet.AddState( accessibility::AccessibleStateType::RESIZABLE
);
-
+// 6. frame doesn't have MOVABLE state
+// 10. for password text, where is the sensitive state?
+if( ( getAccessibleRole() == accessibility::AccessibleRole::FRAME
||getAccessibleRole() == accessibility::AccessibleRole::DIALOG )&&
pWindow->GetStyle() & WB_MOVEABLE )
+rStateSet.AddState( accessibility::AccessibleStateType::MOVEABLE );
if( pWindow->IsDialog() )
{
Dialog *pDlg = static_cast< Dialog* >( pWindow );
if( pDlg->IsInExecute() )
rStateSet.AddState( accessibility::AccessibleStateType::MODAL
);
}
+//If a combobox or list's edit child isn't read-only,EDITABLE state
+//should be set.
+if( pWindow && pWindow->GetType() == WINDOW_COMBOBOX )
+{
+if( !( pWindow->GetStyle() & WB_READONLY) ||
+!((Edit*)pWindow)->IsReadOnly() )
+rStateSet.AddState(
accessibility::AccessibleStateType::EDITABLE );
+}
+
+Window* pChild = pWindow->GetWindow( WINDOW_FIRSTCHILD );
+
+while( pWindow && pChild )
+{
+Window* pWinTemp = pChild->GetWindow( WINDOW_FIRSTCHILD );
+if( pWinTemp && pWinTemp->GetType() == WINDOW_EDIT )
+{
+if( !( pWinTemp->GetStyle() & WB_READONLY) ||
+!((Edit*)pWinTemp)->IsReadOnly() )
+rStateSet.AddState(
accessibility::AccessibleStateType::EDITABLE );
+break;
+}
+if( pChild->GetType() == WINDOW_EDIT )
+{
+if( !( pChild->GetStyle() & WB_READONLY) ||
+!((Edit*)pChild)->IsReadOnly())
+rStateSet.AddState(
accessibility::AccessibleStateType::EDITABLE );
+break;
+}
+pChild = pChild->GetWindow( WINDOW_NEXT );
+}
}
else
{
@@ -767,6 +801,9 @@ sal_Int32 SAL_CALL VCLXAccessibleComponent::getForeground(
) throw (uno::Runtim
else
aFont = pWindow->GetFont();
nColor = aFont.GetColor().GetColor();
+// COL_AUTO is not very meaningful for AT
+if ( nColor == (sal_Int32)COL_AUTO)
+nColor = pWindow->GetTextColor().GetColor();
}
}
diff --git a/toolkit/source/awt/vclxwindows.cxx
b/toolkit/source/awt/vclxwindows.cxx
index 84e0f66..e7a2e84 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -4798,6 +4798,17 @@ VCLXDateField::~VCLXDateField()
{
}
+//change the window type here to match the role
+::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleContext >
VCLXDateField::CreateAccessibleContext()
+{
+Window* pWindow = GetWindow();
+if ( pWindow )
+{
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 5c/d09cc74da93da4c91c665822b6ab9a0d704a7a
5c/d09cc74da93da4c91c665822b6ab9a0d704a7a |1 + 1 file changed, 1 insertion(+) New commits: commit 9f7b9a43d89224e822ae72dec808763b09b3745c Author: Caolán McNamara Date: Tue Nov 26 11:42:33 2013 + Notes added by 'git notes add' diff --git a/5c/d09cc74da93da4c91c665822b6ab9a0d704a7a b/5c/d09cc74da93da4c91c665822b6ab9a0d704a7a new file mode 100644 index 000..33a4420 --- /dev/null +++ b/5c/d09cc74da93da4c91c665822b6ab9a0d704a7a @@ -0,0 +1 @@ +merged as: 22029c7e17b4cb48acb058d47ec9c3b6b8b6b294 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig
cui/source/customize/macropg.cxx| 11 +++
cui/source/dialogs/cuigrfflt.cxx|5 -
cui/source/dialogs/iconcdlg.cxx |5 +
cui/source/inc/headertablistbox.hxx |2 +-
cui/source/tabpages/tparea.cxx |3 +++
cui/uiconfig/ui/bitmaptabpage.ui|2 +-
cui/uiconfig/ui/colorpage.ui| 10 ++
cui/uiconfig/ui/connectortabpage.ui |7 ++-
8 files changed, 33 insertions(+), 12 deletions(-)
New commits:
commit 52cd29a3388ec29d4de8423bb0979bcfb7a7cfcd
Author: Caolán McNamara
Date: Tue Nov 26 12:04:21 2013 +
add accessibility names to .ui
Change-Id: I09fc4a0166e1b9e9949ed9e3407e709954c88b1e
diff --git a/cui/uiconfig/ui/bitmaptabpage.ui b/cui/uiconfig/ui/bitmaptabpage.ui
index 42c0998..10f6d68 100644
--- a/cui/uiconfig/ui/bitmaptabpage.ui
+++ b/cui/uiconfig/ui/bitmaptabpage.ui
@@ -60,7 +60,7 @@
start
-Example
+Pattern Editor
diff --git a/cui/uiconfig/ui/colorpage.ui b/cui/uiconfig/ui/colorpage.ui
index 0630cb8..104ba54 100644
--- a/cui/uiconfig/ui/colorpage.ui
+++ b/cui/uiconfig/ui/colorpage.ui
@@ -177,6 +177,11 @@
False
True
True
+
+
+Old Color
+
+
1
@@ -191,6 +196,11 @@
False
True
True
+
+
+New Color
+
+
1
diff --git a/cui/uiconfig/ui/connectortabpage.ui
b/cui/uiconfig/ui/connectortabpage.ui
index c2d6939..811b42f 100644
--- a/cui/uiconfig/ui/connectortabpage.ui
+++ b/cui/uiconfig/ui/connectortabpage.ui
@@ -1,7 +1,7 @@
-
+
100
1
@@ -369,6 +369,11 @@
Preview
True
True
+
+
+Example
+
+
False
commit abbe6ce54c1ad96b1c12f019825916e078a02cb3
Author: Steve Yin
Date: Tue Nov 26 12:02:05 2013 +
Integrate branch of IAccessible2
Change-Id: Ic7d66abbfe8d88bfad66b1dbc8dd5bd103419714
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index acad203..2880494 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -146,12 +146,15 @@ long _HeaderTabListBox::Notify( NotifyEvent& rNEvt )
return nRet;
}
-_HeaderTabListBox::_HeaderTabListBox( Window* pParent, const ResId& rId ) :
-Control( pParent, rId ),
-maListBox( this, WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP ),
-maHeaderBar( this, WB_BUTTONSTYLE | WB_BOTTOMBORDER )
+_HeaderTabListBox::_HeaderTabListBox( Window* pParent, const ResId& rId )
+: Control( pParent, rId )
+, maHeaderBar( this, WB_BUTTONSTYLE | WB_BOTTOMBORDER )
+, maListBox( this, WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP )
{
maListBox.SetHelpId( HID_MACRO_HEADERTABLISTBOX );
+
+// enable the cell focus to show visible focus
+maListBox.EnableCellFocus();
}
_HeaderTabListBox::~_HeaderTabListBox()
diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index 4d34a68..0b6da15 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -311,8 +311,6 @@ GraphicFilterSolarize::GraphicFilterSolarize( Window*
pParent, const Graphic& rG
maCbxInvert.Check( bInvert );
maCbxInvert.SetToggleHdl( GetModifyHdl() );
-
-maMtrThreshold.GrabFocus();
}
//
-
@@ -371,8 +369,6 @@ GraphicFilterSepia::GraphicFilterSepia( Window* pParent,
const Graphic& rGraphic
maMtrSepia.SetValue( nSepiaPercent );
maMtrSepia.SetModifyHdl( GetModifyHdl() );
-
-maMtrSepia.GrabFocus();
}
//
-
@@ -423,7 +419,6 @@ GraphicFilterPoster::GraphicFilterPoster( Window* pParent,
const Graphic& rGraph
maNumPoster.SetLast( rGraphic.GetBitmapEx().GetBitCount() );
maNumPoster.SetValue( nPosterCount );
maNumPoster.SetModifyHdl( GetModifyHdl() );
-maNumPoster.GrabFocus();
}
//
-
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 18ffc57..3768911 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -412,6 +412,11 @@ void IconChoiceDialog::ShowPage( sal_uInt16 nId )
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cui/source
cui/source/dialogs/cuicharmap.cxx | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) New commits: commit ffb3bedc183791815eca699ef247f7109b9ffc21 Author: Pavel JanÃk Date: Tue Nov 26 10:15:10 2013 + WaE: reorder initializations to prevent compiler warnings. diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index 9161c08..a271516 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -257,7 +257,12 @@ SvxShowText::~SvxShowText() SvxCharMapData::SvxCharMapData( SfxModalDialog* pDialog, sal_Bool bOne_, ResMgr* pResContext ) : mpDialog( pDialog ), +aFontText ( pDialog, ResId( FT_FONT, *pResContext ) ), +aFontLB ( pDialog, ResId( LB_FONT, *pResContext ) ), +aSubsetText ( pDialog, ResId( FT_SUBSET, *pResContext ) ), +aSubsetLB ( pDialog, ResId( LB_SUBSET, *pResContext ) ), aShowSet( pDialog, ResId( CT_SHOWSET, *pResContext ) ), +aSymbolText ( pDialog, ResId( FT_SYMBOLE, *pResContext ) ), aShowText ( pDialog, ResId( CT_SHOWTEXT, *pResContext ) ), //aShowShortcut ( pDialog, ResId( CT_ASSIGN, *pResContext ) ), aOKBtn ( pDialog, ResId( BTN_CHAR_OK, *pResContext ) ), @@ -265,11 +270,6 @@ SvxCharMapData::SvxCharMapData( SfxModalDialog* pDialog, sal_Bool bOne_, ResMgr* aHelpBtn( pDialog, ResId( BTN_CHAR_HELP, *pResContext ) ), aDeleteBtn ( pDialog, ResId( BTN_DELETE, *pResContext ) ), //aAssignBtn ( pDialog, ResId( BT_ASSIGN, *pResContext ) ), -aFontText ( pDialog, ResId( FT_FONT, *pResContext ) ), -aFontLB ( pDialog, ResId( LB_FONT, *pResContext ) ), -aSubsetText ( pDialog, ResId( FT_SUBSET, *pResContext ) ), -aSubsetLB ( pDialog, ResId( LB_SUBSET, *pResContext ) ), -aSymbolText ( pDialog, ResId( FT_SYMBOLE, *pResContext ) ), aShowChar ( pDialog, ResId( CT_SHOWCHAR, *pResContext ), sal_True ), aCharCodeText ( pDialog, ResId( FT_CHARCODE, *pResContext ) ), //aAssignText ( pDialog, ResId( FT_ASSIGN, *pResContext ) ), ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/ooxmlexport.cxx|3 ++
writerfilter/source/dmapper/DomainMapper.cxx| 25 +---
writerfilter/source/dmapper/StyleSheetTable.cxx | 14 +
writerfilter/source/dmapper/StyleSheetTable.hxx |1
4 files changed, 36 insertions(+), 7 deletions(-)
New commits:
commit 1da6609eb8d3d70bb620d949b1935a5789c2d2ce
Author: Miklos Vajna
Date: Tue Nov 26 11:54:40 2013 +0100
DOCX import: default para style has priority over table styles
Since commit 23b67c536537c91020cf5a45ab5cb36d7316ed89 (DOCX import: fix
import of font size in table styles, 2013-03-04) we simply ignored all
table style run props, that indeed fixed testTableStylerPrSz, but broke
cases when otherwise reasonable run properties were specified in table
styles.
Fix this by only ignoring run props of table styles if the default para
style should have priority.
Change-Id: Ic10f635f4b8688af252214d5d38216b4d5c8fa8e
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 5a3a554..8fa9ded 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -1398,6 +1398,9 @@ DECLARE_OOXMLEXPORT_TEST(testCalendar2, "calendar2.docx")
// Font size in the second row was 11.
xCell.set(xTable->getCellByName("A2"), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(16.f, getProperty(getRun(getParagraphOfText(1,
xCell->getText()), 1), "CharHeight"));
+// Font size in the third row was 11 as well.
+xCell.set(xTable->getCellByName("A3"), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(14.f, getProperty(getRun(getParagraphOfText(1,
xCell->getText()), 1), "CharHeight"));
// This paragraph property was missing in table style.
xmlDocPtr pXmlStyles = parseExport("word/styles.xml");
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 9edb914..da510fd 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -2276,15 +2276,26 @@ void DomainMapper::sprmWithProps( Sprm& rSprm,
PropertyMapPtr rContext, SprmType
{
rContext->Insert( PROP_CHAR_HEIGHT_COMPLEX, aVal );
}
-else if (!m_pImpl->m_bInTableStyleRunProps)
+else
{
-//Asian get the same value as Western
-rContext->Insert( PROP_CHAR_HEIGHT, aVal );
-rContext->Insert( PROP_CHAR_HEIGHT_ASIAN, aVal );
+bool bIgnore = false;
+if (m_pImpl->m_bInTableStyleRunProps)
+{
+// If the default para style contains PROP_CHAR_HEIGHT,
that should have priority over the table style.
+StyleSheetEntryPtr pTable =
m_pImpl->GetStyleSheetTable()->FindDefaultParaStyle();
+if (pTable && pTable->pProperties->find(PROP_CHAR_HEIGHT)
!= pTable->pProperties->end())
+bIgnore = true;
+}
+if (!bIgnore)
+{
+//Asian get the same value as Western
+rContext->Insert( PROP_CHAR_HEIGHT, aVal );
+rContext->Insert( PROP_CHAR_HEIGHT_ASIAN, aVal );
-uno::Reference
xCharStyle(m_pImpl->GetCurrentNumberingCharStyle());
-if (xCharStyle.is())
-
xCharStyle->setPropertyValue(rPropNameSupplier.GetName(PROP_CHAR_HEIGHT), aVal);
+uno::Reference
xCharStyle(m_pImpl->GetCurrentNumberingCharStyle());
+if (xCharStyle.is())
+
xCharStyle->setPropertyValue(rPropNameSupplier.GetName(PROP_CHAR_HEIGHT), aVal);
+}
}
// Make sure char sizes defined in the stylesheets don't affect
char props from direct formatting.
if (!m_pImpl->IsStyleSheetImport())
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx
b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 329cc63..ec78163 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -1293,6 +1293,20 @@ const StyleSheetEntryPtr
StyleSheetTable::FindStyleSheetByConvertedStyleName(con
}
+const StyleSheetEntryPtr StyleSheetTable::FindDefaultParaStyle()
+{
+StyleSheetEntryPtr pRet;
+for (size_t i = 0; i < m_pImpl->m_aStyleSheetEntries.size(); ++i)
+{
+StyleSheetEntryPtr pEntry = m_pImpl->m_aStyleSheetEntries[i];
+if (pEntry->bIsDefaultStyle && pEntry->nStyleTypeCode ==
STYLE_TYPE_PARA)
+{
+pRet = pEntry;
+break;
+}
+}
+return pRet;
+}
const StyleSheetEntryPtr StyleSheetTable::FindParentStyleSheet(OUString
sBaseStyle)
{
diff --git a/writerfilter/source/dmapper/StyleSheetTable.hxx
b/writerfilter/source/dmapper/StyleSheetTab
[Libreoffice-commits] core.git: formula/source
formula/source/ui/dlg/ControlHelper.hxx |1 +
formula/source/ui/dlg/formdlgs.src |3 ++-
formula/source/ui/dlg/funcutl.cxx | 16
formula/source/ui/dlg/parawin.cxx |4
4 files changed, 23 insertions(+), 1 deletion(-)
New commits:
commit 2f973aa90d508cd88050b0273634482de2174a08
Author: Steve Yin
Date: Tue Nov 26 12:06:30 2013 +
Integrate branch of IAccessible2
Change-Id: Id8c4ff1d10eccda2d7279d625822759c1f520a46
diff --git a/formula/source/ui/dlg/ControlHelper.hxx
b/formula/source/ui/dlg/ControlHelper.hxx
index c2d6c8a..86f4f1d 100644
--- a/formula/source/ui/dlg/ControlHelper.hxx
+++ b/formula/source/ui/dlg/ControlHelper.hxx
@@ -176,6 +176,7 @@ public:
void Hide();
void Show();
+void UpdateAccessibleNames();
};
}
diff --git a/formula/source/ui/dlg/formdlgs.src
b/formula/source/ui/dlg/formdlgs.src
index 3095b82..83ef11b 100644
--- a/formula/source/ui/dlg/formdlgs.src
+++ b/formula/source/ui/dlg/formdlgs.src
@@ -189,11 +189,12 @@ ModalDialog RID_FORMULADLG_FORMULA_MODAL
Right = TRUE ;
Text [ en-US ] = "Function result" ;
};
-Window WND_RESULT
+FixedText WND_RESULT
{
Border = TRUE ;
Pos = MAP_APPFONT ( 255 , 4 ) ;
Size = MAP_APPFONT ( 60 , 12 ) ;
+Text [ en-US ] = "Function result" ;
};
FixedText FT_FORMULA_RESULT
{
diff --git a/formula/source/ui/dlg/funcutl.cxx
b/formula/source/ui/dlg/funcutl.cxx
index 890ac41..9b7be4c 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -26,6 +26,7 @@
#include "ControlHelper.hxx"
#include "ModuleHelper.hxx"
#include "ForResId.hrc"
+#include "com/sun/star/accessibility/AccessibleRole.hpp"
namespace formula
@@ -61,6 +62,7 @@ ValWnd::ValWnd( Window* pParent, const ResId& rId ) : Window(
pParent, rId )
aRectOut = Rectangle( Point( 1, ( nDiff<2 ) ? 1 : nDiff/2),
Size ( aSzWnd.Width()-2, nHeight ) );
SetClipRegion( Region( aRectOut ) );
+SetAccessibleRole( ::com::sun::star::accessibility::AccessibleRole::LABEL
);
}
//
@@ -421,6 +423,20 @@ void ArgInput::Show()
}
}
+void ArgInput::UpdateAccessibleNames()
+{
+OUString aArgName(":");
+aArgName += pFtArg->GetText();
+
+OUString aName = pBtnFx->GetQuickHelpText();
+aName += aArgName;
+pBtnFx->SetAccessibleName(aName);
+
+aName = pRefBtn->GetQuickHelpText();
+aName += aArgName;
+pRefBtn->SetAccessibleName(aName);
+}
+
/*
#* Member: FxClick Date:13.01.97
#*
diff --git a/formula/source/ui/dlg/parawin.cxx
b/formula/source/ui/dlg/parawin.cxx
index c209c37..24a22c2 100644
--- a/formula/source/ui/dlg/parawin.cxx
+++ b/formula/source/ui/dlg/parawin.cxx
@@ -353,6 +353,7 @@ void ParaWin::SetEditDesc(const OUString& aText)
void ParaWin::SetArgName(sal_uInt16 no,const OUString& aText)
{
aArgInput[no].SetArgName(aText);
+aArgInput[no].UpdateAccessibleNames();
}
void ParaWin::SetArgNameFont(sal_uInt16 no,const Font& aFont)
@@ -398,6 +399,7 @@ void ParaWin::InitArgInput( sal_uInt16 nPos, FixedText&
rFtArg, ImageButton& rBt
aArgInput[nPos].SetFxFocusHdl ( LINK( this, ParaWin, GetFxFocusHdl ) );
aArgInput[nPos].SetEdFocusHdl ( LINK( this, ParaWin, GetEdFocusHdl ) );
aArgInput[nPos].SetEdModifyHdl ( LINK( this, ParaWin, ModifyHdl ) );
+aArgInput[nPos].UpdateAccessibleNames();
}
void ParaWin::ClearAll()
@@ -494,6 +496,7 @@ void ParaWin::SliderMoved()
aArgInput[nEdFocus].SetArgSelection(Selection(0,SELECTION_MAX ));
nActiveLine=nEdFocus+nOffset;
ArgumentModified();
+aArgInput[nEdFocus].UpdateAccessibleNames();
}
aScrollLink.Call(this);
}
@@ -574,6 +577,7 @@ IMPL_LINK( ParaWin, GetEdFocusHdl, ArgInput*, pPtr )
UpdateArgDesc( nEdFocus );
nActiveLine=nEdFocus+nOffset;
ArgumentModified();
+aArgInput[nEdFocus].UpdateAccessibleNames();
}
return 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - ff/b3bedc183791815eca699ef247f7109b9ffc21
ff/b3bedc183791815eca699ef247f7109b9ffc21 |1 + 1 file changed, 1 insertion(+) New commits: commit 80eb78d11fdc83e79398726a7e1b7d9810786b9c Author: Caolán McNamara Date: Tue Nov 26 12:09:24 2013 + Notes added by 'git notes add' diff --git a/ff/b3bedc183791815eca699ef247f7109b9ffc21 b/ff/b3bedc183791815eca699ef247f7109b9ffc21 new file mode 100644 index 000..8ebbe55 --- /dev/null +++ b/ff/b3bedc183791815eca699ef247f7109b9ffc21 @@ -0,0 +1 @@ +ignore: obsolete ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/ui/dbui/mailmergechildwindow.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit eda8111fdf9b1c69935237106a73d1c53c2776e1
Author: Rodolfo Ribeiro Gomes
Date: Mon Nov 25 23:34:09 2013 -0200
Mailmerge shows wrong number of emails to be sent
The progress bar is ok, but the text is displayed with the total
number of registers instead of the amount selected to be used.
Change-Id: I81da0e7ba9f193366e12cbf81118e36a43bcaad4
Signed-off-by: Rodolfo Ribeiro Gomes
Reviewed-on: https://gerrit.libreoffice.org/6810
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/source/ui/dbui/mailmergechildwindow.cxx
b/sw/source/ui/dbui/mailmergechildwindow.cxx
index 682ab22..c1dc07a 100644
--- a/sw/source/ui/dbui/mailmergechildwindow.cxx
+++ b/sw/source/ui/dbui/mailmergechildwindow.cxx
@@ -648,7 +648,7 @@ void SwSendMailDialog::UpdateTransferStatus()
{
OUString sStatus( m_sTransferStatus );
sStatus = sStatus.replaceFirst("%1", OUString::number(m_nSendCount) );
-sStatus = sStatus.replaceFirst("%2",
OUString::number(m_pImpl->nDocumentCount));
+sStatus = sStatus.replaceFirst("%2",
OUString::number(m_pImpl->aDescriptors.size()));
m_aTransferStatusFT.SetText(sStatus);
sStatus = m_sErrorStatus.replaceFirst("%1",
OUString::number(m_nErrorCount) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/source
sw/source/ui/dbui/mailmergechildwindow.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit aa3297af50b9a197428565bb927cf566a9198435
Author: Rodolfo Ribeiro Gomes
Date: Mon Nov 25 23:34:09 2013 -0200
Mailmerge shows wrong number of emails to be sent
The progress bar is ok, but the text is displayed with the total
number of registers instead of the amount selected to be used.
Change-Id: I81da0e7ba9f193366e12cbf81118e36a43bcaad4
Signed-off-by: Rodolfo Ribeiro Gomes
Reviewed-on: https://gerrit.libreoffice.org/6810
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
(cherry picked from commit eda8111fdf9b1c69935237106a73d1c53c2776e1)
diff --git a/sw/source/ui/dbui/mailmergechildwindow.cxx
b/sw/source/ui/dbui/mailmergechildwindow.cxx
index 682ab22..c1dc07a 100644
--- a/sw/source/ui/dbui/mailmergechildwindow.cxx
+++ b/sw/source/ui/dbui/mailmergechildwindow.cxx
@@ -648,7 +648,7 @@ void SwSendMailDialog::UpdateTransferStatus()
{
OUString sStatus( m_sTransferStatus );
sStatus = sStatus.replaceFirst("%1", OUString::number(m_nSendCount) );
-sStatus = sStatus.replaceFirst("%2",
OUString::number(m_pImpl->nDocumentCount));
+sStatus = sStatus.replaceFirst("%2",
OUString::number(m_pImpl->aDescriptors.size()));
m_aTransferStatusFT.SetText(sStatus);
sStatus = m_sErrorStatus.replaceFirst("%1",
OUString::number(m_nErrorCount) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - scp2/macros scp2/source
scp2/macros/macro.pl | 37 -
scp2/source/ooo/directory_ooo.scp |5 +
scp2/source/ooo/file_ooo.scp |7 +--
3 files changed, 38 insertions(+), 11 deletions(-)
New commits:
commit d43126696d87fb74ac33b0e54987ebfa7186da39
Author: Tor Lillqvist
Date: Thu Aug 8 23:10:16 2013 +0300
fdo#62442: Move the InfoPlist.strings files into the app from langpacks
The digital signature of an app bundle includes an integrity check for
the Resources subtree. This is the normal place for Mac apps to have
their read-only non-code "resources". In LibreOffice it is currently
not much used, though.
The signature thus breaks when a lang pack installer is run and plops
its InfoPlist.strings file into the "Resources" subtree. This file
contains translations of strings in the app's Info.plist file. For
LibreOffice, it contains translations only for some of the file type
names in Info.plist. (Why only some, I don't know.)
Files installed by a lang pack insaller into other locations in the
app bundle don't harm the signature.
Making the InfoPlist.strings files be distributed as part of the main
app bundle instead of in langpacks should keep the signature valid
even if a lang pack is installed. The InfoPlist.strings files are
small so the size of the main app should not grow significantly.
This required introduction of a new functionality in scp2: The
possibility to generate a list of several complete File or Directory
stanzas, one for each language for which translations are being
built.
(This is different from the existing functionality, used for files
that go into lang packs, where a stanza contains several Name or
HostName attributes (or whatever the term is) where the attribute
names are qualified with the language code in parens.)
Change-Id: I3afd9b08944fe1bccb5f0c881d740d260f589e39
Reviewed-on: https://gerrit.libreoffice.org/6251
Reviewed-by: Tor Lillqvist
Tested-by: Tor Lillqvist
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/scp2/macros/macro.pl b/scp2/macros/macro.pl
index e86623c..3ebeabe 100644
--- a/scp2/macros/macro.pl
+++ b/scp2/macros/macro.pl
@@ -21,6 +21,7 @@ my $destfile;
my $config_stamp;
my $lastcompletelangiso_var;
my $completelangiso_var = $ENV{COMPLETELANGISO_VAR};
+my $help_langs_var = $ENV{HELP_LANGS};
if ( !defined $completelangiso_var) {
print STDERR "ERROR: No language defined!\n";
@@ -33,13 +34,15 @@ if (!args_require_build()) {
}
my @completelangiso = split " +", $completelangiso_var;
-my @helplangs = split " +", $ENV{HELP_LANGS};
+my @helplangs = split " +", $help_langs_var;
open OUTFILE, ">$outfile" or die "$0 ERROR: cannot open $outfile for
writing!\n";
print OUTFILE "// generated file, do not edit\n\n";
print OUTFILE "// languages used for last time generation\n";
print OUTFILE "// completelangiso: $completelangiso_var\n\n";
+print OUTFILE "// help_langs: $help_langs_var\n\n";
+write_ITERATE_ALL_LANG();
write_ALL_LANG();
write_OTHER_LANGS();
write_DIR_ISOLANGUAGE_ALL_LANG_2();
@@ -57,6 +60,38 @@ close OUTFILE;
rename $outfile, $destfile;
+sub write_ITERATE_ALL_LANG
+{
+print OUTFILE "#define ITERATE_ALL_LANG_FILE(gid,dir,macro,name,ext) ";
+foreach $lang (@helplangs) {
+my $shortlang = $lang;
+$shortlang = "en" if $shortlang eq "en-US";
+my $speciallang = $lang;
+$speciallang =~ s/-/_/;
+print OUTFILE "\\\nFile CONCAT3(gid_File_,gid,_$speciallang)";
+print OUTFILE "\\\n\tDir = CONCAT3(gid_Dir_,dir,_$speciallang);";
+print OUTFILE "\\\n\tmacro;";
+print OUTFILE "\\\n\tName = STRING(CONCAT3(name,_$lang,ext)); ";
+print OUTFILE "\\\nEnd ";
+print OUTFILE "\\\n";
+}
+print OUTFILE "\n\n";
+
+print OUTFILE "#define ITERATE_ALL_LANG_DIR_LPROJ(gid,parent) ";
+foreach $lang (@helplangs) {
+my $shortlang = $lang;
+$shortlang = "en" if $shortlang eq "en-US";
+my $speciallang = $lang;
+$speciallang =~ s/-/_/;
+print OUTFILE "\\\nDirectory CONCAT3(gid_Dir_,gid,_$speciallang)";
+print OUTFILE "\\\n\tParentID = CONCAT2(gid_Dir_,parent);";
+print OUTFILE "\\\n\tDosName = \"$shortlang.lproj\"; ";
+print OUTFILE "\\\nEnd ";
+print OUTFILE "\\\n";
+}
+print OUTFILE "\n\n";
+}
+
sub write_ALL_LANG
{
print OUTFILE "#define ALL_LANG(ident, resid) ";
diff --git a/scp2/source/ooo/directory_ooo.scp
b/scp2/source/ooo/directory_ooo.scp
index 6037330..2647561 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -26,10 +26,7 @@ End
#endif
#ifdef MACOSX
-Directory gid_Dir_Bundle_Contents_Resources_Lang
-ParentID = gid_Dir_Bundle_Contents_Resources;
-DIR_ISOLANGUAGE_ALL_LANG_LPROJ;
-End
+ITERATE_ALL_LANG_DIR_LPROJ(Bu
[Libreoffice-commits] core.git: oox/source
oox/source/ppt/pptgraphicshapecontext.cxx | 23 ---
1 file changed, 20 insertions(+), 3 deletions(-)
New commits:
commit bb1213a740b3b3b2b1967639939dd7a72c6d4237
Author: Korrawit Pruegsanusak
Date: Tue Nov 26 18:34:32 2013 +0700
fdo#71434: don't show master text if PlaceHolder types defined
I've added all of valid PlaceHolder types from
http://www.schemacentral.com/sc/ooxml/t-p_ST_PlaceholderType.html
Change-Id: I038fe43ff83699f92ff5eb9945bce12540058478
Reviewed-on: https://gerrit.libreoffice.org/6814
Reviewed-by: Muthu Subramanian K
Tested-by: Muthu Subramanian K
diff --git a/oox/source/ppt/pptgraphicshapecontext.cxx
b/oox/source/ppt/pptgraphicshapecontext.cxx
index 99c7328..730ce23 100644
--- a/oox/source/ppt/pptgraphicshapecontext.cxx
+++ b/oox/source/ppt/pptgraphicshapecontext.cxx
@@ -147,9 +147,26 @@ ContextHandlerRef PPTGraphicShapeContext::onCreateContext(
sal_Int32 aElementTok
if ( pPlaceholder.get() )
{
bool bUseText = true;
-// TODO: Check if pPlaceholder->getSubType is none (i.e.
none explicitly specified)
-if( pPlaceholder->getSubType() == XML_obj )
-bUseText = false;
+switch( pPlaceholder->getSubType() )
+{
+case XML_title :
+case XML_body :
+case XML_ctrTitle :
+case XML_subTitle :
+case XML_dt :
+case XML_sldNum :
+case XML_ftr :
+case XML_hdr :
+case XML_obj :
+case XML_chart :
+case XML_tbl :
+case XML_clipArt :
+case XML_dgm :
+case XML_media :
+case XML_sldImg :
+case XML_pic :
+bUseText = false;
+}
mpShapePtr->applyShapeReference( *pPlaceholder.get(),
bUseText );
PPTShape* pPPTShape = dynamic_cast< PPTShape* >(
pPlaceholder.get() );
if ( pPPTShape )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - include/com sal/osl
include/com/sun/star/uno/Any.hxx |2 +-
sal/osl/unx/file.cxx |7 ---
2 files changed, 1 insertion(+), 8 deletions(-)
New commits:
commit fc708d6286e184d7f1b63e4a334d5aa1c7959516
Author: Stephan Bergmann
Date: Tue Nov 26 13:43:35 2013 +0100
No need for additional << overload here
...non-explicit OString(rtl_String*) ctor already covers that
Change-Id: I9e447795ddc585d765b48d1f7f41f3c795aecba2
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index 801bca5..28bea88 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -54,13 +54,6 @@
#include
#endif
-template< typename charT, typename traits > std::basic_ostream &
-operator <<(
-std::basic_ostream & stream, rtl_String * string)
-{
-return stream << rtl_string_getStr(string);
-}
-
/***
*
* FileHandle_Impl interface
commit 6da3bd044fb707f08f01719a80fc648c68c9a535
Author: Stephan Bergmann
Date: Tue Nov 26 13:42:48 2013 +0100
const fix
Change-Id: I9abd4fa85d3d5718dffc0f03e3cc662a17a78ac8
diff --git a/include/com/sun/star/uno/Any.hxx b/include/com/sun/star/uno/Any.hxx
index e86322f..986b045 100644
--- a/include/com/sun/star/uno/Any.hxx
+++ b/include/com/sun/star/uno/Any.hxx
@@ -598,7 +598,7 @@ sal_uInt16 Any::get() const;
@since LibreOffice 4.2
*/
template
-inline std::basic_ostream &operator<<(std::basic_ostream &o, Any &any) {
+inline std::basic_ostream &operator<<(std::basic_ostream &o, Any const &any) {
o << "eTypeClass) {
case typelib_TypeClass_VOID:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Vendors Name via UNO API / Basic Macros
On Thu, Nov 21, 2013 at 08:34:04PM +0100, Jan Holesovsky wrote: > Thomas Krumbein píše v Pá 15. 11. 2013 v 15:43 +0100: Well, this change was a small technical thing - but with a very big influence on typical market applications. Every custom macro application with dialogs or forms for user interfaces is influenced if dialogs/forms using Date/time fields. >>> Have you filed a bugreport, please? A minimal example of the macro that >>> fails would be most appreciated. >> Well - it´s not a bug, because you mentioned the change in release-notes >> of version 4.1. > There are many ways how to make the problem less annoying in Basic > ;-) - we control the Basic implementation, so can work around many > things, and if we are lucky, this will be one of them. I am sure > we'd try to do that before the release with the incompatible change > if we knew early. Well, I considered doing some "magic" that when the property is written, if it gets an integer, interpret it the old way and if it gets a UNO Date struct, interpret it the obvious (new) way. Someone (Stephan Bergmann?) told me that one could do that for attributes but not (pseudo?)properties (or something like that); the Basic implementation (bridge?) would refuse to even pass a value of the wrong type to the C++ code. I don't see how to achieve it short of special-casing this into the bridge / other parts of the Basic implementation. Which sounds like a guaranteed subscription for maintenance nightmares, and thus not the best of ideas. Would the Basic implementation / UNO bridge people be willing to actually have that kind of special-casing? >> What´s happend, you can read my article on my homepage. It is in german >> language but I am sure, you get the context ;) >> http://www.mic-consulting.de/index.php/opersource/api-makros-libo-aoo/10-datumsfelder-geaendert-in-lo-4-1-1 > I am sorry, cannot get the context :-( Can you please turn it into a > minimal example of what used to work, and send it here? Or even better, > file the bugreport, and send here the link? Another user already did that: https://bugs.freedesktop.org/68751 It already led to concrete mitigation steps (in the form of utility functions to convert between the Basic native date type and UNO Date, Time and DateTime) in 4.1.3 (correctly documented in 4.1.4). If anybody has concrete actionable ideas on how to sweeten the bitter pill (short of "rollback the change"), we sure can consider it. -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: filter/source include/filter include/tools sw/source tools/Library_tl.mk tools/source writerfilter/source
filter/source/msfilter/util.cxx| 44 ---
include/filter/msfilter/util.hxx |1
include/tools/datetimeutils.hxx| 20
sw/source/filter/ww8/docxattributeoutput.cxx |7 +--
tools/Library_tl.mk|1
tools/source/datetime/datetimeutils.cxx| 56 +
writerfilter/source/rtftok/rtfdocumentimpl.cxx |3 -
7 files changed, 83 insertions(+), 49 deletions(-)
New commits:
commit 8d7cb7773dafda969c22bb9cca658bf1c677798d
Author: Adam Co
Date: Tue Nov 26 13:56:46 2013 +0200
Moved 'DateTimeToOString' from 'filter' package to 'tools' package
After the move now other classes can convert DateTime to OString also
Reviewed on:
https://gerrit.libreoffice.org/6816
Change-Id: I0ceb9a5cc26103a6cb36d7765a717770ec3fbe7d
diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx
index 828d5de..0bd7cbe 100644
--- a/filter/source/msfilter/util.cxx
+++ b/filter/source/msfilter/util.cxx
@@ -79,50 +79,6 @@ DateTime DTTM2DateTime( long lDTTM )
return aDateTime;
}
-/// Append the number as 2-digit when less than 10.
-static void lcl_AppendTwoDigits( OStringBuffer &rBuffer, sal_Int32 nNum )
-{
-if ( nNum < 0 || nNum > 99 )
-{
-rBuffer.append( "00" );
-return;
-}
-
-if ( nNum < 10 )
-rBuffer.append( '0' );
-
-rBuffer.append( nNum );
-}
-
-OString DateTimeToOString( const DateTime& rDateTime )
-{
-DateTime aInUTC( rDateTime );
-// HACK: this is correct according to the spec, but MSOffice believes
everybody lives
-// in UTC+0 when reading it back
-//aInUTC.ConvertToUTC();
-
-OStringBuffer aBuffer( 25 );
-aBuffer.append( sal_Int32( aInUTC.GetYear() ) );
-aBuffer.append( '-' );
-
-lcl_AppendTwoDigits( aBuffer, aInUTC.GetMonth() );
-aBuffer.append( '-' );
-
-lcl_AppendTwoDigits( aBuffer, aInUTC.GetDay() );
-aBuffer.append( 'T' );
-
-lcl_AppendTwoDigits( aBuffer, aInUTC.GetHour() );
-aBuffer.append( ':' );
-
-lcl_AppendTwoDigits( aBuffer, aInUTC.GetMin() );
-aBuffer.append( ':' );
-
-lcl_AppendTwoDigits( aBuffer, aInUTC.GetSec() );
-aBuffer.append( 'Z' ); // we are in UTC
-
-return aBuffer.makeStringAndClear();
-}
-
sal_Unicode bestFitOpenSymbolToMSFont(sal_Unicode cChar,
rtl_TextEncoding& rChrSet, OUString& rFontName, bool
bDisableUnicodeSupport)
{
diff --git a/include/filter/msfilter/util.hxx b/include/filter/msfilter/util.hxx
index d9ab87e..f857bf5 100644
--- a/include/filter/msfilter/util.hxx
+++ b/include/filter/msfilter/util.hxx
@@ -40,7 +40,6 @@ MSFILTER_DLLPUBLIC DateTime DTTM2DateTime( long lDTTM );
I guess there must be an implementation of this somewhere in LO, but I failed
to find it, unfortunately :-(
*/
-MSFILTER_DLLPUBLIC OString DateTimeToOString( const DateTime& rDateTime );
/// Given a cBullet in encoding r_ioChrSet and fontname r_ioFontName return a
/// suitable new Bullet and change r_ioChrSet and r_ioFontName to form the
diff --git a/include/tools/datetimeutils.hxx b/include/tools/datetimeutils.hxx
new file mode 100644
index 000..840403b
--- /dev/null
+++ b/include/tools/datetimeutils.hxx
@@ -0,0 +1,20 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_TOOLS_DATETIMEUTILS_HXX
+#define INCLUDED_TOOLS_DATETIMEUTILS_HXX
+
+#include
+
+// This function converts a 'DateTime' object to an 'OString' object
+TOOLS_DLLPUBLIC OString DateTimeToOString( const DateTime& rDateTime );
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 5780aff..2a8205c 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -80,6 +80,7 @@
#include
#include
#include
+#include
#include
#include
@@ -1461,7 +1462,7 @@ void DocxAttributeOutput::Redline( const SwRedlineData*
pRedline)
OString aId( OString::number( pRedline->GetSeqNo() ) );
const OUString &rAuthor( SW_MOD()->GetRedlineAuthor( pRedline->GetAuthor()
) );
OString aAuthor( OUStringToOString( rAuthor, RTL_TEXTENCODING_UTF8 ) );
-OString aDate( msfilter::util::DateTimeToOString( pRedline->GetTimeStamp()
) );
+OString aDate( DateTimeToOString( pRedline->GetTimeStamp() ) );
OUString sVal;
OString sOVal;
@@ -1522,7 +1523,7 @@ void DocxAttributeOutput::StartRedline()
const OUString &rAuthor( SW_MOD()->GetRedlineAuthor(
pRedlineData->GetAuthor() ) );
OString aAuthor( OUStringToOString( rAuthor, RTL_TEXTENCODING
[Libreoffice-commits] core.git: unoidl/source
unoidl/source/sourceprovider-parser.y |1 - 1 file changed, 1 deletion(-) New commits: commit 3950919134457204885eb988f17731d3cf9e1ba4 Author: Stephan Bergmann Date: Tue Nov 26 14:08:07 2013 +0100 Remove outdated TODO (@deprecated annotation are handled fine) Change-Id: Iab32e6974a181e437630aaae2ea73eb6062ec0ee diff --git a/unoidl/source/sourceprovider-parser.y b/unoidl/source/sourceprovider-parser.y index 8e6c0c4..2bcbcdd 100644 --- a/unoidl/source/sourceprovider-parser.y +++ b/unoidl/source/sourceprovider-parser.y @@ -7,7 +7,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -/*TODO: @deprecated annotations */ /*TODO: check Exception, RuntimeException, XInterface defns */ %locations ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: accessibility/source
accessibility/source/extended/accessiblelistbox.cxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit 378963fdb2506c335befbc22e90ba2b09415ce8e
Author: Tor Lillqvist
Date: Tue Nov 26 14:46:13 2013 +0200
WaE: unreachable code
Change-Id: I21cce258c0cc978bd8a45148102787d3c4017e64
diff --git a/accessibility/source/extended/accessiblelistbox.cxx
b/accessibility/source/extended/accessiblelistbox.cxx
index 2ebeb9d..9363646 100644
--- a/accessibility/source/extended/accessiblelistbox.cxx
+++ b/accessibility/source/extended/accessiblelistbox.cxx
@@ -270,7 +270,6 @@ namespace accessibility
{
return pEntryFocus;
}
-return NULL;
}
void AccessibleListBox::RemoveChildEntries(SvTreeListEntry* pEntry)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/docary.hxx |2
sw/source/core/docnode/nodedump.cxx | 131
2 files changed, 133 insertions(+)
New commits:
commit bbcce6e10cf9e46b0a8521e50d3dd69ea44481a0
Author: Adam Co
Date: Tue Nov 26 14:10:36 2013 +0200
Added dump of 'redline' objects in 'node dump' XML
Change-Id: I531a04fd4747a4b10858f6317b7c08cceb6458eb
Reviewed-on: https://gerrit.libreoffice.org/6817
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx
index 4525763..8927cde 100644
--- a/sw/inc/docary.hxx
+++ b/sw/inc/docary.hxx
@@ -165,6 +165,8 @@ public:
void DeleteAndDestroy( sal_uInt16 nPos, sal_uInt16 nLen = 1 );
void DeleteAndDestroyAll();
+void dumpAsXml(xmlTextWriterPtr w);
+
/** Search next or previous Redline with the same Seq. No.
Search can be restricted via Lookahaed.
Using 0 or USHRT_MAX makes search the whole array. */
diff --git a/sw/source/core/docnode/nodedump.cxx
b/sw/source/core/docnode/nodedump.cxx
index da8f4b2..5728554 100644
--- a/sw/source/core/docnode/nodedump.cxx
+++ b/sw/source/core/docnode/nodedump.cxx
@@ -18,12 +18,16 @@
#include "fmtautofmt.hxx"
#include "charfmt.hxx"
#include "paratr.hxx"
+#include "redline.hxx"
+#include
#include
#include
+#include
#include
#include
#include
+#include
namespace
{
@@ -112,6 +116,7 @@ void SwDoc::dumpAsXml( xmlTextWriterPtr w )
mpTxtFmtCollTbl->dumpAsXml( writer );
mpCharFmtTbl->dumpAsXml( writer );
mpNumRuleTbl->dumpAsXml( writer );
+mpRedlineTbl->dumpAsXml( writer );
writer.endElement();
}
@@ -428,4 +433,130 @@ void SwTxtNode::dumpAsXml( xmlTextWriterPtr w )
writer.endElement();
}
+void SwRedlineTbl::dumpAsXml( xmlTextWriterPtr w )
+{
+WriterHelper writer( w );
+
+writer.startElement( "swredlinetbl" );
+writer.writeFormatAttribute( "ptr", "%p", this );
+
+for( sal_uInt16 nCurRedlinePos = 0; nCurRedlinePos < size();
++nCurRedlinePos )
+{
+const SwRedlineTbl& redlineTbl = (*this);
+const SwRedline* pRedline = redlineTbl[ nCurRedlinePos ];
+
+writer.startElement( "swredline" );
+writer.writeFormatAttribute( "ptr", "%p", pRedline );
+
+OString aId( OString::number( pRedline->GetSeqNo() ) );
+const OUString &rAuthor( SW_MOD()->GetRedlineAuthor(
pRedline->GetAuthor() ) );
+OString aAuthor( OUStringToOString( rAuthor, RTL_TEXTENCODING_UTF8 ) );
+OString aDate( DateTimeToOString( pRedline->GetTimeStamp() ) );
+OString sRedlineType;
+switch( pRedline->GetType() )
+{
+case nsRedlineType_t::REDLINE_INSERT:
+sRedlineType = "REDLINE_INSERT";
+break;
+case nsRedlineType_t::REDLINE_DELETE:
+sRedlineType = "REDLINE_DELETE";
+break;
+case nsRedlineType_t::REDLINE_FORMAT:
+sRedlineType = "REDLINE_FORMAT";
+break;
+default:
+sRedlineType = "UNKNOWN";
+break;
+};
+writer.writeFormatAttribute( "id", "%s", BAD_CAST(aId.getStr()) );
+writer.writeFormatAttribute( "author", "%s",
BAD_CAST(aAuthor.getStr()) );
+writer.writeFormatAttribute( "date", "%s", BAD_CAST(aDate.getStr()) );
+writer.writeFormatAttribute( "type", "%s",
BAD_CAST(sRedlineType.getStr()) );
+{
+const SwPosition* pStart = pRedline->Start();
+
+writer.startElement( "start_swposition" );
+//writer.writeFormatAttribute( "ptr", "%p", pStart );
+{
+const SwNodeIndex pStartNodeIndex = pStart->nNode;
+//writer.startElement( "swnodeindex" );
+//writer.writeFormatAttribute( "ptr", "%p", &pStartNodeIndex );
+{
+const SwNode& pStartSwNode =
pStartNodeIndex.GetNode();
+//writer.startElement( "swnode" );
+//writer.writeFormatAttribute( "ptr", "%p", &pStartSwNode
);
+//writer.writeFormatAttribute( "type", "%d",
pStartSwNode.GetNodeType() );
+//writer.endElement( );// swnode
+writer.writeFormatAttribute( "swnode_type", "%d",
pStartSwNode.GetNodeType() );
+
+const SwIndex&pStartContent = pStart->nContent;
+//writer.startElement( "swindex" );
+//writer.writeFormatAttribute( "ptr", "%p", &pStartContent
);
+//writer.writeFormatAttribute( "content_index", "%d",
pStartContent.GetIndex() );
+//writer.endElement( );// swindex
+writer.writeFormatAttribute( "swindex_content_index",
"%d", pStartContent.GetIndex() );
+}
+//writer.endElement( );// swnodeindex
+}
+wri
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/ucalc.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit aaf5658a2f0e1a371dc5257feeda7f3c4e304651
Author: Tor Lillqvist
Date: Tue Nov 26 14:48:52 2013 +0200
We never ever want anything OpenCL-related in the sc_ucalc unit test
So unset any SC_BACKGROUND_COMPILATION environment variable to avoid that
mixing up things when running this test. (It doesn't in a "clean" build, but
in a build where you temporarily have made the SC_BACKGROUND_COMPILATION
thing
actually work in the sc_opencl_test unit test (by bypassing the weird "Is
OpenCL enabled? Yes! No! Yes!" dance there), it does.)
Loading the scopencl library will load also the sc library, which causes
lots
of confusion, as this unit test library itself includes all the object files
from the sc library. (For IMHO questionable micro-optimisation reasons.)
Another day wasted thanks to not understanding what undoubtedly are clever
and
elegant tricks.
Change-Id: I203b6dae7d9b52787ac2d57180be87a61626af6c
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 97a8d70..84633bc 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -138,6 +138,8 @@ ScDocShell& Test::getDocShell()
void Test::setUp()
{
+osl_clearEnvironment(OUString("SC_BACKGROUND_COMPILATION").pData);
+
BootstrapFixture::setUp();
ScDLL::Init();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: accessibility/source
accessibility/source/extended/accessiblelistboxentry.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit cbb8e6d1b6bfe06c9d1439523533b5197d4eb06a Author: Stephan Bergmann Date: Tue Nov 26 14:34:33 2013 +0100 -Werror,-Wunused-variable Change-Id: I4a501430d6ea8fdf6d2ae748fd3e122846c0b4cd diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx index 851158f..39f5d05 100644 --- a/accessibility/source/extended/accessiblelistboxentry.cxx +++ b/accessibility/source/extended/accessiblelistboxentry.cxx @@ -825,7 +825,6 @@ namespace accessibility checkActionIndex_Impl( nIndex ); EnsureIsAlive(); -static const OUString sActionDesc( "toggleExpand" ); static const OUString sActionDesc1( "Check" ); static const OUString sActionDesc2( "UnCheck" ); // sal_Bool bHasButtons = (getListBox()->GetStyle() & WB_HASBUTTONS)!=0; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Vendors Name via UNO API / Basic Macros
On 26/11/2013 13:56, Lionel Elie Mamane wrote: On Thu, Nov 21, 2013 at 08:34:04PM +0100, Jan Holesovsky wrote: Thomas Krumbein píše v Pá 15. 11. 2013 v 15:43 +0100: Well, this change was a small technical thing - but with a very big influence on typical market applications. Every custom macro application with dialogs or forms for user interfaces is influenced if dialogs/forms using Date/time fields. Have you filed a bugreport, please? A minimal example of the macro that fails would be most appreciated. Well - it´s not a bug, because you mentioned the change in release-notes of version 4.1. There are many ways how to make the problem less annoying in Basic ;-) - we control the Basic implementation, so can work around many things, and if we are lucky, this will be one of them. I am sure we'd try to do that before the release with the incompatible change if we knew early. Well, I considered doing some "magic" that when the property is written, if it gets an integer, interpret it the old way and if it gets a UNO Date struct, interpret it the obvious (new) way. Someone (Stephan Bergmann?) told me that one could do that for attributes but not (pseudo?)properties (or something like that); the Basic implementation (bridge?) would refuse to even pass a value of the wrong type to the C++ code. I don't see how to achieve it short of special-casing this into the bridge / other parts of the Basic implementation. Which sounds like a guaranteed subscription for maintenance nightmares, and thus not the best of ideas. Would the Basic implementation / UNO bridge people be willing to actually have that kind of special-casing? What´s happend, you can read my article on my homepage. It is in german language but I am sure, you get the context ;) http://www.mic-consulting.de/index.php/opersource/api-makros-libo-aoo/10-datumsfelder-geaendert-in-lo-4-1-1 I am sorry, cannot get the context :-( Can you please turn it into a minimal example of what used to work, and send it here? Or even better, file the bugreport, and send here the link? Another user already did that: https://bugs.freedesktop.org/68751 It already led to concrete mitigation steps (in the form of utility functions to convert between the Basic native date type and UNO Date, Time and DateTime) in 4.1.3 (correctly documented in 4.1.4). If anybody has concrete actionable ideas on how to sweeten the bitter pill (short of "rollback the change"), we sure can consider it. why not a extra property , "date" = isodate as it was (all old code can run it) "cdate" = new way Greetz Fernand ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: accessibility/source
accessibility/source/standard/vclxaccessiblebox.cxx |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 383c7a4b904d31e41a36f4b17ed141db2276afc3 Author: Stephan Bergmann Date: Tue Nov 26 14:41:27 2013 +0100 statement aligned as second statement in if body but not in a statement block Change-Id: I237148ec56164994e5c3168ef5b7dfc56588cad9 diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx b/accessibility/source/standard/vclxaccessiblebox.cxx index 2f40002..7aa7836 100644 --- a/accessibility/source/standard/vclxaccessiblebox.cxx +++ b/accessibility/source/standard/vclxaccessiblebox.cxx @@ -188,10 +188,10 @@ void VCLXAccessibleBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEven if (m_bIsDropDownBox || ( !m_bIsDropDownBox && m_aBoxType==COMBOBOX)) NotifyAccessibleEvent(AccessibleEventId::VALUE_CHANGED, Any(), Any()); -Any aOldValue; -Any aNewValue; -aOldValue <<= AccessibleStateType::INDETERMINATE; - NotifyAccessibleEvent(AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue); +Any aOldValue; +Any aNewValue; +aOldValue <<= AccessibleStateType::INDETERMINATE; +NotifyAccessibleEvent(AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - filter/source
filter/source/config/fragments/filters/MS_Word_2007_XML.xcu |2 +- filter/source/config/fragments/filters/MS_Word_2007_XML_Template.xcu |2 +- filter/source/config/fragments/filters/MS_Word_2007_XML_Template_ui.xcu |2 +- filter/source/config/fragments/filters/MS_Word_2007_XML_ui.xcu |2 +- filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template_ui.xcu |2 +- filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_ui.xcu |2 +- filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_AutoPlay.xcu |2 +- filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_Template.xcu |2 +- filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_Template_ui.xcu |2 +- filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_ui.xcu |2 +- filter/source/config/fragments/types/MS_Excel_2007_XML.xcu |2 +- filter/source/config/fragments/types/MS_Excel_2007_XML_Template.xcu |2 +- filter/source/config/fragments/types/MS_PowerPoint_2007_XML.xcu |2 +- filter/source/config/fragments/types/MS_PowerPoint_2007_XML_AutoPlay.xcu |2 +- filter/source/config/fragments/types/MS_PowerPoint_2007_XML_Template.xcu |2 +- filter/source/config/fragments/types/writer_MS_Word_2007_XML.xcu |2 +- filter/source/config/fragments/types/writer_MS_Word_2007_XML_Template.xcu |2 +- 17 files changed, 17 insertions(+), 17 deletions(-) New commits: commit 951484c31aa41f74847b7c320408d4ca6160b15d Author: Andras Timar Date: Tue Nov 26 14:56:47 2013 +0100 fdo#72034 OOXML 2007/2010 -> 2007/2010/2013 Change-Id: Id5bec8634a66361f4369fe02a3061974d00e7a1f diff --git a/filter/source/config/fragments/filters/MS_Word_2007_XML.xcu b/filter/source/config/fragments/filters/MS_Word_2007_XML.xcu index 6ad137f..ecafe22 100644 --- a/filter/source/config/fragments/filters/MS_Word_2007_XML.xcu +++ b/filter/source/config/fragments/filters/MS_Word_2007_XML.xcu @@ -21,7 +21,7 @@ com.sun.star.comp.Writer.WriterFilter OXML -Microsoft Word 2007/2010 XML +Microsoft Word 2007/2010/2013 XML 0 writer_MS_Word_2007 diff --git a/filter/source/config/fragments/filters/MS_Word_2007_XML_Template.xcu b/filter/source/config/fragments/filters/MS_Word_2007_XML_Template.xcu index 54c9d42..3d62b4b 100644 --- a/filter/source/config/fragments/filters/MS_Word_2007_XML_Template.xcu +++ b/filter/source/config/fragments/filters/MS_Word_2007_XML_Template.xcu @@ -20,7 +20,7 @@ com.sun.star.comp.Writer.WriterFilter OXML -Microsoft Word 2007/2010 XML Template +Microsoft Word 2007/2010/2013 XML Template 0 writer_MS_Word_2007_Template diff --git a/filter/source/config/fragments/filters/MS_Word_2007_XML_Template_ui.xcu b/filter/source/config/fragments/filters/MS_Word_2007_XML_Template_ui.xcu index f196053..d1e8b48 100644 --- a/filter/source/config/fragments/filters/MS_Word_2007_XML_Template_ui.xcu +++ b/filter/source/config/fragments/filters/MS_Word_2007_XML_Template_ui.xcu @@ -17,6 +17,6 @@ --> -Microsoft Word 2007/2010 XML Template +Microsoft Word 2007/2010/2013 XML Template diff --git a/filter/source/config/fragments/filters/MS_Word_2007_XML_ui.xcu b/filter/source/config/fragments/filters/MS_Word_2007_XML_ui.xcu index 51ce556..42e7d84 100644 --- a/filter/source/config/fragments/filters/MS_Word_2007_XML_ui.xcu +++ b/filter/source/config/fragments/filters/MS_Word_2007_XML_ui.xcu @@ -17,6 +17,6 @@ --> -Microsoft Word 2007/2010 XML +Microsoft Word 2007/2010/2013 XML diff --git a/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template_ui.xcu b/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template_ui.xcu index 7b7572d..b2a6d60 100644 --- a/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template_ui.xcu +++ b/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template_ui.xcu @@ -17,6 +17,6 @@ --> -Microsoft Excel 2007/2010 XML Template +Microsoft Excel 2007/2010/2013 XML Template diff --git a/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_ui.xcu b/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_ui.xcu index 2b025b9..29e4f06 100644 --- a/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_ui.xcu +++ b/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_ui.xcu @@ -17,6 +17,6 @@ --> -Microsoft Excel 2007/2010 XML +Microsoft Excel 2007/2010/2013 XML
[Libreoffice-commits] core.git: filter/source
filter/source/config/fragments/filters/MS_Word_2007_XML.xcu |2 +- filter/source/config/fragments/filters/MS_Word_2007_XML_Template.xcu |2 +- filter/source/config/fragments/filters/MS_Word_2007_XML_Template_ui.xcu |2 +- filter/source/config/fragments/filters/MS_Word_2007_XML_ui.xcu |2 +- filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template_ui.xcu |2 +- filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_ui.xcu |2 +- filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_AutoPlay.xcu |2 +- filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_Template.xcu |2 +- filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_Template_ui.xcu |2 +- filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_ui.xcu |2 +- filter/source/config/fragments/types/MS_Excel_2007_XML.xcu |2 +- filter/source/config/fragments/types/MS_Excel_2007_XML_Template.xcu |2 +- filter/source/config/fragments/types/MS_PowerPoint_2007_XML.xcu |2 +- filter/source/config/fragments/types/MS_PowerPoint_2007_XML_AutoPlay.xcu |2 +- filter/source/config/fragments/types/MS_PowerPoint_2007_XML_Template.xcu |2 +- filter/source/config/fragments/types/writer_MS_Word_2007_XML.xcu |2 +- filter/source/config/fragments/types/writer_MS_Word_2007_XML_Template.xcu |2 +- 17 files changed, 17 insertions(+), 17 deletions(-) New commits: commit a01605430ec6124093d3b4896839b1bf65c071ed Author: Andras Timar Date: Tue Nov 26 14:56:47 2013 +0100 fdo#72034 OOXML 2007/2010 -> 2007/2010/2013 Change-Id: Id5bec8634a66361f4369fe02a3061974d00e7a1f diff --git a/filter/source/config/fragments/filters/MS_Word_2007_XML.xcu b/filter/source/config/fragments/filters/MS_Word_2007_XML.xcu index 6ad137f..ecafe22 100644 --- a/filter/source/config/fragments/filters/MS_Word_2007_XML.xcu +++ b/filter/source/config/fragments/filters/MS_Word_2007_XML.xcu @@ -21,7 +21,7 @@ com.sun.star.comp.Writer.WriterFilter OXML -Microsoft Word 2007/2010 XML +Microsoft Word 2007/2010/2013 XML 0 writer_MS_Word_2007 diff --git a/filter/source/config/fragments/filters/MS_Word_2007_XML_Template.xcu b/filter/source/config/fragments/filters/MS_Word_2007_XML_Template.xcu index 54c9d42..3d62b4b 100644 --- a/filter/source/config/fragments/filters/MS_Word_2007_XML_Template.xcu +++ b/filter/source/config/fragments/filters/MS_Word_2007_XML_Template.xcu @@ -20,7 +20,7 @@ com.sun.star.comp.Writer.WriterFilter OXML -Microsoft Word 2007/2010 XML Template +Microsoft Word 2007/2010/2013 XML Template 0 writer_MS_Word_2007_Template diff --git a/filter/source/config/fragments/filters/MS_Word_2007_XML_Template_ui.xcu b/filter/source/config/fragments/filters/MS_Word_2007_XML_Template_ui.xcu index f196053..d1e8b48 100644 --- a/filter/source/config/fragments/filters/MS_Word_2007_XML_Template_ui.xcu +++ b/filter/source/config/fragments/filters/MS_Word_2007_XML_Template_ui.xcu @@ -17,6 +17,6 @@ --> -Microsoft Word 2007/2010 XML Template +Microsoft Word 2007/2010/2013 XML Template diff --git a/filter/source/config/fragments/filters/MS_Word_2007_XML_ui.xcu b/filter/source/config/fragments/filters/MS_Word_2007_XML_ui.xcu index 51ce556..42e7d84 100644 --- a/filter/source/config/fragments/filters/MS_Word_2007_XML_ui.xcu +++ b/filter/source/config/fragments/filters/MS_Word_2007_XML_ui.xcu @@ -17,6 +17,6 @@ --> -Microsoft Word 2007/2010 XML +Microsoft Word 2007/2010/2013 XML diff --git a/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template_ui.xcu b/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template_ui.xcu index 7b7572d..b2a6d60 100644 --- a/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template_ui.xcu +++ b/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template_ui.xcu @@ -17,6 +17,6 @@ --> -Microsoft Excel 2007/2010 XML Template +Microsoft Excel 2007/2010/2013 XML Template diff --git a/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_ui.xcu b/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_ui.xcu index 2b025b9..29e4f06 100644 --- a/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_ui.xcu +++ b/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_ui.xcu @@ -17,6 +17,6 @@ --> -Microsoft Excel 2007/2010 XML +Microsoft Excel 2007/2010/2013 XML
Re: mso-dumper: making a PPT text extractor
Thorsten Behrens writes: > j...@dockes.org wrote: > > The modifications to mso-dumper would be as follows: > > > > - Make sure that all current output goes through the output() method > >inside glob.py instead of using direct print() calls > > - Add a command-line option to suppress printing from output() > > - Add a command-line option to accumulate and print the text from the > >String() and UniString() classes inside pptrecord.py: this would be the > >text extractor proper. > > > All very useful IMO. > > > A quick test of the approach based on commenting and changing the > > appropriate statements shows that the text extraction work very well (after > > the charset conversion fixes posted earlier). > > > > However this would need small changes to the code (print statements mostly) > > in many places, so I would appreciate some kind of pre-approval from the > > code owners before going to work. > > > Go for it! Just one small wish, could you sort potential output into > ~fitting classes of stuff, such that people could control output > verbosity, by e.g. requesting only 'Atom output', 'Text output' etc? > > Just stick one extra parameter with the output class into all output() > method calls. I've looked into this just a bit, and it's not obvious to me how this should be done. For example the PPT-specific code accumulates text from many places, and then prints the whole bunch by calling globals.output(). So for now, I've tried for minimal modifications to the existing code, just separating the PPT text from all the rest. > > It would also be useful to rename the "src" directory to something like > > "msodump" so that the code can be installed as a Python package in a more > > standard way (this would also need a change to the import statements in the > > top level utilities). > > > Hah. Yeah, totally. And feel free to add whatever idiomatic code for > easy installation / packaging / testing to the toplevel dir. I have renamed src/ to msodumper/ and added a basic setup.py to enable using the usual Python setuptools. "python setup.py install" will install ppt-dump.py to /usr/local/bin and the package to the appropriate python dir under /usr/local/lib, with the usual magic to choose a different prefix etc. It would be trivial to add the other scripts (xls-dump etc.) of course, just add them to the 'scripts' array. This should be an easy base for eventual distribution packaging. The current code is here: https://github.com/medoc92/mso-dump Everything should behave as previously except that: - Option --no-struct-output to ppt-dump.py will silence the structure dump. - Option --dump-text to ppt-dump.py will print the slides text as UTF-8. I have checked on a number of files that the structure output is unchanged in general (except for changes due to the Unicode fix). I'm not opposed to doing a little more work on output selection, but we should first discuss the desired features, maybe off-list as this is probably not of general interest ? Cheers, jf ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - stlport/systemstl unotools/source vcl/source
stlport/systemstl/hash_map|2 --
stlport/systemstl/hash_set|2 --
unotools/source/config/cmdoptions.cxx |2 +-
vcl/source/gdi/configsettings.cxx |2 +-
4 files changed, 2 insertions(+), 6 deletions(-)
New commits:
commit f809591727a01b24d6665e4dc378d6a59ea4b020
Author: Herbert Dürr
Date: Tue Nov 26 13:16:13 2013 +
#i123755# remove the stlport4-emulation of hash-container's resize() method
and call the rehash() methods of their TR1 counterparts directly
diff --git a/stlport/systemstl/hash_map b/stlport/systemstl/hash_map
index 72b2700..a14bb68 100644
--- a/stlport/systemstl/hash_map
+++ b/stlport/systemstl/hash_map
@@ -69,7 +69,6 @@ public:
hash_map& operator=( const hash_map& r) { hash_map c(r); this->swap(c);
return *this; }
#endif
- void resize( size_t n) { _super::rehash(n); }
private:
// setting the hasher dynamically is not supported in the emulation!
hash_map( size_t, const __H&, const __E& rE=__E(), const __A&
rA=__A()); // not implemented
@@ -98,7 +97,6 @@ public:
hash_multimap& operator=( const hash_multimap& r) { hash_multimap c(r);
this->swap(c); return *this; }
#endif
- void resize( size_t n) { _super::rehash(n); }
private:
// setting the hasher dynamically is not supported in the emulation!
hash_multimap( size_t, const __H&, const __E& rE=__E(), const __A&
rA=__A()); // not implemented
diff --git a/stlport/systemstl/hash_set b/stlport/systemstl/hash_set
index 7cbf797..c97ee05 100644
--- a/stlport/systemstl/hash_set
+++ b/stlport/systemstl/hash_set
@@ -58,7 +58,6 @@ class hash_set
public:
hash_set( void) {}
hash_set( size_t n) : _super(n) {}
- void resize( size_t n) { _super::rehash( n); }
#ifdef BOOST_TR1_UNORDERED_SET_INCLUDED // workaround
pre-BOOST_UNORDERED_USE_MOVE problem
// in derived classes the copy assignment operator can only be declared
implicitly if
@@ -84,7 +83,6 @@ class hash_multiset
public:
hash_multiset( void) {}
hash_multiset( size_t n) : _super( n) {}
- void resize( size_t n) { _super::rehash( n); }
#ifdef BOOST_TR1_UNORDERED_SET_INCLUDED // workaround
pre-BOOST_UNORDERED_USE_MOVE problem
// in derived classes the copy assignment operator can only be declared
implicitly if
diff --git a/unotools/source/config/cmdoptions.cxx
b/unotools/source/config/cmdoptions.cxx
index 2654c05..fa20f59 100644
--- a/unotools/source/config/cmdoptions.cxx
+++ b/unotools/source/config/cmdoptions.cxx
@@ -102,7 +102,7 @@ class SvtCmdOptions
void SetContainerSize( sal_Int32 nSize )
{
-m_aCommandHashMap.resize( nSize );
+m_aCommandHashMap.rehash( nSize );
}
sal_Bool Lookup( const OUString& aCmd ) const
diff --git a/vcl/source/gdi/configsettings.cxx
b/vcl/source/gdi/configsettings.cxx
index 4fba9504..b279543 100644
--- a/vcl/source/gdi/configsettings.cxx
+++ b/vcl/source/gdi/configsettings.cxx
@@ -131,7 +131,7 @@ void SettingsConfigItem::getValues()
m_aSettings.clear();
Sequence< OUString > aNames( GetNodeNames( OUString() ) );
-m_aSettings.resize( aNames.getLength() );
+m_aSettings.rehash( aNames.getLength() );
for( int j = 0; j < aNames.getLength(); j++ )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: LibreOffice 4.1: Mozilla build option to ignore
Michael Stahl wrote: > that's a good question - Thorsten, why isn't Win-x86@42 doing uploads? > Gah. This instdir move is causing all kind of grief for the tinderboxes. It seems the code now handles 4-2 and master, but not 4-1 any more. Anyone cycles to poke at tb/tb_internals, otherwise something for my weekend. Cheers, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: accessibility/inc accessibility/source
accessibility/inc/accessibility/extended/textwindowaccessibility.hxx |1 -
accessibility/source/extended/textwindowaccessibility.cxx|5
++---
2 files changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 49c1964b427c9f2f169ba4d826d346adc7555ae0
Author: Tor Lillqvist
Date: Tue Nov 26 16:09:14 2013 +0200
WaE: private field 'm_bCompoundControlChild' is not used
Change-Id: I656c044de766e274f4938facc3a85b6152ba79ed
diff --git
a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
index 72bb304..befe02a 100644
--- a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
+++ b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
@@ -696,7 +696,6 @@ private:
::std::queue< ::TextHint > m_aParagraphNotifications;
bool m_bSelectionChangedNotification;
-bool m_bCompoundControlChild;
};
}
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx
b/accessibility/source/extended/textwindowaccessibility.cxx
index 43782f7..f969bcb 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -770,7 +770,7 @@ void ParagraphImpl::checkDisposed()
}
Document::Document(::VCLXWindow * pVclXWindow, ::TextEngine & rEngine,
- ::TextView & rView, bool bCompoundControlChild):
+ ::TextView & rView, bool /* bCompoundControlChild */):
VCLXAccessibleComponent(pVclXWindow),
m_xAccessible(pVclXWindow),
m_rEngine(rEngine),
@@ -784,8 +784,7 @@ Document::Document(::VCLXWindow * pVclXWindow, ::TextEngine
& rEngine,
m_nSelectionFirstPos(-1),
m_nSelectionLastPara(-1),
m_nSelectionLastPos(-1),
-m_bSelectionChangedNotification(false),
-m_bCompoundControlChild(bCompoundControlChild)
+m_bSelectionChangedNotification(false)
{}
css::lang::Locale Document::retrieveLocale()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: GraphicExportFilter and headless mode
I've just also created a bug report.
https://bugs.freedesktop.org/show_bug.cgi?id=72036
Thanks
On 26 November 2013 15:51, Maxim Lacrima wrote:
> Hello,
>
> I have found an interesting issue.
>
> Start libreoffice as following:
>
> $ /usr/bin/libreoffice4.0 "--accept=socket,host=localhost,port=2002;urp;"
>
> draw.odg contains some asian text. Let's export it using using
> GraphicExportFilter. I created a sample python script for this
> (drawpages.py):
>
> $ cp draw.odg /tmp/
> $ python drawpages.py
>
> Now open /tmp/draw.png. Everything is displayed correctly.
>
> Now start libreoffice in headless mode:
>
> /usr/bin/libreoffice4.0 "--accept=socket,host=localhost,port=2002;urp;"
> --headless
>
> Repeat steps above. If you open /tmp/draw.png, you will notice that all
> asian characters are mangled.
>
> For convenience I attached drawpages.py and other documents. For clarity
> here it is:
> --
> import uno
>
> localContext = uno.getComponentContext()
> resolver = localContext.ServiceManager.createInstanceWithContext(
> "com.sun.star.bridge.UnoUrlResolver", localContext)
>
> context = resolver.resolve("uno:socket,host=localhost,port=2002;"
> "urp;StarOffice.ComponentContext")
>
> desktop = context.ServiceManager.createInstanceWithContext(
> "com.sun.star.frame.Desktop", context)
>
> url = uno.systemPathToFileUrl('/tmp/draw.odg')
> doc = desktop.loadComponentFromURL(url, "_blank", 0, ())
>
> draw_pages = doc.getDrawPages()
> page = draw_pages.getByIndex(0)
>
> gf = context.ServiceManager.createInstanceWithContext(
> "com.sun.star.drawing.GraphicExportFilter", context)
> gf.setSourceDocument(page)
>
> url = uno.systemPathToFileUrl('/tmp/draw.png')
> pv1 = uno.createUnoStruct("com.sun.star.beans.PropertyValue")
> pv1.Name, pv1.Value = "URL", url
>
> pv2 = uno.createUnoStruct("com.sun.star.beans.PropertyValue")
> pv2.Name, pv2.Value = "MediaType", "image/png"
>
> args = (pv1, pv2)
>
> gf.filter(args)
> --
>
> --
> Regards,
> Maxim
>
--
Regards,
Maxim
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Thomas van der Meulen changed: What|Removed |Added Depends on||72037 --- Comment #21 from Thomas van der Meulen --- added bug 72037 - LO 4.2: Wizards "Document Converter" and "Euro Converter" not working. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - oox/source sw/qa
oox/source/core/contexthandler2.cxx |2 ++
oox/source/drawingml/shape.cxx |3 ++-
sw/qa/extras/ooxmlimport/data/textbox-wps-only.docx |binary
3 files changed, 4 insertions(+), 1 deletion(-)
New commits:
commit fee379666a068d27c25e0ecfd763e85b0f3c59f2
Author: Miklos Vajna
Date: Tue Nov 26 15:37:48 2013 +0100
oox: avoid crash in ContextHandler2Helper::processCollectedChars()
Change-Id: Ie70c9914745364c7f2beb3cb84a610ec919a950c
diff --git a/oox/source/core/contexthandler2.cxx
b/oox/source/core/contexthandler2.cxx
index 9ac94e8..9c7a820 100644
--- a/oox/source/core/contexthandler2.cxx
+++ b/oox/source/core/contexthandler2.cxx
@@ -166,6 +166,8 @@ void ContextHandler2Helper::popElementInfo()
void ContextHandler2Helper::processCollectedChars()
{
OSL_ENSURE( !mxContextStack->empty(),
"ContextHandler2Helper::processCollectedChars - no context info" );
+if (mxContextStack->empty())
+return;
ElementInfo& rInfo = mxContextStack->back();
if( !rInfo.maChars.isEmpty() )
{
diff --git a/sw/qa/extras/ooxmlimport/data/textbox-wps-only.docx
b/sw/qa/extras/ooxmlimport/data/textbox-wps-only.docx
index 897dcbc..b2fd265 100755
Binary files a/sw/qa/extras/ooxmlimport/data/textbox-wps-only.docx and
b/sw/qa/extras/ooxmlimport/data/textbox-wps-only.docx differ
commit c7069898e18f26c132c80cc53f69eb9fb934c154
Author: Miklos Vajna
Date: Tue Nov 26 14:32:21 2013 +0100
DOCX drawingML shape import: no need to add TextFrames to the drawpage
As (not) done for the VML import in Drawing::createAndInsertXShape()
already.
Change-Id: Ib4eac941a46e09df6b5363e8c7eeacc2e6dbac6d
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index f93a4c4..aaf7128 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -508,7 +508,8 @@ Reference< XShape > Shape::createAndInsert(
if( xNamed.is() )
xNamed->setName( msName );
}
-rxShapes->add( mxShape );
+if (aServiceName != "com.sun.star.text.TextFrame")
+rxShapes->add( mxShape );
if ( mbHidden || mbHiddenMasterShape )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - accessibility/inc accessibility/source include/svtools svtools/source unoidl/source
accessibility/inc/accessibility/extended/textwindowaccessibility.hxx |2
accessibility/source/extended/textwindowaccessibility.cxx|2
accessibility/source/helper/acc_factory.cxx |6 -
include/svtools/accessiblefactory.hxx|2
include/svtools/textwindowpeer.hxx |3
svtools/source/edit/textwindowpeer.cxx |6 -
svtools/source/misc/svtaccessiblefactory.cxx |2
unoidl/source/sourceprovider-parser.y| 56
--
8 files changed, 56 insertions(+), 23 deletions(-)
New commits:
commit 62fcdfa34aa302aa9051e90e75b94eb442fa1db7
Author: Stephan Bergmann
Date: Tue Nov 26 15:54:26 2013 +0100
-Werror,-Wunused-private-field
...fixed more thoroughly than 49c1964b427c9f2f169ba4d826d346adc7555ae0 "WaE:
private field 'm_bCompoundControlChild' is not used."
Change-Id: Ief1093c054fe272b82da78ab103e8ca3feb72b90
diff --git
a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
index befe02a..20433be 100644
--- a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
+++ b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
@@ -396,7 +396,7 @@ class Document: public ::VCLXAccessibleComponent, public
::SfxListener
{
public:
Document(::VCLXWindow * pVclXWindow, ::TextEngine & rEngine,
- ::TextView & rView, bool bCompoundControlChild);
+ ::TextView & rView);
inline css::uno::Reference< css::accessibility::XAccessible >
getAccessible() { return m_xAccessible; }
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx
b/accessibility/source/extended/textwindowaccessibility.cxx
index f969bcb..002326f 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -770,7 +770,7 @@ void ParagraphImpl::checkDisposed()
}
Document::Document(::VCLXWindow * pVclXWindow, ::TextEngine & rEngine,
- ::TextView & rView, bool /* bCompoundControlChild */):
+ ::TextView & rView):
VCLXAccessibleComponent(pVclXWindow),
m_xAccessible(pVclXWindow),
m_rEngine(rEngine),
diff --git a/accessibility/source/helper/acc_factory.cxx
b/accessibility/source/helper/acc_factory.cxx
index 93f6bf5..640c2d5 100644
--- a/accessibility/source/helper/acc_factory.cxx
+++ b/accessibility/source/helper/acc_factory.cxx
@@ -158,7 +158,7 @@ inline bool hasFloatingChild(Window *pWindow)
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleContext >
createAccessibleTextWindowContext(
-VCLXWindow* pVclXWindow, TextEngine& rEngine, TextView& rView,
bool bCompoundControlChild
+VCLXWindow* pVclXWindow, TextEngine& rEngine, TextView& rView
) const;
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible >
@@ -451,9 +451,9 @@ inline bool hasFloatingChild(Window *pWindow)
//
Reference< XAccessibleContext >
AccessibleFactory::createAccessibleTextWindowContext(
-VCLXWindow* pVclXWindow, TextEngine& rEngine, TextView& rView, bool
bCompoundControlChild ) const
+VCLXWindow* pVclXWindow, TextEngine& rEngine, TextView& rView ) const
{
-return new Document( pVclXWindow, rEngine, rView,
bCompoundControlChild );
+return new Document( pVclXWindow, rEngine, rView );
}
//
diff --git a/include/svtools/accessiblefactory.hxx
b/include/svtools/accessiblefactory.hxx
index 18eec03..cd8a654 100644
--- a/include/svtools/accessiblefactory.hxx
+++ b/include/svtools/accessiblefactory.hxx
@@ -103,7 +103,7 @@ namespace svt
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleContext >
createAccessibleTextWindowContext(
-VCLXWindow* pVclXWindow, TextEngine& rEngine, TextView& rView,
bool bCompoundControlChild
+VCLXWindow* pVclXWindow, TextEngine& rEngine, TextView& rView
) const = 0;
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible >
diff --git a/include/svtools/textwindowpeer.hxx
b/include/svtools/textwindowpeer.hxx
index cdcc6f8..14ef753 100644
--- a/include/svtools/textwindowpeer.hxx
+++ b/include/svtools/textwindowpeer.hxx
@@ -35,7 +35,7 @@ namespace svt
class TextWindowPeer: public ::VCLXWindow
{
public:
-SVT_DLLPUBLIC TextWindowPeer(::TextView & rView, bool
bCompoundControlChild = false);
+SVT_DLLPUBLIC TextWindowPeer(::TextView & rView);
v
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 22/59256a390c4b6f83cfb5dbe4a65df5032aee47 46/c77dca958b8fbc1a78677ec235e058c8005395
22/59256a390c4b6f83cfb5dbe4a65df5032aee47 |1 + 46/c77dca958b8fbc1a78677ec235e058c8005395 |1 + 2 files changed, 2 insertions(+) New commits: commit cb862a2e7e59a6182a39a10a1975b6d86f1fdd04 Author: Caolán McNamara Date: Tue Nov 26 15:28:06 2013 + Notes added by 'git notes add' diff --git a/22/59256a390c4b6f83cfb5dbe4a65df5032aee47 b/22/59256a390c4b6f83cfb5dbe4a65df5032aee47 new file mode 100644 index 000..1101e47 --- /dev/null +++ b/22/59256a390c4b6f83cfb5dbe4a65df5032aee47 @@ -0,0 +1 @@ +merged as: c23ab5eaed57cc3fb5860e26c591c73c5b22687b commit 4c55e64040e1d90cd690f9b75b8541fdf74b856e Author: Caolán McNamara Date: Tue Nov 26 15:27:51 2013 + Notes added by 'git notes add' diff --git a/46/c77dca958b8fbc1a78677ec235e058c8005395 b/46/c77dca958b8fbc1a78677ec235e058c8005395 new file mode 100644 index 000..1101e47 --- /dev/null +++ b/46/c77dca958b8fbc1a78677ec235e058c8005395 @@ -0,0 +1 @@ +merged as: c23ab5eaed57cc3fb5860e26c591c73c5b22687b ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - c0/5431aa92fa2c7c7258418a6ecd651b5c26d982
c0/5431aa92fa2c7c7258418a6ecd651b5c26d982 |1 + 1 file changed, 1 insertion(+) New commits: commit f51002610ba83521e4bcbd2647919f9aa29745b7 Author: Caolán McNamara Date: Tue Nov 26 15:28:25 2013 + Notes added by 'git notes add' diff --git a/c0/5431aa92fa2c7c7258418a6ecd651b5c26d982 b/c0/5431aa92fa2c7c7258418a6ecd651b5c26d982 new file mode 100644 index 000..1101e47 --- /dev/null +++ b/c0/5431aa92fa2c7c7258418a6ecd651b5c26d982 @@ -0,0 +1 @@ +merged as: c23ab5eaed57cc3fb5860e26c591c73c5b22687b ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - f8/09591727a01b24d6665e4dc378d6a59ea4b020
f8/09591727a01b24d6665e4dc378d6a59ea4b020 |1 + 1 file changed, 1 insertion(+) New commits: commit 485ae51645efdc0e4984fb9db0901ce74e6126ee Author: Caolán McNamara Date: Tue Nov 26 15:28:54 2013 + Notes added by 'git notes add' diff --git a/f8/09591727a01b24d6665e4dc378d6a59ea4b020 b/f8/09591727a01b24d6665e4dc378d6a59ea4b020 new file mode 100644 index 000..8ebbe55 --- /dev/null +++ b/f8/09591727a01b24d6665e4dc378d6a59ea4b020 @@ -0,0 +1 @@ +ignore: obsolete ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - oox/source sw/qa sw/source writerfilter/source
oox/source/drawingml/shape.cxx|2 +-
sw/qa/extras/ooxmlimport/ooxmlimport.cxx |5 +
sw/source/core/docnode/nodedump.cxx |8
writerfilter/source/dmapper/GraphicImport.cxx | 12
4 files changed, 22 insertions(+), 5 deletions(-)
New commits:
commit 3507ffabfe677463f082acca9b592d8eb947a890
Author: Miklos Vajna
Date: Tue Nov 26 16:29:39 2013 +0100
SwRedlineTbl::dumpAsXml: -Werror=format
Change-Id: I703009efb476b20f2fca8d87e14a15c28632a5be
diff --git a/sw/source/core/docnode/nodedump.cxx
b/sw/source/core/docnode/nodedump.cxx
index 5728554..5934911 100644
--- a/sw/source/core/docnode/nodedump.cxx
+++ b/sw/source/core/docnode/nodedump.cxx
@@ -487,14 +487,14 @@ void SwRedlineTbl::dumpAsXml( xmlTextWriterPtr w )
//writer.writeFormatAttribute( "ptr", "%p", &pStartSwNode
);
//writer.writeFormatAttribute( "type", "%d",
pStartSwNode.GetNodeType() );
//writer.endElement( );// swnode
-writer.writeFormatAttribute( "swnode_type", "%d",
pStartSwNode.GetNodeType() );
+writer.writeFormatAttribute( "swnode_type", TMP_FORMAT,
pStartSwNode.GetNodeType() );
const SwIndex&pStartContent = pStart->nContent;
//writer.startElement( "swindex" );
//writer.writeFormatAttribute( "ptr", "%p", &pStartContent
);
//writer.writeFormatAttribute( "content_index", "%d",
pStartContent.GetIndex() );
//writer.endElement( );// swindex
-writer.writeFormatAttribute( "swindex_content_index",
"%d", pStartContent.GetIndex() );
+writer.writeFormatAttribute( "swindex_content_index",
TMP_FORMAT, pStartContent.GetIndex() );
}
//writer.endElement( );// swnodeindex
}
@@ -527,14 +527,14 @@ void SwRedlineTbl::dumpAsXml( xmlTextWriterPtr w )
//writer.writeFormatAttribute( "ptr", "%p", &pEndSwNode );
//writer.writeFormatAttribute( "type", "%d",
pEndSwNode.GetNodeType() );
//writer.endElement( );// swnode
-writer.writeFormatAttribute( "swnode_type", "%d",
pEndSwNode.GetNodeType() );
+writer.writeFormatAttribute( "swnode_type", TMP_FORMAT,
pEndSwNode.GetNodeType() );
const SwIndex&pEndContent = pEnd->nContent;
//writer.startElement( "swindex" );
//writer.writeFormatAttribute( "ptr", "%p", &pEndContent );
//writer.writeFormatAttribute( "content_index", "%d",
pEndContent.GetIndex() );
//writer.endElement( );// swindex
-writer.writeFormatAttribute( "swindex_content_index",
"%d", pEndContent.GetIndex() );
+writer.writeFormatAttribute( "swindex_content_index",
TMP_FORMAT, pEndContent.GetIndex() );
}
//writer.endElement( );// swnodeindex
}
commit 0205f0a2712f0bbc3629b1cc8590105d5dcf11db
Author: Miklos Vajna
Date: Tue Nov 26 16:24:13 2013 +0100
DOCX drawingML shape import: initial wps:txbx positioning
Change-Id: Id779ed88d657257b614d910a2191ed4974612c8f
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index aaf7128..1f7d559 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -623,7 +623,7 @@ Reference< XShape > Shape::createAndInsert(
// These can have a custom geometry, so position should be set here,
// after creation but before custom shape handling, using the position
// we got from the caller.
-if (mbWps)
+if (mbWps && aServiceName != "com.sun.star.text.TextFrame")
mxShape->setPosition(maPosition);
if( bIsCustomShape )
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 8f6e931..551d743 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1539,6 +1539,11 @@ DECLARE_OOXMLIMPORT_TEST(textboxWpsOnly,
"textbox-wps-only.docx")
uno::Reference
xIndexAccess(xTextFramesSupplier->getTextFrames(), uno::UNO_QUERY);
uno::Reference xFrame(xIndexAccess->getByIndex(0),
uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(OUString("Hello world!"), xFrame->getString());
+
+// Position was the default (hori center, vert top) for the textbox.
+xFrame.set(xIndexAccess->getByIndex(1), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2173), getProperty(xFrame,
"HoriOrientPosition"));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2805), getProperty(xFrame,
"VertOrientPosition"));
}
DECLARE_OOXMLIMPORT_TEST(testFdo70457, "fdo70457.docx")
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx
b/writerfilter/source
[Libreoffice-commits] core.git: 2 commits - sfx2/source sfx2/uiconfig
sfx2/source/dialog/tabdlg.cxx |3 +++
sfx2/source/dialog/templdlg.src |3 ++-
sfx2/source/menu/mnuitem.cxx|4
sfx2/source/view/viewfrm.cxx|8 ++--
sfx2/uiconfig/ui/newstyle.ui|5 +
5 files changed, 20 insertions(+), 3 deletions(-)
New commits:
commit b28715862b3e8e6e739ffbbdec515d05e3a1d9ad
Author: Caolán McNamara
Date: Tue Nov 26 15:40:06 2013 +
add accessibility names to .ui
Change-Id: I3453e3c66de730e60843d655e094b7c3247fad1b
diff --git a/sfx2/uiconfig/ui/newstyle.ui b/sfx2/uiconfig/ui/newstyle.ui
index 4c8de54..c846d07 100644
--- a/sfx2/uiconfig/ui/newstyle.ui
+++ b/sfx2/uiconfig/ui/newstyle.ui
@@ -83,6 +83,11 @@
1
False
60
+
+
+Style name
+
+
False
commit 2b951c2e2fb70e796f836115f1718bf4884b06eb
Author: Steve Yin
Date: Tue Nov 26 15:38:11 2013 +
Integrate branch of IAccessible2
Change-Id: I7d6764cfc86b7b8846c0908278ae10a68c0a14f5
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 51c379a..81887f8 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -698,6 +698,9 @@ void SfxTabDialog::Start( sal_Bool bShow )
if ( bShow )
Show();
+
+if ( IsVisible() && ( !HasChildPathFocus() || HasFocus() ) )
+GrabFocusToFirstControl();
}
// ---
diff --git a/sfx2/source/dialog/templdlg.src b/sfx2/source/dialog/templdlg.src
index 65ee1cf..fd9c11d 100644
--- a/sfx2/source/dialog/templdlg.src
+++ b/sfx2/source/dialog/templdlg.src
@@ -35,11 +35,12 @@ ImageList DLG_STYLE_DESIGNER
IdCount = { 3 ; };
};
- // Strings ---
+// Strings ---
String STR_STYLE_ELEMTLIST
{
Text [ en-US ] = "Style List" ;
};
+
String STR_STYLE_FILTER_HIERARCHICAL
{
Text [ en-US ] = "Hierarchical" ;
diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx
index 45b7901..57c972f 100644
--- a/sfx2/source/menu/mnuitem.cxx
+++ b/sfx2/source/menu/mnuitem.cxx
@@ -198,6 +198,8 @@ void SfxMenuControl::StateChanged
DBG_ASSERT( GetId() < SID_OBJECTMENU0 || GetId() > SID_OBJECTMENU_LAST,
"SfxBoolItem not allowed for SID_OBJECTMENUx" );
bCheck = ((const SfxBoolItem*)pState)->GetValue();
+Menu* pMenu = pOwnMenu->GetSVMenu();
+pMenu->SetItemBits( GetId() , pMenu->GetItemBits( GetId() ) |
MIB_CHECKABLE);
}
else if ( pState->ISA(SfxEnumItemInterface) &&
((SfxEnumItemInterface *)pState)->HasBoolValue() )
@@ -206,6 +208,8 @@ void SfxMenuControl::StateChanged
DBG_ASSERT( GetId() < SID_OBJECTMENU0 || GetId() > SID_OBJECTMENU_LAST,
"SfxEnumItem not allowed for SID_OBJECTMENUx" );
bCheck = ((SfxEnumItemInterface *)pState)->GetBoolValue();
+Menu* pMenu = pOwnMenu->GetSVMenu();
+pMenu->SetItemBits( GetId() , pMenu->GetItemBits( GetId() ) |
MIB_CHECKABLE);
}
else if ( ( b_ShowStrings || bIsObjMenu ) && pState->ISA(SfxStringItem) )
{
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index f29363b..c956869 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -676,7 +676,11 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
if( pSalvageItem )
{
aURL = pSalvageItem->GetValue();
-pNewSet->ClearItem( SID_DOC_SALVAGE );
+if (pNewSet)
+{
+pNewSet->ClearItem( SID_ORIGURL );
+pNewSet->ClearItem( SID_DOC_SALVAGE );
+}
}
#if HAVE_FEATURE_MULTIUSER_ENVIRONMENT
@@ -3134,13 +3138,13 @@ void SfxViewFrame::ChildWindowExecute( SfxRequest &rReq
)
sal_Bool bHasChild = HasChildWindow(nSID);
sal_Bool bShow = pShowItem ? pShowItem->GetValue() : !bHasChild;
+GetDispatcher()->Update_Impl( sal_True );
// Perform action.
if ( !pShowItem || bShow != bHasChild )
ToggleChildWindow( nSID );
GetBindings().Invalidate( nSID );
-GetDispatcher()->Update_Impl( sal_True );
// Record if possible.
if ( nSID == SID_HYPERLINK_DIALOG || nSID == SID_SEARCH_DLG )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svtools/source
svtools/source/edit/svmedit.cxx |3 --- 1 file changed, 3 deletions(-) New commits: commit 6812efbb4d45b0ec4a40c11906bd775f94a8f599 Author: Stephan Bergmann Date: Tue Nov 26 17:03:53 2013 +0100 Unused include Change-Id: I3db5994ca2e5f3ce7f0f1dfc2994a07b3cb3d6e0 diff --git a/svtools/source/edit/svmedit.cxx b/svtools/source/edit/svmedit.cxx index 6a7c977..2d21401 100644 --- a/svtools/source/edit/svmedit.cxx +++ b/svtools/source/edit/svmedit.cxx @@ -20,9 +20,6 @@ #include "unoiface.hxx" -#include - - MultiLineEdit::MultiLineEdit( Window* pParent, WinBits nWinStyle ) : VclMultiLineEdit( pParent,nWinStyle ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/AllLangResTarget_cui.mk cui/source cui/uiconfig cui/UIConfig_cui.mk
cui/AllLangResTarget_cui.mk |1
cui/UIConfig_cui.mk |1
cui/source/dialogs/sdrcelldlg.cxx| 58 +---
cui/source/dialogs/sdrcelldlg.src| 91 ---
cui/source/inc/cuires.hrc|4
cui/source/inc/sdrcelldlg.hxx|3
cui/uiconfig/ui/formatcellsdialog.ui | 161 +++
7 files changed, 188 insertions(+), 131 deletions(-)
New commits:
commit a6dab58bd3542ff7a64af3d4080c89d419dd0fce
Author: Caolán McNamara
Date: Tue Nov 26 15:51:42 2013 +
convert format cells dialog to .ui
Change-Id: I451d3e28cc87f82ffb73b4e4c86a134eb1fc117a
diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index 6da235f..15966db 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -40,7 +40,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
cui/source/dialogs/multipat.src \
cui/source/dialogs/passwdomdlg.src \
cui/source/dialogs/scriptdlg.src \
-cui/source/dialogs/sdrcelldlg.src \
cui/source/dialogs/showcols.src \
cui/source/dialogs/srchxtra.src \
cui/source/dialogs/svuidlg.src \
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 78eaa8c..4bfd0bd 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/connpooloptions \
cui/uiconfig/ui/dbregisterpage \
cui/uiconfig/ui/effectspage \
+ cui/uiconfig/ui/formatcellsdialog \
cui/uiconfig/ui/hatchpage \
cui/uiconfig/ui/hyphenate \
cui/uiconfig/ui/insertfloatingframe \
diff --git a/cui/source/dialogs/sdrcelldlg.cxx
b/cui/source/dialogs/sdrcelldlg.cxx
index 2a2a982..79f9249 100644
--- a/cui/source/dialogs/sdrcelldlg.cxx
+++ b/cui/source/dialogs/sdrcelldlg.cxx
@@ -28,47 +28,37 @@
#include
SvxFormatCellsDialog::SvxFormatCellsDialog( Window* pParent, const SfxItemSet*
pAttr, SdrModel* pModel )
-: SfxTabDialog( pParent, CUI_RES( RID_SVX_FORMAT_CELLS_DLG ), pAttr )
-, mrOutAttrs( *pAttr )
-, mpColorTab ( pModel->GetColorList() )
-, mpGradientList ( pModel->GetGradientList() )
-, mpHatchingList ( pModel->GetHatchList() )
-, mpBitmapList ( pModel->GetBitmapList() )
-
-{
-FreeResource();
-
-AddTabPage( RID_SVXPAGE_CHAR_NAME );
-AddTabPage( RID_SVXPAGE_CHAR_EFFECTS );
-AddTabPage( RID_SVXPAGE_BORDER );
-AddTabPage( RID_SVXPAGE_AREA );
-}
-
-SvxFormatCellsDialog::~SvxFormatCellsDialog()
+: SfxTabDialog(pParent, "FormatCellsDialog",
"cui/ui/formatcellsdialog.ui", pAttr)
+, mrOutAttrs(*pAttr)
+, mpColorTab(pModel->GetColorList())
+, mpGradientList(pModel->GetGradientList())
+, mpHatchingList(pModel->GetHatchList())
+, mpBitmapList(pModel->GetBitmapList())
+, m_nAreaPageId(0)
{
+AddTabPage("name", RID_SVXPAGE_CHAR_NAME);
+AddTabPage("effects", RID_SVXPAGE_CHAR_EFFECTS);
+AddTabPage("border", RID_SVXPAGE_BORDER );
+m_nAreaPageId = AddTabPage("area", RID_SVXPAGE_AREA);
}
void SvxFormatCellsDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
{
-switch( nId )
+if (nId == m_nAreaPageId)
{
-case RID_SVXPAGE_AREA:
-( (SvxAreaTabPage&) rPage ).SetColorList( mpColorTab );
-( (SvxAreaTabPage&) rPage ).SetGradientList( mpGradientList );
-( (SvxAreaTabPage&) rPage ).SetHatchingList( mpHatchingList );
-( (SvxAreaTabPage&) rPage ).SetBitmapList( mpBitmapList );
-( (SvxAreaTabPage&) rPage ).SetPageType( PT_AREA );
-( (SvxAreaTabPage&) rPage ).SetDlgType( 1 );
-( (SvxAreaTabPage&) rPage ).SetPos( 0 );
-( (SvxAreaTabPage&) rPage ).Construct();
-( (SvxAreaTabPage&) rPage ).ActivatePage( mrOutAttrs );
-
-break;
-
-default:
-SfxTabDialog::PageCreated( nId, rPage );
-break;
+SvxAreaTabPage& rAreaPage = ((SvxAreaTabPage&)rPage);
+rAreaPage.SetColorList( mpColorTab );
+rAreaPage.SetGradientList( mpGradientList );
+rAreaPage.SetHatchingList( mpHatchingList );
+rAreaPage.SetBitmapList( mpBitmapList );
+rAreaPage.SetPageType( PT_AREA );
+rAreaPage.SetDlgType( 1 );
+rAreaPage.SetPos( 0 );
+rAreaPage.Construct();
+rAreaPage.ActivatePage( mrOutAttrs );
}
+else
+SfxTabDialog::PageCreated( nId, rPage );
}
void SvxFormatCellsDialog::Apply()
diff --git a/cui/source/dialogs/sdrcelldlg.src
b/cui/source/dialogs/sdrcelldlg.src
deleted file mode 100644
index 387c799..000
--- a/cui/source/dialogs/sdrcelldlg.src
+++ /dev/null
@@ -1,91 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlimport/ooxmlimport.cxx |2 +
writerfilter/source/dmapper/GraphicImport.cxx | 42 +-
2 files changed, 23 insertions(+), 21 deletions(-)
New commits:
commit 4932775dae4642bd1157495927c7fcda2589ca15
Author: Miklos Vajna
Date: Tue Nov 26 16:54:05 2013 +0100
DOCX drawingML shape import: handle wp:align for wps:txbx positioning
I.e. previously only absolutely positioned textboxes were handled, with
this, centered textboxes are fine as well. Given that the drawingml
picture import code already supported this, refactor common code to a
common method.
Change-Id: I56e0dbfa0ffc7e27a70a0e8fb8477681389a51cf
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 551d743..69beb44 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1539,6 +1539,8 @@ DECLARE_OOXMLIMPORT_TEST(textboxWpsOnly,
"textbox-wps-only.docx")
uno::Reference
xIndexAccess(xTextFramesSupplier->getTextFrames(), uno::UNO_QUERY);
uno::Reference xFrame(xIndexAccess->getByIndex(0),
uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(OUString("Hello world!"), xFrame->getString());
+// Position wasn't horizontally centered.
+CPPUNIT_ASSERT_EQUAL(text::HoriOrientation::CENTER,
getProperty(xFrame, "HoriOrient"));
// Position was the default (hori center, vert top) for the textbox.
xFrame.set(xIndexAccess->getByIndex(1), uno::UNO_QUERY);
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx
b/writerfilter/source/dmapper/GraphicImport.cxx
index fe5ef95..25056d6 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -354,6 +354,25 @@ public:
xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName(
PROP_TOP_MARGIN ), uno::makeAny(nTopMargin));
xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName(
PROP_BOTTOM_MARGIN ), uno::makeAny(nBottomMargin));
}
+
+void applyPosition(uno::Reference< beans::XPropertySet >
xGraphicObjectProperties) const
+{
+PropertyNameSupplier& rPropNameSupplier =
PropertyNameSupplier::GetPropertyNameSupplier();
+xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName(
PROP_HORI_ORIENT ),
+uno::makeAny(nHoriOrient));
+xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName(
PROP_HORI_ORIENT_POSITION),
+uno::makeAny(nLeftPosition));
+xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName(
PROP_HORI_ORIENT_RELATION ),
+uno::makeAny(nHoriRelation));
+xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName(
PROP_PAGE_TOGGLE ),
+uno::makeAny(bPageToggle));
+xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName(
PROP_VERT_ORIENT ),
+uno::makeAny(nVertOrient));
+xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName(
PROP_VERT_ORIENT_POSITION),
+uno::makeAny(nTopPosition));
+xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName(
PROP_VERT_ORIENT_RELATION ),
+uno::makeAny(nVertRelation));
+}
};
@@ -1008,12 +1027,7 @@ void GraphicImport::lcl_attribute(Id nName, Value & val)
if
(xServiceInfo->supportsService("com.sun.star.text.TextFrame"))
{
// For non-textframes, this is handled already in
oox::drawingml::Shape::createAndInsert().
-xShapeProps->setPropertyValue("HoriOrient",
uno::makeAny(text::HoriOrientation::NONE));
-xShapeProps->setPropertyValue("VertOrient",
uno::makeAny(text::VertOrientation::NONE));
-
xShapeProps->setPropertyValue("HoriOrientPosition",
uno::makeAny(m_pImpl->nLeftPosition));
-
xShapeProps->setPropertyValue("VertOrientPosition",
uno::makeAny(m_pImpl->nTopPosition));
-
xShapeProps->setPropertyValue("HoriOrientRelation",
uno::makeAny(text::RelOrientation::FRAME));
-
xShapeProps->setPropertyValue("VertOrientRelation",
uno::makeAny(text::RelOrientation::FRAME));
+m_pImpl->applyPosition(xShapeProps);
}
m_pImpl->applyMargins(xShapeProps);
@@ -1496,21 +1510,7 @@ uno::Reference< text::XTextContent >
GraphicImport::createGraphicObject( const b
m_pImpl->nLeftPosition = 0;
}
-
xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName(
PROP_HORI_ORIENT ),
-uno::makeAny(m_pImpl->nHoriOrient));
-
xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetNam
[Libreoffice-commits] core.git: 4 commits - include/oox include/sax oox/source sax/source writerfilter/source
include/oox/core/fasttokenhandler.hxx |7 ++-
include/oox/token/tokenmap.hxx | 22 ++
include/sax/fastattribs.hxx | 14 ++
oox/source/core/fasttokenhandler.cxx|5 ++
oox/source/helper/attributelist.cxx | 13 ++
oox/source/token/tokenmap.cxx | 12 -
sax/source/fastparser/fastparser.cxx| 42
sax/source/fastparser/fastparser.hxx|1
sax/source/tools/fastattribs.cxx| 30 +-
writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx | 23 +-
writerfilter/source/ooxml/OOXMLFastTokenHandler.hxx |7 ++-
11 files changed, 117 insertions(+), 59 deletions(-)
New commits:
commit f3d1f950aa259ebe8e3b8c65091e5b6e4462e0e3
Author: Michael Meeks
Date: Tue Nov 26 17:26:01 2013 +
oox: accelerate common case boolean reading.
diff --git a/oox/source/helper/attributelist.cxx
b/oox/source/helper/attributelist.cxx
index 2efc3a3..8f0707a 100644
--- a/oox/source/helper/attributelist.cxx
+++ b/oox/source/helper/attributelist.cxx
@@ -201,6 +201,19 @@ OptValue< sal_Int32 > AttributeList::getIntegerHex(
sal_Int32 nAttrToken ) const
OptValue< bool > AttributeList::getBool( sal_Int32 nAttrToken ) const
{
+const char *pAttr;
+
+// catch the common cases as quickly as possible first
+bool bHasAttr = getAttribList()->getAsChar( nAttrToken, pAttr );
+if( !bHasAttr )
+return OptValue< bool >();
+if( !strcmp( pAttr, "false" ) )
+return OptValue< bool >( false );
+if( !strcmp( pAttr, "true" ) )
+return OptValue< bool >( true );
+
+// now for all the crazy stuff
+
// boolean attributes may be "t", "f", "true", "false", "on", "off", "1",
or "0"
switch( getToken( nAttrToken, XML_TOKEN_INVALID ) )
{
commit 30a8fbbf1b7bdc849d88445a28e86e03e5dc2166
Author: Michael Meeks
Date: Tue Nov 26 17:25:37 2013 +
fastparser: special case xmlns more sensibly.
diff --git a/sax/source/fastparser/fastparser.cxx
b/sax/source/fastparser/fastparser.cxx
index 4c75e0c..1bfb15e 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -949,6 +949,10 @@ void FastSaxParser::callbackStartElement( const XML_Char*
pwName, const XML_Char
{
assert(awAttributes[i+1]);
+if( awAttributes[i][0] != 'x' ||
+strncmp( awAttributes[i], "xmlns") != 0 )
+continue;
+
splitName( awAttributes[i], pPrefix, nPrefixLen, pName, nNameLen );
if( nPrefixLen )
{
commit d7280af9740819971f46a855108334b84778b47d
Author: Michael Meeks
Date: Tue Nov 26 16:26:12 2013 +
fastparser: Avoid copying all tokens into a sequence.
diff --git a/include/oox/core/fasttokenhandler.hxx
b/include/oox/core/fasttokenhandler.hxx
index b79472c..fb4e0e1 100644
--- a/include/oox/core/fasttokenhandler.hxx
+++ b/include/oox/core/fasttokenhandler.hxx
@@ -23,6 +23,7 @@
#include
#include
#include
+#include
namespace oox { class TokenMap; }
@@ -36,7 +37,8 @@ typedef ::cppu::WeakImplHelper2<
::com::sun::star::lang::XServiceInfo, ::com::su
/** Wrapper implementing the com.sun.star.xml.sax.XFastTokenHandler API
interface
that provides access to the tokens generated from the internal token name
list.
*/
-class FastTokenHandler : public FastTokenHandler_BASE
+class FastTokenHandler : public FastTokenHandler_BASE,
+ public sax_fastparser::FastTokenHandlerBase
{
public:
explicitFastTokenHandler();
@@ -53,6 +55,9 @@ public:
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
getUTF8Identifier( sal_Int32 nToken ) throw
(::com::sun::star::uno::RuntimeException);
virtual sal_Int32 SAL_CALL getTokenFromUTF8( const
::com::sun::star::uno::Sequence< sal_Int8 >& Identifier ) throw
(::com::sun::star::uno::RuntimeException);
+// Much faster direct C++ shortcut to the method that matters
+virtual sal_Int32 getTokenDirect( const char *pToken, sal_Int32 nLength )
const;
+
private:
const TokenMap& mrTokenMap; ///< Reference to global token map
singleton.
};
diff --git a/include/oox/token/tokenmap.hxx b/include/oox/token/tokenmap.hxx
index 495fa2d..bddc0ce 100644
--- a/include/oox/token/tokenmap.hxx
+++ b/include/oox/token/tokenmap.hxx
@@ -47,9 +47,29 @@ public:
/** Returns the token identifier for the passed UTF8 token name. */
sal_Int32 getTokenFromUtf8(
-const ::com::sun::star::uno::Sequence< sal_Int8 >&
rUtf8Name ) const;
+const ::com::sun::star::uno::Sequence< sal_Int8 >&
rUtf8Name ) const
+{
+return getTokenFromUTF8( reinterpret_cast< const char * >(
+rUtf8Name.getConstArray() ),
+ r
[Libreoffice-commits] core.git: sw/source
sw/source/core/docnode/nodedump.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit e06ef25aea312380411753f735da14a1e224a2e2 Author: Tor Lillqvist Date: Tue Nov 26 18:28:41 2013 +0200 WaE: int/sal_Int32 format confusion Change-Id: I0dc0bd5c8a751fbda93eeffecc1a01496427da66 diff --git a/sw/source/core/docnode/nodedump.cxx b/sw/source/core/docnode/nodedump.cxx index 5934911..cd0bb5e2 100644 --- a/sw/source/core/docnode/nodedump.cxx +++ b/sw/source/core/docnode/nodedump.cxx @@ -494,7 +494,7 @@ void SwRedlineTbl::dumpAsXml( xmlTextWriterPtr w ) //writer.writeFormatAttribute( "ptr", "%p", &pStartContent ); //writer.writeFormatAttribute( "content_index", "%d", pStartContent.GetIndex() ); //writer.endElement( );// swindex -writer.writeFormatAttribute( "swindex_content_index", TMP_FORMAT, pStartContent.GetIndex() ); +writer.writeFormatAttribute( "swindex_content_index", TMP_FORMAT_I32, pStartContent.GetIndex() ); } //writer.endElement( );// swnodeindex } @@ -534,7 +534,7 @@ void SwRedlineTbl::dumpAsXml( xmlTextWriterPtr w ) //writer.writeFormatAttribute( "ptr", "%p", &pEndContent ); //writer.writeFormatAttribute( "content_index", "%d", pEndContent.GetIndex() ); //writer.endElement( );// swindex -writer.writeFormatAttribute( "swindex_content_index", TMP_FORMAT, pEndContent.GetIndex() ); +writer.writeFormatAttribute( "swindex_content_index", TMP_FORMAT_I32, pEndContent.GetIndex() ); } //writer.endElement( );// swnodeindex } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sax/source
sax/source/fastparser/fastparser.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9eaf15563ac51a802e3ce84af3ee49cedf4f4484 Author: Stephan Bergmann Date: Tue Nov 26 17:31:11 2013 +0100 Presumably wants to use strcmp Change-Id: I978a692fbf464b476811b445b16c7e1b0eec9e25 diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx index 1bfb15e..a6bbfbb 100644 --- a/sax/source/fastparser/fastparser.cxx +++ b/sax/source/fastparser/fastparser.cxx @@ -950,7 +950,7 @@ void FastSaxParser::callbackStartElement( const XML_Char* pwName, const XML_Char assert(awAttributes[i+1]); if( awAttributes[i][0] != 'x' || -strncmp( awAttributes[i], "xmlns") != 0 ) +strcmp( awAttributes[i], "xmlns") != 0 ) continue; splitName( awAttributes[i], pPrefix, nPrefixLen, pName, nNameLen ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sax/source
sax/source/fastparser/fastparser.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d8db8ea918faf1e1ea100de20d156725d9d51fc9 Author: Michael Meeks Date: Tue Nov 26 17:39:26 2013 + fastparser: strncmp needs a length. diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx index a6bbfbb..afe9454 100644 --- a/sax/source/fastparser/fastparser.cxx +++ b/sax/source/fastparser/fastparser.cxx @@ -950,7 +950,7 @@ void FastSaxParser::callbackStartElement( const XML_Char* pwName, const XML_Char assert(awAttributes[i+1]); if( awAttributes[i][0] != 'x' || -strcmp( awAttributes[i], "xmlns") != 0 ) +strncmp( awAttributes[i], "xmlns", 5) != 0 ) continue; splitName( awAttributes[i], pPrefix, nPrefixLen, pName, nNameLen ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: winaccessibility/source
winaccessibility/source/service/AccObject.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 3cc25be9cd42307b00c29f2862ffab634d05d824
Author: Stephan Bergmann
Date: Tue Nov 26 17:40:36 2013 +0100
Replace deprecated OUString::valueOf -> OUString::number
Change-Id: Ia9c5d9ce424f810b31ccc8ec939e1ced301329f7
diff --git a/winaccessibility/source/service/AccObject.cxx
b/winaccessibility/source/service/AccObject.cxx
index 124d29b..4943d34 100644
--- a/winaccessibility/source/service/AccObject.cxx
+++ b/winaccessibility/source/service/AccObject.cxx
@@ -430,7 +430,7 @@ void AccObject::SetValue( Any pAny )
sal_uInt16 val;
if (pAny >>= val)
{
-strValue=::rtl::OUString::valueOf((sal_Int32)val);
+strValue=::rtl::OUString::number(val);
}
}
@@ -460,7 +460,7 @@ void AccObject::SetValue( Any pAny )
double val;
if (pAny >>= val)
{
-strValue=::rtl::OUString::valueOf(val);
+strValue=::rtl::OUString::number(val);
}
}
else if(pAny.getValueType() == getCppuType( (sal_Int32 *)0 ) )
@@ -468,7 +468,7 @@ void AccObject::SetValue( Any pAny )
sal_Int32 val;
if (pAny >>= val)
{
-strValue=::rtl::OUString::valueOf(val);
+strValue=::rtl::OUString::number(val);
}
}
else if (pAny.getValueType() == getCppuType(
(com::sun::star::accessibility::TextSegment *)0 ) )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: LibreOffice 4.1: Mozilla build option to ignore
Ok thank you Guys ;) 2013/11/26 Thorsten Behrens > Michael Stahl wrote: > > that's a good question - Thorsten, why isn't Win-x86@42 doing uploads? > > > Gah. This instdir move is causing all kind of grief for the > tinderboxes. It seems the code now handles 4-2 and master, but not 4-1 > any more. Anyone cycles to poke at tb/tb_internals, otherwise > something for my weekend. > > Cheers, > > -- Thorsten > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: mso-dumper: making a PPT text extractor
j...@dockes.org wrote: > I'm not opposed to doing a little more work on output selection, but we > should first discuss the desired features, maybe off-list as this is > probably not of general interest ? > Yeah - and thanks a lot for the cleanup / improvements already! Let's deal with the remainder off-list... Cheers, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: editeng/source
editeng/source/outliner/outliner.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit f89712a13119e935dd96f38097ee746b15bb7ccb
Author: Tor Lillqvist
Date: Tue Nov 26 19:51:47 2013 +0200
WaE: unreachable code
Change-Id: Iee5fa84eb2335efa7d7f7cb28b8efdecf9366592
diff --git a/editeng/source/outliner/outliner.cxx
b/editeng/source/outliner/outliner.cxx
index 0d3e5ac..137267a 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -1477,6 +1477,7 @@ sal_Bool Outliner::HasChildren( Paragraph* pParagraph )
const
bool Outliner::ImplHasNumberFormat( sal_Int32 nPara ) const
{
return GetNumberFormat(nPara) != 0;
+#if 0 // The below code is obviously unreachable
if ( GetNumberFormat(nPara) )
{
const SfxBoolItem& rBulletState = (const SfxBoolItem&)
pEditEngine->GetParaAttrib( nPara, EE_PARA_BULLETSTATE );
@@ -1484,6 +1485,7 @@ bool Outliner::ImplHasNumberFormat( sal_Int32 nPara )
const
}
else
return sal_False;
+#endif
}
const SvxNumberFormat* Outliner::GetNumberFormat( sal_Int32 nPara ) const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Fix sort order of Dockes
In the D section of Development/Developers, there are sort errors: Sameer comes after Rohit: Desai, Karan Deshmukh, Sameer Deshmukh, Rohit Dywan comes before Dockes. Mládek's last name should have a diacritic: Mládek, Petr. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - rat-excludes
rat-excludes |1 + 1 file changed, 1 insertion(+) New commits: commit d012f7a06a5aee38ea5b6baad98dd4df27ad410d Author: Jürgen Schmidt Date: Tue Nov 26 16:39:24 2013 + add BSD licensed main/winaccessibility/source/UAccCOMIDL/ia2_api_all.idl in exclude list diff --git a/rat-excludes b/rat-excludes index 4607cb3..7224c30 100644 --- a/rat-excludes +++ b/rat-excludes @@ -1353,6 +1353,7 @@ main/unixODBC/inc/sqlext.h main/unixODBC/inc/sqltypes.h main/unixODBC/inc/sqlucode.h +main/winaccessibility/source/UAccCOMIDL/ia2_api_all.idl ## # ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - instsetoo_native/CustomTarget_setup.mk instsetoo_native/Package_setup.mk
instsetoo_native/CustomTarget_setup.mk | 25 +
instsetoo_native/Package_setup.mk |2 ++
2 files changed, 27 insertions(+)
New commits:
commit 3cac074a55a5872182fb9b3b7120093f4d2dcf82
Author: David Tardon
Date: Tue Nov 26 19:38:01 2013 +0100
generate setuprc for instdir
Change-Id: I70418c4911aab0c24b5b198566fa69fdad0f1da2
diff --git a/instsetoo_native/CustomTarget_setup.mk
b/instsetoo_native/CustomTarget_setup.mk
index 5d3c55e..81d48b6 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -16,6 +16,7 @@ $(eval $(call
gb_CustomTarget_register_targets,instsetoo_native/setup,\
$(if $(filter TRUE,$(DISABLE_PYTHON)),,$(call
gb_Helper_get_rcfile,pythonloader.uno)) \
$(if $(filter DESKTOP,$(BUILD_TYPE)),$(if $(filter-out MACOSX,$(OS)), \
$(call gb_Helper_get_rcfile,redirect))) \
+ $(call gb_Helper_get_rcfile,setup) \
$(call gb_Helper_get_rcfile,soffice) \
$(call gb_Helper_get_rcfile,uno) \
$(call gb_Helper_get_rcfile,version) \
@@ -111,6 +112,13 @@ $(call
gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
&& echo 'URE_BOOTSTRAP=$${ORIGIN}/$(call
gb_Helper_get_rcfile,fundamental)' \
) > $@
+$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call
gb_Helper_get_rcfile,setup) :
+ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
+ ( \
+ echo '[Bootstrap]' \
+ && echo
'buildid=$(LIBO_VERSION_MAJOR)$(LIBO_VERSION_MINOR)$(LIBO_VERSION_MICRO)(Build:$(LIBO_VERSION_PATCH))'
\
+ ) > $@
+
$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call
gb_Helper_get_rcfile,soffice) :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
( \
diff --git a/instsetoo_native/Package_setup.mk
b/instsetoo_native/Package_setup.mk
index fd05772..19e3681 100644
--- a/instsetoo_native/Package_setup.mk
+++ b/instsetoo_native/Package_setup.mk
@@ -16,6 +16,7 @@ $(eval $(call
gb_Package_add_files,instsetoo_native_setup,$(LIBO_ETC_FOLDER),\
$(if $(filter TRUE,$(DISABLE_PYTHON)),,$(call
gb_Helper_get_rcfile,pythonloader.uno)) \
$(if $(filter DESKTOP,$(BUILD_TYPE)),$(if $(filter-out MACOSX,$(OS)), \
$(call gb_Helper_get_rcfile,redirect))) \
+ $(call gb_Helper_get_rcfile,setup) \
$(call gb_Helper_get_rcfile,soffice) \
$(call gb_Helper_get_rcfile,uno) \
$(call gb_Helper_get_rcfile,version) \
commit 9ce3e2ae14ecd2a0acd9e63818c1bd82c7a3fc52
Author: David Tardon
Date: Tue Nov 26 19:34:46 2013 +0100
generate sofficerc for instdir
Change-Id: I06ddbc89c58384ce757ac809788f9d978677cb9c
diff --git a/instsetoo_native/CustomTarget_setup.mk
b/instsetoo_native/CustomTarget_setup.mk
index 47a52f1..5d3c55e 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -16,6 +16,7 @@ $(eval $(call
gb_CustomTarget_register_targets,instsetoo_native/setup,\
$(if $(filter TRUE,$(DISABLE_PYTHON)),,$(call
gb_Helper_get_rcfile,pythonloader.uno)) \
$(if $(filter DESKTOP,$(BUILD_TYPE)),$(if $(filter-out MACOSX,$(OS)), \
$(call gb_Helper_get_rcfile,redirect))) \
+ $(call gb_Helper_get_rcfile,soffice) \
$(call gb_Helper_get_rcfile,uno) \
$(call gb_Helper_get_rcfile,version) \
))
@@ -110,6 +111,22 @@ $(call
gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
&& echo 'URE_BOOTSTRAP=$${ORIGIN}/$(call
gb_Helper_get_rcfile,fundamental)' \
) > $@
+$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call
gb_Helper_get_rcfile,soffice) :
+ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
+ ( \
+ echo '[Bootstrap]' \
+ && echo 'HideEula=1' \
+ && echo 'Logo=1' \
+ && echo 'NativeProgress=false' \
+ && echo 'ProgressBarColor=128,128,128' \
+ && echo 'ProgressFrameColor=245,245,245' \
+ && echo 'ProgressPosition=72,189' \
+ && echo 'ProgressSize=409,8' \
+ && echo 'ProgressTextBaseline=170' \
+ && echo 'ProgressTextColor=255,255,255' \
+ && echo 'URE_BOOTSTRAP=$${ORIGIN}/$(call
gb_Helper_get_rcfile,fundamental)' \
+ ) > $@
+
$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call
gb_Helper_get_rcfile,uno) :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
( \
diff --git a/instsetoo_native/Package_setup.mk
b/instsetoo_native/Package_setup.mk
index 7201615..fd05772 100644
--- a/instsetoo_native/Package_setup.mk
+++ b/instsetoo_native/Package_setup.mk
@@ -16,6 +16,7 @@ $(eval $(call
gb_Package_add_files,instsetoo_native_setup,$(LIBO_ETC_FOLDER),\
$(if $(filter TRUE,$(DISABLE_PYTHON)),,$(call
gb_Helper_get_r
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - 2 commits - instsetoo_native/CustomTarget_setup.mk instsetoo_native/Package_setup.mk
instsetoo_native/CustomTarget_setup.mk | 25 +
instsetoo_native/Package_setup.mk |2 ++
2 files changed, 27 insertions(+)
New commits:
commit fe7a5819cd63a0f67f42dc986cfe8858bdf05ef5
Author: David Tardon
Date: Tue Nov 26 19:38:01 2013 +0100
generate setuprc for instdir
Change-Id: I70418c4911aab0c24b5b198566fa69fdad0f1da2
(cherry picked from commit 3cac074a55a5872182fb9b3b7120093f4d2dcf82)
diff --git a/instsetoo_native/CustomTarget_setup.mk
b/instsetoo_native/CustomTarget_setup.mk
index 5d3c55e..81d48b6 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -16,6 +16,7 @@ $(eval $(call
gb_CustomTarget_register_targets,instsetoo_native/setup,\
$(if $(filter TRUE,$(DISABLE_PYTHON)),,$(call
gb_Helper_get_rcfile,pythonloader.uno)) \
$(if $(filter DESKTOP,$(BUILD_TYPE)),$(if $(filter-out MACOSX,$(OS)), \
$(call gb_Helper_get_rcfile,redirect))) \
+ $(call gb_Helper_get_rcfile,setup) \
$(call gb_Helper_get_rcfile,soffice) \
$(call gb_Helper_get_rcfile,uno) \
$(call gb_Helper_get_rcfile,version) \
@@ -111,6 +112,13 @@ $(call
gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
&& echo 'URE_BOOTSTRAP=$${ORIGIN}/$(call
gb_Helper_get_rcfile,fundamental)' \
) > $@
+$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call
gb_Helper_get_rcfile,setup) :
+ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
+ ( \
+ echo '[Bootstrap]' \
+ && echo
'buildid=$(LIBO_VERSION_MAJOR)$(LIBO_VERSION_MINOR)$(LIBO_VERSION_MICRO)(Build:$(LIBO_VERSION_PATCH))'
\
+ ) > $@
+
$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call
gb_Helper_get_rcfile,soffice) :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
( \
diff --git a/instsetoo_native/Package_setup.mk
b/instsetoo_native/Package_setup.mk
index fd05772..19e3681 100644
--- a/instsetoo_native/Package_setup.mk
+++ b/instsetoo_native/Package_setup.mk
@@ -16,6 +16,7 @@ $(eval $(call
gb_Package_add_files,instsetoo_native_setup,$(LIBO_ETC_FOLDER),\
$(if $(filter TRUE,$(DISABLE_PYTHON)),,$(call
gb_Helper_get_rcfile,pythonloader.uno)) \
$(if $(filter DESKTOP,$(BUILD_TYPE)),$(if $(filter-out MACOSX,$(OS)), \
$(call gb_Helper_get_rcfile,redirect))) \
+ $(call gb_Helper_get_rcfile,setup) \
$(call gb_Helper_get_rcfile,soffice) \
$(call gb_Helper_get_rcfile,uno) \
$(call gb_Helper_get_rcfile,version) \
commit 856a85706301ba7a899e850f75cb4978c1d1f25f
Author: David Tardon
Date: Tue Nov 26 19:34:46 2013 +0100
generate sofficerc for instdir
Change-Id: I06ddbc89c58384ce757ac809788f9d978677cb9c
(cherry picked from commit 9ce3e2ae14ecd2a0acd9e63818c1bd82c7a3fc52)
diff --git a/instsetoo_native/CustomTarget_setup.mk
b/instsetoo_native/CustomTarget_setup.mk
index 47a52f1..5d3c55e 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -16,6 +16,7 @@ $(eval $(call
gb_CustomTarget_register_targets,instsetoo_native/setup,\
$(if $(filter TRUE,$(DISABLE_PYTHON)),,$(call
gb_Helper_get_rcfile,pythonloader.uno)) \
$(if $(filter DESKTOP,$(BUILD_TYPE)),$(if $(filter-out MACOSX,$(OS)), \
$(call gb_Helper_get_rcfile,redirect))) \
+ $(call gb_Helper_get_rcfile,soffice) \
$(call gb_Helper_get_rcfile,uno) \
$(call gb_Helper_get_rcfile,version) \
))
@@ -110,6 +111,22 @@ $(call
gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
&& echo 'URE_BOOTSTRAP=$${ORIGIN}/$(call
gb_Helper_get_rcfile,fundamental)' \
) > $@
+$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call
gb_Helper_get_rcfile,soffice) :
+ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
+ ( \
+ echo '[Bootstrap]' \
+ && echo 'HideEula=1' \
+ && echo 'Logo=1' \
+ && echo 'NativeProgress=false' \
+ && echo 'ProgressBarColor=128,128,128' \
+ && echo 'ProgressFrameColor=245,245,245' \
+ && echo 'ProgressPosition=72,189' \
+ && echo 'ProgressSize=409,8' \
+ && echo 'ProgressTextBaseline=170' \
+ && echo 'ProgressTextColor=255,255,255' \
+ && echo 'URE_BOOTSTRAP=$${ORIGIN}/$(call
gb_Helper_get_rcfile,fundamental)' \
+ ) > $@
+
$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call
gb_Helper_get_rcfile,uno) :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
( \
diff --git a/instsetoo_native/Package_setup.mk
b/instsetoo_native/Package_setup.mk
index 7201615..fd05772 100644
--- a/instsetoo_native/Package_setup.mk
+++ b/instsetoo_native/Package_setup.mk
@@ -16,6 +16,7 @@ $(ev
[Libreoffice-commits] core.git: Makefile.in
Makefile.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1b90c10dbb81236446e6407ac67c7c25161c560b Author: Tor Lillqvist Date: Tue Nov 26 21:27:52 2013 +0200 I think this is what was meant? Change-Id: I5ff6e2588361ab58d7cda9ddbd5db61c300c9956 diff --git a/Makefile.in b/Makefile.in index fcfa6f2..cac8fc5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -326,7 +326,7 @@ dump-deps-png: define gb_Top_GbuildToIdeIntegration $(1)-ide-integration: - cd $(SRCDIR) && (make cmd -npf Makefile.gbuild all || true) | $(SRCDIR)/bin/gbuild-to-ide --ide $(1) + cd $(SRCDIR) && (make cmd="make -npf Makefile.gbuild all" cmd || true) | $(SRCDIR)/bin/gbuild-to-ide --ide $(1) endef ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bin/gbuild-to-ide
bin/gbuild-to-ide |4 1 file changed, 4 insertions(+) New commits: commit acca36bbbc7924988e003d492918c61e365fd933 Author: Tor Lillqvist Date: Tue Nov 26 21:36:04 2013 +0200 Add Emacs modes Change-Id: If5e171ba124722b20b49470a77ee6bca21ae635c diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide index d18ee84..f70c3f9 100755 --- a/bin/gbuild-to-ide +++ b/bin/gbuild-to-ide @@ -292,4 +292,8 @@ if __name__ == '__main__': parser.print_help() sys.exit(1) +# Local Variables: +# indent-tabs-mode: nil +# End: +# # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 17448f6b29082feed4ac9b5d32a7542d6ec778f6 Author: Christian Lohmaier Date: Tue Nov 26 17:34:18 2013 +0100 Updated core Project: translations 1815e3c04d6ee25edf53281df533c019881ea58c diff --git a/translations b/translations index b278d9f..1815e3c 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit b278d9fa9559c5cf7feb31b81d93353303e556b1 +Subproject commit 1815e3c04d6ee25edf53281df533c019881ea58c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'libreoffice-4-1-4'
New branch 'libreoffice-4-1-4' available with the following commits: commit 142a1bfb97170244aa5b977d3c6115a649c88f5f Author: Christian Lohmaier Date: Tue Nov 26 20:50:43 2013 +0100 Branch libreoffice-4-1-4 This is 'libreoffice-4-1-4' - the stable branch for the 4.1.4 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 4.1.x release, please use the 'libreoffice-4-1' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: Ide099cd58addb784c708f33d85bd8f7b32aba875 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'libreoffice-4-1-4'
New branch 'libreoffice-4-1-4' available with the following commits: commit dbfe7811640e91db75347fcd043764aa0c18435a Author: Christian Lohmaier Date: Tue Nov 26 20:50:44 2013 +0100 Branch libreoffice-4-1-4 This is 'libreoffice-4-1-4' - the stable branch for the 4.1.4 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 4.1.x release, please use the 'libreoffice-4-1' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: If6f211d4eb5cbc03bf5c209aeae6afb6a6490405 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'libreoffice-4-1-4'
New branch 'libreoffice-4-1-4' available with the following commits: commit b77e648be10f08729b323e2ea9594f685edc7564 Author: Christian Lohmaier Date: Tue Nov 26 20:50:43 2013 +0100 Branch libreoffice-4-1-4 This is 'libreoffice-4-1-4' - the stable branch for the 4.1.4 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 4.1.x release, please use the 'libreoffice-4-1' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: Ibb82674bd9ce75d6d7d409f7ec8f27c3c6f5b739 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'libreoffice-4-1-4'
New branch 'libreoffice-4-1-4' available with the following commits: commit 8d748a64b7507fd386738df3104a5930a8dffcfa Author: Christian Lohmaier Date: Tue Nov 26 20:50:46 2013 +0100 Branch libreoffice-4-1-4 This is 'libreoffice-4-1-4' - the stable branch for the 4.1.4 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 4.1.x release, please use the 'libreoffice-4-1' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I8b57a18b4c343a66fb61da2b33a90bc4c9aa7c66 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 86c0392c1eedb9a09d1b2d86835dcf87c1ffcc20 Author: Christian Lohmaier Date: Tue Nov 26 20:52:49 2013 +0100 bump version to 4.1.5.0.0+ Change-Id: Ibca59e26038f362db7a6024b5b6534e74d5c55a2 diff --git a/configure.ac b/configure.ac index fc52cb1..4db89a0 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.1.4.0.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[4.1.5.0.0+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) save_CC=$CC ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-4.1.4.1'
Tag 'libreoffice-4.1.4.1' created by Christian Lohmaier at 2013-11-26 19:56 -0800 Tag libreoffice-4.1.4.1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJSlP0JAAoJEPQ0oe+v7q6j4JcQAJcDlDOUf23EswL2dQbElKcs 6SsR5e+BN9cNak1OSuqSIP7z5oMtoEcLIWSn+t4ww68VWEfiQI9+MRAAlIBCLrRE nDr38O65X1G2zxefNs6Lp32fDLf5PCdT1Bz/TBipiOwCKY6JTNv2QZqII7XBpThc XJVWMKScub4HJqJnGr3wxzZtdIF1nTXITTHmvVMSfDul/DQK1Bxdk89ThLC38Fit VQ5ORj3L3NUHcuV8fStjRjWbuQndiRx0YTmf+eCIXm/cJMiVV7ININCGrww3c5P2 Pf7nId1qqweZYoM7X1WLk42unv88CdMFLBsA/7tmrzjKJ7St8Jbj39VOBMr7oBL5 o0xlppjqlG22DVgQbCF0Jak9I0aHDySgiKHnYPzkOBVI19VxIjFqMY3PvN9fVeiM 1uoC5XjFMdnQrxTq9KeMybCGNsF7O80XouVIJatwPABjQWzb0esaQAoCDkEPxnkr q9zsE2+r96SNjmvL2uYvh6lsiWC8QJnx7Qcq3fZPrgKgQyqEfuhp7jIuzfzRSyf3 R6uMBmUxG8B1pouDFY+TdyRDe8VbWmqOY4KaILlmWNpJrKABFmnD5MDg5yOdEtX6 2sQ8pnSNKh4qdSakVlWcZ0kGjzULdQ1f9XicYN/5vGuMawrd2L20A/ElOegV223U vgDhFKPHiKyi5Orfak6s =BVkR -END PGP SIGNATURE- Changes since cp-4.1-branch-point-2: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-4.1.4.1'
Tag 'libreoffice-4.1.4.1' created by Christian Lohmaier at 2013-11-26 19:57 -0800 Tag libreoffice-4.1.4.1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJSlP0NAAoJEPQ0oe+v7q6jzS8P/iXXll8CGR/eP0yiuM6pSFqQ 8Rjrx2ueViqP2bJgIfFn311ydldVhy9guRuofcgf3a7WFFyOhGb5Ezm71GGyXVZZ qWO26ruCcGIzOEL+i2dS5O8RSXqH9nUz9mhpX1AFmSSq8bv6B9oPPHxAaoM32qdT To1AH68g7hzy9ua05ZUdc/4Tn4DwN6FhQSY7yscHEfu9GhqnUVxrSA5MCxqFDIwE uP19LEoAtMUhsoqTBaru5zPMwe2kNLkcfbskGxp6/4hBeyPRc9ZFuEPveAhD3g4h hiqDICDy1QPHigmA7gYvxTorEH1XOVPrFfOxxoWOwSfzExg3ZndHnMke1IphiaeM zBRx04YAK8Ckk+YMYQJ09UB47TSyaZ/1+m3w7iF1P7XJzXqCHUOqeQXESdlX/8XU jbo+ZxkVdS4dgEHqQVNQF/W7G4Bb1TBhqsYlupd7hYYentKyDnsPI1r7Hvb/B2dK reXGb/1XRNI/Z/qkSpfF6qbgHgVhbd54X7eZk3F4NMOiSuzx/eS0/NKpWpe080HB chCFaBmDXeQYZbmwBXI1NT2yMrnmPmSk90AcxWSR+jlsCA2AgVEXDP/1fT50ib3l /KMtrZ7fG+1L7yJqq0mEQYZDIgE/6ylFgrcTlt3MPhUqv0hbbpl+DNaqchxuX0uD JXcf3FafBzNu0jm2tH8r =0INA -END PGP SIGNATURE- Changes since cp-4.1-1-7: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-4.1.4.1'
Tag 'libreoffice-4.1.4.1' created by Christian Lohmaier at 2013-11-26 19:57 -0800 Tag libreoffice-4.1.4.1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJSlP0RAAoJEPQ0oe+v7q6j1YgQAJXtCgl6rcfgmIKV7qkcJy70 PdHB10PH/jahcMXRrRll4sT+dhebTSgF+zs3zJjUAvrF6qG96BquiIHseZtlGUVN YJb61xu3XS5KWTQ01B52DzyReWS9lhvTUaRkqL8ppNgQy6NPLS905sqGBOZDhPtL REyHAfNPkioNTPqua5ZDQglMI2x9HbDG+qta+syjcsh11moykgCh6ajvfBKOoYpv XiPJdT5lPDvooiB02i8igWSqiwrSC7SDa3RIJ5J+++t1vzbtEjZON6qS3IzeS91f a0C9AZ46mp3Ij85U3Pev/hMq2+laEb0r78Xmhy/oeODpouAcZO2ILU0IevPc4Syq z/2Ni1PWaFviVuFTAkN88Irn6dVTO4SE+fdzTYh9o6oUVL0OJSrhZOlc9iJFKpwb Kemj486+wOXk/Q8aG+NqDkXI6IAcViXQJwtCGc9+ba6xgmqnJJls7KSpxb6HrQrT R6rpJwfdMxEt+tHtEU+YhXbkXhF6zJsiFX71SHd0CAf0tubpdSjhU/xrLD5tehxu owfgSg+wyEV2aeuPhKoG8tzgfi/OlGzbKqisxU/99fsT0IIf3zvX00KrCh/ApX5N ZEc4TLeWbksodc/JDfWFLe4Vkhb32ve+INwKdNE8rIV8XksBQNgMzKtMzILPZ6br WpPgfCWh/tUTevPfEY1t =7Iw2 -END PGP SIGNATURE- Changes since cp-4.1-2-5: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-4.1.4.1'
Tag 'libreoffice-4.1.4.1' created by Christian Lohmaier at 2013-11-26 19:57 -0800 Tag libreoffice-4.1.4.1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJSlP0VAAoJEPQ0oe+v7q6j4kAP/A6BMWSQTs2JwyCEarUxuWPI 4QcJOdFYZiCotggCGoH45TDUJC2UIhu/8BxfvnsGzMrNcLr/Y6CwoFf1bfPHHAb9 7O+1tFcFsx4qtGVybLcdBzs3tmj9A4sIH/DtguzNYiITSZ8XOvty6i31S5jwfTYi jyUOaq4ir9SDapcmyzq3lq1DkOp+wbTulwOaX4NJwPaqh+ZW4jLepSSOxTi5rCFA oHno5gfk2qq8gqrOnapE0tCZeSO3qgyOWbv2VlRJTmyeqKJCXPVxUgJgRzXqTeOO NLVJVuMXx4Z3jn5D1VL7piyZqEFZKB1zQLhZMD/IaO4kDqmySZsNlKPQqOqbawe3 YUX42lCvVpxUzypJhYu6g7+uANFl5ZlGKApGV9WMpp1fR0ZHYutZAyvmtggYlzSq 4Kv3juES1kr62LlUwyzimJNBYT32ypJCDj8Rmey3sknKelS68GOtckqx21lhIG8N IQWtVjRk0oHt6E5uFA1SOaANmdsX3+9622GFid6Pj9MLMplOEbXqsYapPtSOgQix bUItXeR71Cmu5+/hwMA572CGFh8GAZoGjWkVQ26NHV79gKs7mINYRgrBASZLdiIj 3myvAhB+9o5R7OW/lvc7K33i469lwn90rCuZFTHU/mry3OYpweU9e5m3aLPiriux zlniuYbzk5Aeb9iOzEwe =S8cD -END PGP SIGNATURE- Changes since cp-4.1-branch-point-116: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-4' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8b67038155d26f0ed0be9b2ac28ce9d466b7 Author: Christian Lohmaier Date: Tue Nov 26 20:58:49 2013 +0100 bump version to 4.1.4.1.0+ Change-Id: I72bafd466cd0457ad409b7fdadba1fb198900ae3 diff --git a/configure.ac b/configure.ac index fc52cb1..8a09f21 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.1.4.0.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[4.1.4.1.0+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) save_CC=$CC ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - cui/source sc/source sfx2/source
cui/source/customize/macropg.cxx |4 ++--
sc/source/ui/Accessibility/AccessibleDocument.cxx |2 +-
sfx2/source/dialog/templdlg.hrc |5 -
3 files changed, 3 insertions(+), 8 deletions(-)
New commits:
commit b01b45e9d73a318e983fa5f023d6167218ed2558
Author: Pavel JanÃk
Date: Tue Nov 26 19:43:10 2013 +
WaE: initialize boolean variable to prevent compiler warning.
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx
b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index 7cc0fb2..620cec9 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -2554,7 +2554,7 @@ com::sun::star::uno::Sequence< com::sun::star::uno::Any >
ScAccessibleDocument::
}
else if ( nType == FINDREPLACEFLOWTO )
{
-sal_Bool bSuccess;
+sal_Bool bSuccess(sal_False);
rAny >>= bSuccess;
if ( bSuccess )
{
commit 581e812b783e76b0f00cfebb3ea2cd99fd87c84d
Author: Pavel JanÃk
Date: Tue Nov 26 18:56:35 2013 +
WaE: reorder initializations to prevent compiler warnings.
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index f8834ab..13cb241 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -162,8 +162,8 @@ long _HeaderTabListBox::Notify( NotifyEvent& rNEvt )
_HeaderTabListBox::_HeaderTabListBox( Window* pParent, const ResId& rId ) :
Control( pParent, rId ),
-maListBox( this, WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP ),
-maHeaderBar( this, WB_BUTTONSTYLE | WB_BOTTOMBORDER )
+maHeaderBar( this, WB_BUTTONSTYLE | WB_BOTTOMBORDER ),
+maListBox( this, WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP )
{
maListBox.SetHelpId( HID_MACRO_HEADERTABLISTBOX );
commit 826b91f50c9ec6d0b12dc30c40d0c8fb239b3a4e
Author: Pavel JanÃk
Date: Tue Nov 26 18:26:31 2013 +
Remove duplicate define STR_STYLE_ELEMTLIST.
diff --git a/sfx2/source/dialog/templdlg.hrc b/sfx2/source/dialog/templdlg.hrc
index 3d2c85e..6d04803 100644
--- a/sfx2/source/dialog/templdlg.hrc
+++ b/sfx2/source/dialog/templdlg.hrc
@@ -44,8 +44,3 @@
#define BT_FLIST 8
#define BT_VLIST 9
#define BT_TOOL 10
-
-//IAccessibility2 Implementation 2009-
-#define STR_STYLE_ELEMTLIST 18
-//-IAccessibility2 Implementation 2009
-
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 40469] Modifed Frame Style Options Not Preserved, "Keep Ratio" Option Unavailable
https://bugs.freedesktop.org/show_bug.cgi?id=40469 Julien Nabet changed: What|Removed |Added CC||serval2...@yahoo.fr --- Comment #7 from Julien Nabet --- New link to AOOo: https://issues.apache.org/ooo/show_bug.cgi?id=45499 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: bin/gbuild-to-ide
bin/gbuild-to-ide |9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
New commits:
commit f804a2e8058ec82db91bf29eb0abd660cb08dc66
Author: Tor Lillqvist
Date: Tue Nov 26 23:50:12 2013 +0200
Make it easier to debug the gbuild-to-ide script
Add an --input option so that the input doesn't have to be generated each
time but can (manually) be stored in a file and that then given to the
script
when debugging it interactively.
Change-Id: Icdb6abc828c6d16e29a99494d00eb0c8435f2826
diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index f70c3f9..ac008c5 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -281,10 +281,15 @@ if __name__ == '__main__':
parser = argparse.ArgumentParser(
description='LibreOffice gbuild IDE project generator')
parser.add_argument('--ide', dest='ide', required=True,
-help='the ide to generate project files for')
+help='the IDE to generate project files for')
+parser.add_argument('--input', dest='input', required=False,
+help='the input file, not normally used, for debugging this script')
args = parser.parse_args()
paths = {}
-gbuildparser = GbuildParser().parse(sys.stdin)
+if args.input:
+gbuildparser = GbuildParser().parse(open(args.input, 'r'))
+else:
+gbuildparser = GbuildParser().parse(sys.stdin)
#DebugIntegrationGenerator(gbuildparser).emit()
if args.ide == 'kdevelop':
KdevelopIntegrationGenerator(gbuildparser).emit()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 40469] Modifed Frame Style Options Not Preserved, "Keep Ratio" Option Unavailable
https://bugs.freedesktop.org/show_bug.cgi?id=40469
--- Comment #8 from Julien Nabet ---
Just noticed but when commenting line 885 of sw/source/ui/frmdlg/frmpage.cxx
makes the keepratio checkbox enabled:
881 if (bFormat)
882 {
883 // at formats no anchor editing
884 m_pAnchorFrame->Enable(false);
885 //m_pFixedRatioCB->Enable(sal_False);
886 }
More investigation is needed of course.
See
http://opengrok.libreoffice.org/xref/core/sw/source/ui/frmdlg/frmpage.cxx#881
--
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: real-time financial data (howto)
On 23/11/13 20:54, Michael Meeks wrote: > > On Sat, 2013-11-23 at 15:15 +0100, Daniel Pocock wrote: >>> Would you be interested in working on integrating such a thing? >> >> Yes, that is why I'm looking at it > > Cool - so there is a lot we want to do here in calc. The initial work > on that is in master: > > Data->Streams - I attach a screenshot. Great - that looks like it may be the right place for this work I made up a diagram and published it on my blog, I made sure LibreOffice is mentioned too: http://danielpocock.com/real-time-streaming-market-data-with-free-open-source-software > > Matus has a chunk of work to better manage data streams, and how > they're processed / visualised. I'd personally like to see a clear > separation between data source: > > src: http[s] | shell-script | spreadsheet-cells > format: csv, A1 Here we would need to add an extra choice, to source the data from OpenMAMA Sourcing data from RRDtool may be cool as well and if the HTTP method could fetch Ganglia XML feeds from gmetad (port 8652) that could also be quite useful > And finally how those cells move over time as new data comes to get the > time series in. This would probably need to work in a few different ways Some sources (e.g. OpenMAMA or RRD files) are constantly updating. OpenMAMA ticks arrive at a non-deterministic interval, while RRD updates are at a constant interval. Sometimes the user may just want to poll manually (on spreadsheet refresh) or use some defined interval (e.g. every 5 minutes) to avoid excessive computation effort. >> Would it be problematic for core to have an OpenMAMA dependency >> though? OpenMAMA is not available on all platforms. > > In general with these dependencies we try to de-couple stuff. > >> It would be possible in Java - after all, OpenMAMA provides a Java API >> and it is packaged too: > > And we try to avoid new Java dependencies in the core - as an extension > (fine) - but there are plenty of limits to extensions - and particularly > around performance you want to be C++ for bulk data transfers (cf. the > issues in base). > > In general we try to look for and dlopen system libraries that may not > be there. As an alternative we provide a clean internal abstraction and > distribute a dll that hard links to this system OpenMAMA thing - but (of > course) if it is not there then dlopening our own library will fail. > > Then again - how complex is this API going to be ? :-) > See the bottom of my blog (link above) for sample code in both C++ and Java > Either way - you'd want to hack on the data streams code; Matus is > about to merge some biggish improvements there next week. > > But - from my perspective - I'd -love- to have OpenMAMA support - it's > great to hear about you guys, and I'd love to bundle it in the default > install if possible: big data is something Calc is about to get rather > good at in 4.2 =) I'm just on the fringes of the OpenMAMA effort, packaging it for Debian - big thanks go to the developers at Wombat and NYSE who obviously put many years work into that code and decided to release it as an open source project through the Linux Foundation. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] mso-dumper.git: src/pptrecord.py src/pptstream.py
src/pptrecord.py | 16 +---
src/pptstream.py | 16 +---
2 files changed, 10 insertions(+), 22 deletions(-)
New commits:
commit d05ccd4d92d3410acd3d5b6aee23c951424a437e
Author: Thorsten Behrens
Date: Tue Nov 26 22:56:34 2013 +0100
Move ppt-dumper license to MPL.
Relicense SUSE-contributed code to MPLv2. Other patch contributors
have consented to new license at
https://wiki.documentfoundation.org/Developers#Individuals
diff --git a/src/pptrecord.py b/src/pptrecord.py
index cbbf32d..51bb160 100644
--- a/src/pptrecord.py
+++ b/src/pptrecord.py
@@ -1,17 +1,9 @@
# -*- tab-width: 4; indent-tabs-mode: nil -*-
-
#
-#OpenOffice.org - a multi-platform office productivity suite
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-#Author:
-# Kohei Yoshida
-# Thorsten Behrens
-#
-# The Contents of this file are made available subject to the terms
-# of GNU Lesser General Public License Version 2.1 and any later
-# version.
-#
-
import globals
@@ -1725,3 +1717,5 @@ placeholderEnum = {
25: ["PT_VerticalObject"],
26: ["PT_Picture"]
}
+
+# vim:set filetype=python shiftwidth=4 softtabstop=4 expandtab:
diff --git a/src/pptstream.py b/src/pptstream.py
index cd89824..d1ad3f1 100644
--- a/src/pptstream.py
+++ b/src/pptstream.py
@@ -1,17 +1,9 @@
# -*- tab-width: 4; indent-tabs-mode: nil -*-
-
#
-#OpenOffice.org - a multi-platform office productivity suite
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-#Author:
-# Kohei Yoshida
-# Thorsten Behrens
-#
-# The Contents of this file are made available subject to the terms
-# of GNU Lesser General Public License Version 2.1 and any later
-# version.
-#
-
import sys
import ole, globals, pptrecord
@@ -446,3 +438,5 @@ recData = {
0xF119: ["DFF_msofbtSelection"]
}
+
+# vim:set filetype=python shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - sc/source sw/source
sc/source/core/data/documen2.cxx |8
sw/source/core/access/accmap.cxx |2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit e215b94aea58527bf76db44f0985b467502d457b
Author: Pavel JanÃk
Date: Tue Nov 26 20:36:34 2013 +
WaE: compare unsigned values.
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index b7cb870..a2fef1e 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -1575,7 +1575,7 @@ void SwAccessibleMap::DoInvalidateShapeSelection(sal_Bool
bInvalidateFocusMode /
++pShape;
}
-const int SELECTION_WITH_NUM =10;
+const unsigned int SELECTION_WITH_NUM = 10;
if (vecxShapeAdd.size() > SELECTION_WITH_NUM )
{
uno::Reference< XAccessible > xDoc = GetDocumentView( );
commit c70ed91694191aed2ebc46fd0e20496b6e0499bb
Author: Pavel JanÃk
Date: Tue Nov 26 20:05:14 2013 +
WaE: reorder initializations to prevent compiler warning.
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index bcc0a9d..311bbde 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -216,15 +216,15 @@ ScDocument::ScDocument( ScDocumentMode eMode,
eGrammar( formula::FormulaGrammar::GRAM_NATIVE ),
bStyleSheetUsageInvalid( sal_True ),
mbUndoEnabled( true ),
-//IAccessibility2 Implementation 2009-
-bReadOnly(sal_False),
-//-IAccessibility2 Implementation 2009
mbAdjustHeightEnabled( true ),
mbExecuteLinkEnabled( true ),
mbChangeReadOnlyEnabled( false ),
mbStreamValidLocked( false ),
mbIsTemporary(false), // #118840#
-mnNamedRangesLockCount( 0 )
+mnNamedRangesLockCount( 0 ),
+//IAccessibility2 Implementation 2009-
+bReadOnly(sal_False)
+//-IAccessibility2 Implementation 2009
{
SetStorageGrammar( formula::FormulaGrammar::GRAM_STORAGE_DEFAULT);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - android/abs-lib sfx2/qa
sfx2/qa/complex/sfx2/UndoManager.java |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 37d7a59a3bb4a12bf33e3b04a64313c8959de736 Author: Michael Stahl Date: Tue Nov 26 23:08:21 2013 +0100 adapt sfx2 UndoManager test to renaming from "click" to "press" RID_STR_ACC_ACTION_CLICK in efb23f29983f87104a684e7fab00b84fc59d131d Change-Id: If684816602db38fa87b6272c0491ab2ac910aece diff --git a/sfx2/qa/complex/sfx2/UndoManager.java b/sfx2/qa/complex/sfx2/UndoManager.java index 69c9dd2..901c6c4 100644 --- a/sfx2/qa/complex/sfx2/UndoManager.java +++ b/sfx2/qa/complex/sfx2/UndoManager.java @@ -429,13 +429,13 @@ public class UndoManager final XAccessibleAction controlActions = UnoRuntime.queryInterface( XAccessibleAction.class, accessible.getAccessibleContext() ); for ( int i=0; i Date: Tue Nov 26 22:40:14 2013 +0100 remove executable bits from .java files Change-Id: Id36b1d56553a413ab9b4d82fe6f65185f4f6fc00 diff --git a/android/abs-lib/src/android/support/v4/app/_ActionBarSherlockTrojanHorse.java b/android/abs-lib/src/android/support/v4/app/_ActionBarSherlockTrojanHorse.java old mode 100755 new mode 100644 diff --git a/android/abs-lib/src/com/actionbarsherlock/ActionBarSherlock.java b/android/abs-lib/src/com/actionbarsherlock/ActionBarSherlock.java old mode 100755 new mode 100644 diff --git a/android/abs-lib/src/com/actionbarsherlock/app/ActionBar.java b/android/abs-lib/src/com/actionbarsherlock/app/ActionBar.java old mode 100755 new mode 100644 diff --git a/android/abs-lib/src/com/actionbarsherlock/app/SherlockActivity.java b/android/abs-lib/src/com/actionbarsherlock/app/SherlockActivity.java old mode 100755 new mode 100644 diff --git a/android/abs-lib/src/com/actionbarsherlock/app/SherlockDialogFragment.java b/android/abs-lib/src/com/actionbarsherlock/app/SherlockDialogFragment.java old mode 100755 new mode 100644 diff --git a/android/abs-lib/src/com/actionbarsherlock/app/SherlockExpandableListActivity.java b/android/abs-lib/src/com/actionbarsherlock/app/SherlockExpandableListActivity.java old mode 100755 new mode 100644 diff --git a/android/abs-lib/src/com/actionbarsherlock/app/SherlockFragment.java b/android/abs-lib/src/com/actionbarsherlock/app/SherlockFragment.java old mode 100755 new mode 100644 diff --git a/android/abs-lib/src/com/actionbarsherlock/app/SherlockFragmentActivity.java b/android/abs-lib/src/com/actionbarsherlock/app/SherlockFragmentActivity.java old mode 100755 new mode 100644 diff --git a/android/abs-lib/src/com/actionbarsherlock/app/SherlockListActivity.java b/android/abs-lib/src/com/actionbarsherlock/app/SherlockListActivity.java old mode 100755 new mode 100644 diff --git a/android/abs-lib/src/com/actionbarsherlock/app/SherlockListFragment.java b/android/abs-lib/src/com/actionbarsherlock/app/SherlockListFragment.java old mode 100755 new mode 100644 diff --git a/android/abs-lib/src/com/actionbarsherlock/app/SherlockPreferenceActivity.java b/android/abs-lib/src/com/actionbarsherlock/app/SherlockPreferenceActivity.java old mode 100755 new mode 100644 diff --git a/android/abs-lib/src/com/actionbarsherlock/internal/ActionBarSherlockCompat.java b/android/abs-lib/src/com/actionbarsherlock/internal/ActionBarSherlockCompat.java old mode 100755 new mode 100644 diff --git a/android/abs-lib/src/com/actionbarsherlock/internal/ActionBarSherlockNative.java b/android/abs-lib/src/com/actionbarsherlock/internal/ActionBarSherlockNative.java old mode 100755 new mode 100644 diff --git a/android/abs-lib/src/com/actionbarsherlock/internal/ResourcesCompat.java b/android/abs-lib/src/com/actionbarsherlock/internal/ResourcesCompat.java old mode 100755 new mode 100644 diff --git a/android/abs-lib/src/com/actionbarsherlock/internal/app/ActionBarImpl.java b/android/abs-lib/src/com/actionbarsherlock/internal/app/ActionBarImpl.java old mode 100755 new mode 100644 diff --git a/android/abs-lib/src/com/actionbarsherlock/internal/app/ActionBarWrapper.java b/android/abs-lib/src/com/actionbarsherlock/internal/app/ActionBarWrapper.java old mode 100755 new mode 100644 diff --git a/android/abs-lib/src/com/actionbarsherlock/internal/nineoldandroids/animation/Animator.java b/android/abs-lib/src/com/actionbarsherlock/internal/nineoldandroids/animation/Animator.java old mode 100755 new mode 100644 diff --git a/android/abs-lib/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorListenerAdapter.java b/android/abs-lib/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorListenerAdapter.java old mode 100755 new mode 100644 diff --git a/android/abs-lib/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet.java b/android/abs-lib/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet.java old mode 100755 new mode 100644 diff --git a/android/abs-lib/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatEvaluator.java b/android/a
