[Libreoffice-commits] core.git: Branch 'feature/instdir' - 0 commits -
Rebased ref, commits from common ancestor: ___ 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' - distro-configs/CPWin32.conf postprocess/signing solenv/bin
distro-configs/CPWin32.conf |1
postprocess/signing/signing.pl | 27 ++
solenv/bin/modules/installer.pm | 49
3 files changed, 63 insertions(+), 14 deletions(-)
New commits:
commit d0872a737ee315d18ad04723d5bc0ab619559e1f
Author: Andras Timar
Date: Tue Sep 17 23:02:40 2013 -0700
Enable code signing on Windows
Change-Id: I5538c56498e926504a0c2d217d0c69b94b1b1551
diff --git a/distro-configs/CPWin32.conf b/distro-configs/CPWin32.conf
index a2a6ea8..12f4cc8 100644
--- a/distro-configs/CPWin32.conf
+++ b/distro-configs/CPWin32.conf
@@ -33,3 +33,4 @@
--enable-win-mozab-driver
--disable-build-mozab
--with-lang=af ar bn ca cs da de el en-GB en-US en-ZA es fi fr gu he hi hu it
ja ko mr nb nl nn pl pt-BR pt ru sk sl sv ta tr xh zh-CN zh-TW zu
+--enable-windows-build-signing
diff --git a/postprocess/signing/signing.pl b/postprocess/signing/signing.pl
index b937f0e..fc17092 100644
--- a/postprocess/signing/signing.pl
+++ b/postprocess/signing/signing.pl
@@ -147,9 +147,9 @@ sub sign_files #09.07.2007 10:36
}
$signtool .= " -v" if ($opt_verbose);
$commandline_base = $signtool;
-$commandline_base .= " -f $opt_pfxfile" if ($opt_pfxfile != "");
-$commandline_base .= " -p $opt_pass" if ($opt_pass != "");
-$commandline_base .= " -t $opt_timestamp_url" if ($opt_timestamp_url !=
"");
+$commandline_base .= " -f $opt_pfxfile" if ($opt_pfxfile ne "");
+$commandline_base .= " -p $opt_pass" if ($opt_pass ne "");
+$commandline_base .= " -t $opt_timestamp_url" if ($opt_timestamp_url ne
"");
# Here switch between:
# one command line for muliple files (all doesn't work, too much) / for
each file one command line
@@ -208,17 +208,16 @@ sub execute #11.07.2007 10:02
{
my $commandline = shift;
my $result = "";
-
- print "$commandline\n" if ($debug);
- open(PIPE, "$commandline 2>&1 |") || die "Error: Cant open pipe!\n";
- while ( $result = ) {
- print LOG "$result" if ($opt_log);# logging
- if ( $result =~ /SignTool Error\:/ ) {
-close PIPE;
- print_error( "$result\n" );
- } # if error
- } # while
- close PIPE;
+my $errorlines = "";
+
+print "$commandline\n" if ($debug);
+open(PIPE, "$commandline 2>&1 |") || die "Error: Cannot execute
'$commandline' - $!\n";
+while ( $result = ) {
+print LOG "$result" if ($opt_log);
+$errorlines .= $result if ($result =~ /SignTool Error\:/);
+} # while
+close PIPE;
+print_error( "$errorlines\n" ) if ($errorlines);
} ##execute
diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index 84959b0..a122927 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -1720,6 +1720,31 @@ sub run {
# Path of new installation set: $finalinstalldir
# Path of old installation set:
$installer::globals::updatedatabasepath
my $mspdir =
installer::windows::msp::create_msp_patch($finalinstalldir,
$includepatharrayref, $allvariableshashref, $languagestringref,
$languagesarrayref, $filesinproductlanguageresolvedarrayref);
+if ( defined($ENV{'WINDOWS_BUILD_SIGNING'}) &&
($ENV{'WINDOWS_BUILD_SIGNING'} eq 'TRUE') )
+{
+my $systemcall = "signtool.exe sign ";
+if ( defined($ENV{'PFXFILE'}) ) { $systemcall .= "-f
$ENV{'PFXFILE'} "; }
+if ( defined($ENV{'PFXPASSWORD'}) ) { $systemcall .= "-p
$ENV{'PFXPASSWORD'} "; }
+if ( defined($ENV{'TIMESTAMPURL'}) ) { $systemcall .= "-t
$ENV{'TIMESTAMPURL'} "; } else { $systemcall .= "-t
http://timestamp.globalsign.com/scripts/timestamp.dll "; }
+$systemcall .= $mspdir . "/*.msp";
+installer::logger::print_message( "... $systemcall ...\n"
);
+
+my $returnvalue = system($systemcall);
+
+my $infoline = "Systemcall: $systemcall\n";
+push( @installer::globals::logfileinfo, $infoline);
+
+if ($returnvalue)
+{
+$infoline = "ERROR: Could not execute
\"$systemcall\"!\n";
+push( @installer::globals::logfileinfo, $infoline);
+}
+else
+{
+$infoline = "Success: Executed \"$systemcall\"
successfully!\n";
+push( @installer::globals::logfileinfo, $infoline);
+}
+}
($is_success, $finalinstalldir) =
installer::worker::analyze_and_save_logfile($loggingdir, $mspdir,
$installlogdir, $allsettingsarrayref, $languagestringref,
$current_install_number);
i
[Libreoffice-commits] core.git: Branch 'feature/calc-pluggable-opencl' - sc/source
sc/source/filter/oox/formulabuffer.cxx |1 -
sc/source/filter/oox/worksheetfragment.cxx |9 +
2 files changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 8e70478af81d36b7a513c49640a04093d6c99040
Author: Kohei Yoshida
Date: Tue Sep 17 23:34:11 2013 -0400
In xlsx, a better heuristic is based on worksheet dimension.
And start OpenCL kernel compilation right away if the dimension is
large enough to make the sheet import slow.
Change-Id: Iee3e8dc1f0cb64eb1d8778db19c6edd73e971136
diff --git a/sc/source/filter/oox/formulabuffer.cxx
b/sc/source/filter/oox/formulabuffer.cxx
index cc8a50a..21e383f 100644
--- a/sc/source/filter/oox/formulabuffer.cxx
+++ b/sc/source/filter/oox/formulabuffer.cxx
@@ -65,7 +65,6 @@ void FormulaBuffer::finalizeImport()
FormulaDataMap::iterator cellIt = maCellFormulas.find( nTab );
if ( cellIt != maCellFormulas.end() )
{
-compileOpenCLKernels();
applyCellFormulas( cellIt->second );
}
diff --git a/sc/source/filter/oox/worksheetfragment.cxx
b/sc/source/filter/oox/worksheetfragment.cxx
index b8ad658..93cacd7 100644
--- a/sc/source/filter/oox/worksheetfragment.cxx
+++ b/sc/source/filter/oox/worksheetfragment.cxx
@@ -511,7 +511,16 @@ void WorksheetFragment::importDimension( const
AttributeList& rAttribs )
be set. If the cell A1 exists, the used area will be updated while
importing the cell. */
if( (aRange.EndColumn > 0) || (aRange.EndRow > 0) )
+{
extendUsedArea( aRange );
+
+// Start pre-compiling OpenCL kernels if we have a large number of
+// cells to import. The current threshold is 100,000.
+double fCellCount = aRange.EndColumn - aRange.StartColumn + 1.0;
+fCellCount *= aRange.EndRow - aRange.StartRow + 1.0;
+if (fCellCount > 10.0)
+compileOpenCLKernels();
+}
}
void WorksheetFragment::importSheetFormatPr( const AttributeList& rAttribs )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/calc-pluggable-opencl' - sc/inc sc/source
sc/inc/formulagroup.hxx|2 +-
sc/source/core/opencl/formulagroupcl.cxx |4 ++--
sc/source/core/opencl/openclwrapper.cxx|2 +-
sc/source/core/opencl/openclwrapper.hxx|2 +-
sc/source/core/tool/formulagroup.cxx |8
sc/source/filter/ftools/clkernelthread.cxx |2 +-
6 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 1a8f0db3e244c479739c466ce519d6c2ffb3e0c1
Author: Kohei Yoshida
Date: Tue Sep 17 20:57:48 2013 -0400
Be explicit on what kind of "kernels" we are compiling.
Change-Id: I2415a192d98b94e86c08c138ad39cfdbf36ea283
diff --git a/sc/inc/formulagroup.hxx b/sc/inc/formulagroup.hxx
index c6f32ac..e7c13cd 100644
--- a/sc/inc/formulagroup.hxx
+++ b/sc/inc/formulagroup.hxx
@@ -56,7 +56,7 @@ class SC_DLLPUBLIC FormulaGroupInterpreter
static FormulaGroupInterpreter *getStatic();
static void fillOpenCLInfo(std::vector& rPlatforms);
static void switchOpenCLDevice(const OUString& rDeviceId, bool
bAutoSelect);
-static void compileKernels();
+static void compileOpenCLKernels();
virtual ScMatrixRef inverseMatrix(const ScMatrix& rMat) = 0;
virtual bool interpret(ScDocument& rDoc, const ScAddress& rTopPos, const
ScFormulaCellGroupRef& xGroup, ScTokenArray& rCode) = 0;
diff --git a/sc/source/core/opencl/formulagroupcl.cxx
b/sc/source/core/opencl/formulagroupcl.cxx
index a311179..ab7076d 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -1095,9 +1095,9 @@ SAL_DLLPUBLIC_EXPORT bool SAL_CALL
switchOpenClDevice(const OUString* pDeviceId,
return sc::opencl::switchOpenclDevice(pDeviceId, bAutoSelect);
}
-SAL_DLLPUBLIC_EXPORT void compileKernels(const OUString* pDeviceId)
+SAL_DLLPUBLIC_EXPORT void compileOpenCLKernels(const OUString* pDeviceId)
{
-sc::opencl::compileKernels(pDeviceId);
+sc::opencl::compileOpenCLKernels(pDeviceId);
}
}
diff --git a/sc/source/core/opencl/openclwrapper.cxx
b/sc/source/core/opencl/openclwrapper.cxx
index 78d3bef..684abe6 100644
--- a/sc/source/core/opencl/openclwrapper.cxx
+++ b/sc/source/core/opencl/openclwrapper.cxx
@@ -2744,7 +2744,7 @@ bool switchOpenclDevice(const OUString* pDevice, bool
bAutoSelect)
return !OpenclDevice::initOpenclRunEnv(0);
}
-void compileKernels(const OUString* pDeviceId)
+void compileOpenCLKernels(const OUString* pDeviceId)
{
if (!pDeviceId)
return;
diff --git a/sc/source/core/opencl/openclwrapper.hxx
b/sc/source/core/opencl/openclwrapper.hxx
index dfa8fbb..5a89e6b 100644
--- a/sc/source/core/opencl/openclwrapper.hxx
+++ b/sc/source/core/opencl/openclwrapper.hxx
@@ -266,7 +266,7 @@ const std::vector& fillOpenCLInfo();
*/
bool switchOpenclDevice(const OUString* pDeviceId, bool bAutoSelect);
-void compileKernels(const OUString* pDeviceId);
+void compileOpenCLKernels(const OUString* pDeviceId);
}}
diff --git a/sc/source/core/tool/formulagroup.cxx
b/sc/source/core/tool/formulagroup.cxx
index 6a20a0c..2f85ee5 100644
--- a/sc/source/core/tool/formulagroup.cxx
+++ b/sc/source/core/tool/formulagroup.cxx
@@ -338,7 +338,7 @@ typedef FormulaGroupInterpreter*
(*__createFormulaGroupOpenCLInterpreter)(void);
typedef size_t (*__getOpenCLPlatformCount)(void);
typedef void (*__fillOpenCLInfo)(OpenclPlatformInfo*, size_t);
typedef bool (*__switchOpenClDevice)(const OUString*, bool);
-typedef void (*__compileKernels)(const OUString*);
+typedef void (*__compileOpenCLKernels)(const OUString*);
#endif
@@ -458,7 +458,7 @@ void FormulaGroupInterpreter::switchOpenCLDevice(const
OUString& rDeviceId, bool
#endif
}
-void FormulaGroupInterpreter::compileKernels()
+void FormulaGroupInterpreter::compileOpenCLKernels()
{
const ScCalcConfig& rConfig = ScInterpreter::GetGlobalConfig();
if (!rConfig.mbOpenCLEnabled)
@@ -469,11 +469,11 @@ void FormulaGroupInterpreter::compileKernels()
if (!pModule)
return;
-oslGenericFunction fn = pModule->getFunctionSymbol("compileKernels");
+oslGenericFunction fn = pModule->getFunctionSymbol("compileOpenCLKernels");
if (!fn)
return;
-reinterpret_cast<__compileKernels>(fn)(&rConfig.maOpenCLDevice);
+reinterpret_cast<__compileOpenCLKernels>(fn)(&rConfig.maOpenCLDevice);
}
void FormulaGroupInterpreter::generateRPNCode(ScDocument& rDoc, const
ScAddress& rPos, ScTokenArray& rCode)
diff --git a/sc/source/filter/ftools/clkernelthread.cxx
b/sc/source/filter/ftools/clkernelthread.cxx
index f6d8c63..dcb1e74 100644
--- a/sc/source/filter/ftools/clkernelthread.cxx
+++ b/sc/source/filter/ftools/clkernelthread.cxx
@@ -20,7 +20,7 @@ CLBuildKernelThread::~CLBuildKernelThread() {}
void CLBuildKernelThread::execute()
{
-sc::FormulaGroupInterpreter::compileKernels();
+sc::FormulaGroupInterpreter::compileOpenCLKernels();
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
[Libreoffice-commits] core.git: Branch 'feature/calc-pluggable-opencl' - sc/source
sc/source/core/opencl/openclwrapper.cxx |1 -
sc/source/filter/excel/excform.cxx | 14 +++---
sc/source/filter/excel/impop.cxx|5 +++--
sc/source/filter/inc/imp_op.hxx |6 --
4 files changed, 18 insertions(+), 8 deletions(-)
New commits:
commit bc90f1c6fb5a8c4868e0f12212a373c754c9010c
Author: Kohei Yoshida
Date: Tue Sep 17 20:53:24 2013 -0400
Add a heuristic to avoid always pre-compile OpenCL kernels (for xls).
If we still have 3 MB worth of stream to parse after the first formula
record, we pre-compile OpenCL kernels in a separate thread.
Change-Id: I129d95c26f26e4b1eb989bc2a1764a3f87f71fcb
diff --git a/sc/source/core/opencl/openclwrapper.cxx
b/sc/source/core/opencl/openclwrapper.cxx
index 2b2f8f7..78d3bef 100644
--- a/sc/source/core/opencl/openclwrapper.cxx
+++ b/sc/source/core/opencl/openclwrapper.cxx
@@ -2770,7 +2770,6 @@ void compileKernels(const OUString* pDeviceId)
if (nStatus != CL_SUCCESS)
r.mpKernel = NULL;
}
-
}
}}
diff --git a/sc/source/filter/excel/excform.cxx
b/sc/source/filter/excel/excform.cxx
index 49ca6ca..b557de5 100644
--- a/sc/source/filter/excel/excform.cxx
+++ b/sc/source/filter/excel/excform.cxx
@@ -136,11 +136,19 @@ void ImportExcel::Formula(
}
}
-if (!mxCLKernelThread.is())
+if (mbRunCLKernelThread && !mxCLKernelThread.is())
{
-mxCLKernelThread.set(new sc::CLBuildKernelThread);
-mxCLKernelThread->launch();
+double fRemainSize = maStrm.GetSvStreamSize() -
maStrm.GetSvStreamPos();
+fRemainSize /= 1048576; // Switch to MB.
+if (fRemainSize > 3.0)
+{
+// We still have more than 3MB of stream to parse. Start a thread
to pre-compile OpenCL kernels.
+mxCLKernelThread.set(new sc::CLBuildKernelThread);
+mxCLKernelThread->launch();
+}
+mbRunCLKernelThread = false;
}
+
ConvErr eErr = pFormConv->Convert( pResult, maStrm, nFormLen, true,
FT_CellFormula);
ScFormulaCell* pCell = NULL;
diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx
index e03980b..16c4ac5 100644
--- a/sc/source/filter/excel/impop.cxx
+++ b/sc/source/filter/excel/impop.cxx
@@ -116,8 +116,9 @@ ImportExcel::ImportExcel( XclImpRootData& rImpData,
SvStream& rStrm ):
maScOleSize( ScAddress::INITIALIZE_INVALID ),
mnLastRefIdx( 0 ),
mnIxfeIndex( 0 ),
-mbBiff2HasXfs( false ),
-mbBiff2HasXfsValid( false )
+mbBiff2HasXfs(false),
+mbBiff2HasXfsValid(false),
+mbRunCLKernelThread(true)
{
nBdshtTab = 0;
diff --git a/sc/source/filter/inc/imp_op.hxx b/sc/source/filter/inc/imp_op.hxx
index 613ae30..6e44f31 100644
--- a/sc/source/filter/inc/imp_op.hxx
+++ b/sc/source/filter/inc/imp_op.hxx
@@ -106,8 +106,6 @@ protected:
sal_Int16 mnLastRefIdx;
sal_uInt16 mnIxfeIndex;/// Current XF identifier from
IXFE record.
-boolmbBiff2HasXfs; /// Select XF formatting or
direct formatting in BIFF2.
-boolmbBiff2HasXfsValid; /// False = mbBiff2HasXfs is
undetermined yet.
SCTAB nBdshtTab; // Counter fuer Boundsheet
ScFormulaCell* pLastFormCell; // fuer String-Records
@@ -115,6 +113,10 @@ protected:
sal_BoolbTabTruncated; // wenn
Bereichsueberschreitung zum
// Abschneiden von Zellen
fuehrt
+bool mbBiff2HasXfs:1; /// Select XF formatting or direct formatting
in BIFF2.
+bool mbBiff2HasXfsValid:1; /// False = mbBiff2HasXfs is undetermined yet.
+bool mbRunCLKernelThread:1;
+
// Record-Funktionen
voidReadFileSharing();
___
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-2' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 751e19cd0274ab210cdf3d1f4d555b2ca5ab8871 Author: Christian Lohmaier Date: Wed Sep 18 02:35:36 2013 +0200 bump product version to 4.1.2.2.0+ Change-Id: I9967fba187bdf6c9c2fcce0b95d8664533cc596a diff --git a/configure.ac b/configure.ac index 3a9466c..8556be8 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.2.1.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[4.1.2.2.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
[Bug 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Bug 54157 depends on bug 58144, which changed state. Bug 58144 Summary: incorrect font used during installation on Windows XP https://bugs.freedesktop.org/show_bug.cgi?id=58144 What|Removed |Added Status|RESOLVED|REOPENED Resolution|WONTFIX |--- -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Cor Nouws changed: What|Removed |Added Depends on||69495 --- Comment #172 from Cor Nouws --- add Bug 69495 - FORMATTING: Turning on and of direct Bold or Italic in one paragraph, changes that attribute in the next paragraph, when the style there does have Bold or Italic (edit) -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/calc-pluggable-opencl' - sc/source
sc/source/core/opencl/formulagroupcl.cxx | 57 +--
1 file changed, 40 insertions(+), 17 deletions(-)
New commits:
commit b5197286f396245c82378be05e9fea4310326eb5
Author: Kohei Yoshida
Date: Tue Sep 17 16:48:20 2013 -0400
Bail out early on error.
Change-Id: I1844284ff829f6af6c2cfe10935cfc1eef155deb
diff --git a/sc/source/core/opencl/formulagroupcl.cxx
b/sc/source/core/opencl/formulagroupcl.cxx
index 5697b1b..139a219 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -308,7 +308,14 @@ bool FormulaGroupInterpreterOpenCL::chooseFunction(
OclCalc &ocl_calc, double *&
pGroundWaterDataArray=NULL;
delta = mdpSvdouble[0];
}
-ocl_calc.oclGroundWaterGroup(
mnOperatorGroup,mnOperatorCount,pGroundWaterDataArray,pArrayToSubtractOneElementFrom,nSrcData,mnRowSize,delta,mnpOclStartPos,mnpOclEndPos,dpResult);
+
+bool bSuccess = ocl_calc.oclGroundWaterGroup(
+mnOperatorGroup, mnOperatorCount, pGroundWaterDataArray,
+pArrayToSubtractOneElementFrom, nSrcData, mnRowSize, delta,
+mnpOclStartPos, mnpOclEndPos, dpResult);
+
+if (!bSuccess)
+return false;
}
else if( isStockHistory() )
{
@@ -332,14 +339,19 @@ bool FormulaGroupInterpreterOpenCL::chooseFunction(
OclCalc &ocl_calc, double *&
{
if (!ocl_calc.createFormulaBuf64Bits(nSrcDataSize, mnRowSize))
return false;
-ocl_calc.mapAndCopy64Bits(
dpOclSrcData,mnpOclStartPos,mnpOclEndPos,nSrcDataSize,mnRowSize );
-ocl_calc.oclHostFormulaStatistics64Bits( mcHostName, dpResult,
mnRowSize );
+if (!ocl_calc.mapAndCopy64Bits(dpOclSrcData, mnpOclStartPos,
mnpOclEndPos, nSrcDataSize, mnRowSize))
+return false;
+if (!ocl_calc.oclHostFormulaStatistics64Bits(mcHostName,
dpResult, mnRowSize))
+return false;
}
else
{
-ocl_calc.createFormulaBuf32Bits( nSrcDataSize, mnPositonLen );
-ocl_calc.mapAndCopy32Bits( dpOclSrcData, mnpOclStartPos,
mnpOclEndPos, nSrcDataSize, mnRowSize);
-ocl_calc.oclHostFormulaStatistics32Bits( mcHostName, dpResult,
mnRowSize );
+if (!ocl_calc.createFormulaBuf32Bits(nSrcDataSize,
mnPositonLen))
+return false;
+if (!ocl_calc.mapAndCopy32Bits(dpOclSrcData, mnpOclStartPos,
mnpOclEndPos, nSrcDataSize, mnRowSize))
+return false;
+if (!ocl_calc.oclHostFormulaStatistics32Bits(mcHostName,
dpResult, mnRowSize))
+return false;
}
}
}
@@ -359,16 +371,21 @@ bool FormulaGroupInterpreterOpenCL::chooseFunction(
OclCalc &ocl_calc, double *&
{
if ( ocl_calc.gpuEnv.mnKhrFp64Flag == 1 ||
ocl_calc.gpuEnv.mnAmdFp64Flag == 1 )
{
-ocl_calc.createArithmeticOptBuf64Bits( mnRowSize );
-ocl_calc.mapAndCopy64Bits(dpLeftData,dpRightData,mnRowSize);
+if (!ocl_calc.createArithmeticOptBuf64Bits(mnRowSize))
+return false;
+if (!ocl_calc.mapAndCopy64Bits(dpLeftData, dpRightData,
mnRowSize))
+return false;
if (!ocl_calc.oclHostArithmeticOperator64Bits(mcHostName,
dpResult, mnRowSize))
return false;
}
else
{
-ocl_calc.createArithmeticOptBuf32Bits( mnRowSize );
-ocl_calc.mapAndCopy32Bits(dpLeftData,dpRightData,mnRowSize);
-ocl_calc.oclHostArithmeticOperator32Bits(
mcHostName,dpResult,mnRowSize );
+if (!ocl_calc.createArithmeticOptBuf32Bits(mnRowSize))
+return false;
+if (!ocl_calc.mapAndCopy32Bits(dpLeftData, dpRightData,
mnRowSize))
+return false;
+if (!ocl_calc.oclHostArithmeticOperator32Bits(mcHostName,
dpResult, mnRowSize))
+return false;
}
}
}
@@ -396,15 +413,21 @@ bool FormulaGroupInterpreterOpenCL::chooseFunction(
OclCalc &ocl_calc, double *&
{
if ( ocl_calc.gpuEnv.mnKhrFp64Flag == 1 ||
ocl_calc.gpuEnv.mnAmdFp64Flag == 1 )
{
-ocl_calc.createMoreColArithmeticBuf64Bits( j * mnRowSize,
mnOperatorCount );
-ocl_calc.mapAndCopyMoreColArithmetic64Bits(
dpMoreColArithmetic, mnRowSize * j, mnOperatorGroup, mnOperatorCount );
-ocl_calc.oclMoreColHostArithmeticOperator64Bits( mnRowSize,
mnOperatorCount, dpResult,mnRowSize );
+if (!ocl_calc.createMoreColArithmeticBuf64Bits(j * mnRowSize,
mnOperatorCount))
+return false;
+if
(!ocl_calc.mapAndCopyMoreColArithmetic64Bits(dpMoreCol
[Libreoffice-commits] core.git: Changes to 'feature/calc-opencl-cache'
New branch 'feature/calc-opencl-cache' available with the following commits: commit 91d261c954d90ad11e3747410c86b05aa725e197 Author: Markus Mohrhard Date: Tue Sep 17 23:04:54 2013 +0200 read the binary files from the cached folder Change-Id: Ifc5084a3d8ef661e3b3fca7fbc76e1c0c62b2056 commit 2f709447c267747be7f0d99bd17a51f5c20e74dc Author: Markus Mohrhard Date: Tue Sep 17 20:30:53 2013 +0200 replace one more file write with location in profile directory Change-Id: I1774f66d018923c6f892d21acf8a81330628cd98 commit 738b73fe5e55b76e57e32a0fdd16bde46d7e5687 Author: Markus Mohrhard Date: Tue Sep 17 19:49:20 2013 +0200 fix another memory leak Change-Id: I6761bcc137934b02815ce10d43f3bc9bee7a1b90 commit 89ee58260d5c7d8867bff95d7eb78bba329502da Author: Markus Mohrhard Date: Tue Sep 17 19:36:09 2013 +0200 fix another memory leak Change-Id: I31359f121fa858dfc1868d74a2f827e5332592c3 commit d6e58a63d81dc7edde5967f2c161f2f68390428f Author: Markus Mohrhard Date: Tue Sep 17 19:31:41 2013 +0200 use $UserInstallation/cache to cache opencl kernels Change-Id: I2ba1fb6172cfd0c725a45d4506b46e8f04a33093 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/calc-pluggable-opencl' - sc/source
sc/source/core/opencl/openclwrapper.cxx | 45
1 file changed, 45 deletions(-)
New commits:
commit a8729e965f140cd0bc2da80ebd1d657b58c6b1ac
Author: Kohei Yoshida
Date: Tue Sep 17 17:26:45 2013 -0400
Oops this wasn't meant to be checked in.
Change-Id: I6eccbd38a44dfaec66718df210884067beaaf30e
diff --git a/sc/source/core/opencl/openclwrapper.cxx
b/sc/source/core/opencl/openclwrapper.cxx
index 7bcd390..2b2f8f7 100644
--- a/sc/source/core/opencl/openclwrapper.cxx
+++ b/sc/source/core/opencl/openclwrapper.cxx
@@ -43,49 +43,6 @@
#define DEVICE_NAME_LENGTH 1024
-
-#include
-#include
-#include
-
-namespace {
-
-class stack_printer
-{
-public:
-explicit stack_printer(const char* msg) :
-msMsg(msg)
-{
-fprintf(stdout, "%s: --begin\n", msMsg.c_str());
-mfStartTime = getTime();
-}
-
-~stack_printer()
-{
-double fEndTime = getTime();
-fprintf(stdout, "%s: --end (duration: %g sec)\n", msMsg.c_str(),
(fEndTime - mfStartTime));
-}
-
-void printTime(int line) const
-{
-double fEndTime = getTime();
-fprintf(stdout, "%s: --(%d) (duration: %g sec)\n", msMsg.c_str(),
line, (fEndTime - mfStartTime));
-}
-
-private:
-double getTime() const
-{
-timeval tv;
-gettimeofday(&tv, NULL);
-return tv.tv_sec + tv.tv_usec / 100.0;
-}
-
-::std::string msMsg;
-double mfStartTime;
-};
-
-}
-
using namespace std;
namespace sc { namespace opencl {
@@ -2795,8 +2752,6 @@ void compileKernels(const OUString* pDeviceId)
if (pDeviceId->isEmpty())
return;
-stack_printer __stack_printer__("sc/opencl::compileKernels");
-fprintf(stdout, "opencl::compileKernels: device = '%s'\n",
rtl::OUStringToOString(*pDeviceId, RTL_TEXTENCODING_UTF8).getStr());
if (!switchOpenclDevice(pDeviceId, false))
return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: unoidl/source
unoidl/source/unoidl-read.cxx |9 ++---
1 file changed, 2 insertions(+), 7 deletions(-)
New commits:
commit b7ae5b5c92d6b02bb89cbd2d560a59b80a5015c2
Author: Stephan Bergmann
Date: Tue Sep 17 22:46:23 2013 +0200
Clean up includes
Change-Id: I784ba245526f6fbf933ee485df1604e82980d931
diff --git a/unoidl/source/unoidl-read.cxx b/unoidl/source/unoidl-read.cxx
index aaab9a8..36aabaf 100644
--- a/unoidl/source/unoidl-read.cxx
+++ b/unoidl/source/unoidl-read.cxx
@@ -17,19 +17,14 @@
#include
#include
-#include "config_version.h"
-#include "osl/endian.h"
#include "osl/file.h"
#include "osl/file.hxx"
#include "osl/process.h"
#include "rtl/process.h"
-#include "rtl/string.h"
-#include "rtl/string.hxx"
-#include "rtl/textenc.h"
-#include "rtl/textcvt.h"
+#include "rtl/ref.hxx"
#include "rtl/ustring.hxx"
-#include "sal/macros.h"
#include "sal/main.h"
+#include "sal/types.h"
#include "unoidl/unoidl.hxx"
namespace {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: unoidl/source
unoidl/source/unoidl-read.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit aa49a5fa0f7eed05665a83a0b2703c760ee24b6c Author: Stephan Bergmann Date: Tue Sep 17 23:16:43 2013 +0200 Missing include Change-Id: I93d35ca7b784fc6d1b228347053ef0f76904f039 diff --git a/unoidl/source/unoidl-read.cxx b/unoidl/source/unoidl-read.cxx index 36aabaf..f9c538b 100644 --- a/unoidl/source/unoidl-read.cxx +++ b/unoidl/source/unoidl-read.cxx @@ -11,6 +11,7 @@ #include #include +#include #include #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/calc-pluggable-opencl' - sc/source
sc/source/core/opencl/formulagroupcl.cxx | 62 +--
sc/source/core/opencl/openclwrapper.cxx | 45 ++
2 files changed, 64 insertions(+), 43 deletions(-)
New commits:
commit 578ac5b901857e9490930512fff676e8567a9666
Author: Kohei Yoshida
Date: Tue Sep 17 17:22:38 2013 -0400
Fix illegal memory access between malloc and memset.
Change-Id: I6f040e48a1a60b8f4fc1f2424a24ff362de9a31e
diff --git a/sc/source/core/opencl/formulagroupcl.cxx
b/sc/source/core/opencl/formulagroupcl.cxx
index 139a219..a311179 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -455,66 +455,54 @@ double * agency::calculate( int nOclOp,int
rowSize,OclCalc &ocl_calc,uint *npOcl
{
case ocAdd:
{
-unsigned int nDataSize = 0;
SourceData *temp = formulaInterprt->srdDataPop();
SourceData *temp2 = formulaInterprt->srdDataPop();
-nDataSize = temp2->getDataSize();
dpLeftData = temp2->getDouleData();
dpRightData = temp->getDouleData();
-nDataSize = temp2->getDataSize();
double *rResult = NULL; // Point to the output data from GPU
-rResult = (double *)malloc( sizeof(double) * nDataSize );
+rResult = (double *)malloc( sizeof(double) * rowSize );
memset(rResult,0,rowSize);
ocl_calc.oclHostArithmeticStash64Bits(
"oclSignedAdd",dpLeftData,dpRightData,rResult,temp->getDataSize() );
-formulaInterprt->srdDataPush( new SourceData(
rResult,nDataSize ) );
+formulaInterprt->srdDataPush( new SourceData( rResult,rowSize
) );
break;
}
case ocSub:
{
-unsigned int nDataSize = 0;
SourceData *temp = formulaInterprt->srdDataPop();
SourceData *temp2 = formulaInterprt->srdDataPop();
-nDataSize = temp2->getDataSize();
dpLeftData = temp2->getDouleData();
dpRightData = temp->getDouleData();
-nDataSize = temp2->getDataSize();
double *rResult = NULL; // Point to the output data from GPU
-rResult = ( double * )malloc( sizeof(double) * nDataSize );
+rResult = ( double * )malloc( sizeof(double) * rowSize );
memset( rResult,0,rowSize );
ocl_calc.oclHostArithmeticStash64Bits(
"oclSignedSub",dpLeftData,dpRightData,rResult,temp->getDataSize() );
-formulaInterprt->srdDataPush( new
SourceData(rResult,nDataSize) );
+formulaInterprt->srdDataPush( new SourceData(rResult,rowSize)
);
break;
}
case ocMul:
{
-unsigned int nDataSize = 0;
SourceData *temp = formulaInterprt->srdDataPop();
SourceData *temp2 = formulaInterprt->srdDataPop();
-nDataSize = temp2->getDataSize();
dpLeftData = temp2->getDouleData();
dpRightData = temp->getDouleData();
-nDataSize = temp2->getDataSize();
double *rResult = NULL; // Point to the output data from GPU
-rResult = (double *)malloc( sizeof(double) * nDataSize );
+rResult = (double *)malloc( sizeof(double) * rowSize );
memset( rResult,0,rowSize );
ocl_calc.oclHostArithmeticStash64Bits(
"oclSignedMul",dpLeftData,dpRightData,rResult,temp->getDataSize() );
-formulaInterprt->srdDataPush( new SourceData(
rResult,nDataSize ) );
+formulaInterprt->srdDataPush( new SourceData( rResult,rowSize
) );
break;
}
case ocDiv:
{
-unsigned int nDataSize = 0;
SourceData *temp = formulaInterprt->srdDataPop();
SourceData *temp2 = formulaInterprt->srdDataPop();
-nDataSize = temp2->getDataSize();
dpLeftData = temp2->getDouleData();
dpRightData = temp->getDouleData();
-nDataSize = temp2->getDataSize();
double *rResult = NULL; // Point to the output data from GPU
-rResult = ( double * )malloc( sizeof(double) * nDataSize );
+rResult = ( double * )malloc( sizeof(double) * rowSize );
memset( rResult,0,rowSize );
ocl_calc.oclHostArithmeticStash64Bits(
"oclSignedDiv",dpLeftData,dpRightData,rResult,temp->getDataSize() );
-formulaInterprt->srdDataPush( new SourceData(
rResult,nDataSize ) );
+formulaInterprt->srdDataPush( new SourceData( rResult,rowSize
) );
break;
}
case ocMax:
@@ -567,66 +555,54 @@ double * agency
Re: XRowLocate::findColumn API definition ambiguities
On Thu, Sep 12, 2013 at 10:45:11AM +0100, Andrzej Hunt wrote: > One thing I've not yet done is update > ucbhelper/source/provider/propertyvalueset.cxx -- ucbhelper isn't linked > against connectivity at the moment so can't make use of the same > dbexception helper stuff -- I could make it throw the SQL Exception > directly as in mysqlc, or link it against connectivity? No idea which is > preferred. connectivity links against ucbhelper; I'm not very optimistic about this kind of circular linking. Possibly the best solution would be to move the "dbexception helper stuff" into another module that is more "low level" in the hierarchy. Possibly into ucbhelper :) -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: unoidl/source
unoidl/source/sourceprovider-parser.y | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
New commits:
commit ce09d2f07efdb9bfefe2c20515ebc3e1922a8c79
Author: Stephan Bergmann
Date: Tue Sep 17 22:34:23 2013 +0200
&& vs. & typos
Change-Id: I7475114158d64b8dbe64cd9d1de3415454c762f4
diff --git a/unoidl/source/sourceprovider-parser.y
b/unoidl/source/sourceprovider-parser.y
index c2e1d7e..b093349 100644
--- a/unoidl/source/sourceprovider-parser.y
+++ b/unoidl/source/sourceprovider-parser.y
@@ -2502,31 +2502,31 @@ serviceProperty:
YYERROR;
}
int att = 0;
- if (($2 && unoidl::detail::FLAG_BOUND) != 0) {
+ if (($2 & unoidl::detail::FLAG_BOUND) != 0) {
att |=
unoidl::AccumulationBasedServiceEntity::Property::ATTRIBUTE_BOUND;
}
- if (($2 && unoidl::detail::FLAG_CONSTRAINED) != 0) {
+ if (($2 & unoidl::detail::FLAG_CONSTRAINED) != 0) {
att |=
unoidl::AccumulationBasedServiceEntity::Property::ATTRIBUTE_CONSTRAINED;
}
- if (($2 && unoidl::detail::FLAG_MAYBEAMBIGUOUS) != 0) {
+ if (($2 & unoidl::detail::FLAG_MAYBEAMBIGUOUS) != 0) {
att |=
unoidl::AccumulationBasedServiceEntity::Property::ATTRIBUTE_MAYBE_AMBIGUOUS;
}
- if (($2 && unoidl::detail::FLAG_MAYBEDEFAULT) != 0) {
+ if (($2 & unoidl::detail::FLAG_MAYBEDEFAULT) != 0) {
att |=
unoidl::AccumulationBasedServiceEntity::Property::ATTRIBUTE_MAYBE_DEFAULT;
}
- if (($2 && unoidl::detail::FLAG_MAYBEVOID) != 0) {
+ if (($2 & unoidl::detail::FLAG_MAYBEVOID) != 0) {
att |=
unoidl::AccumulationBasedServiceEntity::Property::ATTRIBUTE_MAYBE_VOID;
}
- if (($2 && unoidl::detail::FLAG_OPTIONAL) != 0) {
+ if (($2 & unoidl::detail::FLAG_OPTIONAL) != 0) {
att |=
unoidl::AccumulationBasedServiceEntity::Property::ATTRIBUTE_OPTIONAL;
}
- if (($2 && unoidl::detail::FLAG_READONLY) != 0) {
+ if (($2 & unoidl::detail::FLAG_READONLY) != 0) {
att |=
unoidl::AccumulationBasedServiceEntity::Property::ATTRIBUTE_READ_ONLY;
}
- if (($2 && unoidl::detail::FLAG_REMOVABLE) != 0) {
+ if (($2 & unoidl::detail::FLAG_REMOVABLE) != 0) {
att |=
unoidl::AccumulationBasedServiceEntity::Property::ATTRIBUTE_REMOVABLE;
}
- if (($2 && unoidl::detail::FLAG_TRANSIENT) != 0) {
+ if (($2 & unoidl::detail::FLAG_TRANSIENT) != 0) {
att |=
unoidl::AccumulationBasedServiceEntity::Property::ATTRIBUTE_TRANSIENT;
}
switch (t.type) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: i18nlangtag/source
i18nlangtag/source/languagetag/languagetag.cxx | 30 +
1 file changed, 30 insertions(+)
New commits:
commit 19863a06d71996f82b2d7d32408b2b1830890a3a
Author: Eike Rathke
Date: Tue Sep 17 22:19:17 2013 +0200
added getNextOnTheFlyLanguage()
Change-Id: I58eeab0076b5b77b533bf855d3879228fe653658
diff --git a/i18nlangtag/source/languagetag/languagetag.cxx
b/i18nlangtag/source/languagetag/languagetag.cxx
index 5987ffe..93f9823 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -86,6 +86,36 @@ static const KnownTagSet & getKnowns()
}
+/* TODO: this is how on-the-fly LangID assignment will work, now implement
+ * usage and registration. */
+#if 0
+static LanguageType getNextOnTheFlyLanguage()
+{
+static LanguageType nOnTheFlyLanguage = 0;
+osl::MutexGuard aGuard( theMutex::get());
+if (!nOnTheFlyLanguage)
+nOnTheFlyLanguage = MsLangId::makeLangID(
LANGUAGE_ON_THE_FLY_SUB_START, LANGUAGE_ON_THE_FLY_START);
+else
+{
+if (MsLangId::getPrimaryLanguage( nOnTheFlyLanguage) !=
LANGUAGE_ON_THE_FLY_END)
+++nOnTheFlyLanguage;
+else
+{
+LanguageType nSub = MsLangId::getSubLanguage( nOnTheFlyLanguage);
+if (nSub != LANGUAGE_ON_THE_FLY_SUB_END)
+nOnTheFlyLanguage = MsLangId::makeLangID( ++nSub,
LANGUAGE_ON_THE_FLY_START);
+else
+SAL_WARN( "i18nlangtag", "getNextOnTheFlyLanguage: none left!
("
+<< ((LANGUAGE_ON_THE_FLY_END -
LANGUAGE_ON_THE_FLY_START + 1)
+* (LANGUAGE_ON_THE_FLY_SUB_END -
LANGUAGE_ON_THE_FLY_SUB_START + 1))
+<< " consumed?!?)");
+}
+}
+return nOnTheFlyLanguage;
+}
+#endif
+
+
/** A reference holder for liblangtag data de/initialization, one static
instance. Currently implemented such that the first "ref" inits and dtor
(our library deinitialized) tears down.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/i18nlangtag
include/i18nlangtag/lang.h | 45 +++-- 1 file changed, 39 insertions(+), 6 deletions(-) New commits: commit af2abfe3547bf0bfdc52ea2e45a35bbc24342761 Author: Eike Rathke Date: Tue Sep 17 21:43:18 2013 +0200 documentation and define on-the-fly ID ranges Change-Id: I7d42480b0e0d57634647a002c55bd0c3c968bb28 diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h index 9399850..eb2e504 100644 --- a/include/i18nlangtag/lang.h +++ b/include/i18nlangtag/lang.h @@ -54,14 +54,18 @@ And of course 2 lists aren't enough, so Windows Vista needs an extra one. Which at least seems to include values of other versions of Windows. Language Identifier Constants and Strings - http://msdn2.microsoft.com/en-us/library/ms776294.aspx + http://msdn.microsoft.com/en-us/library/ms776294.aspx - Hey, yet another list, maybe this one will not move around? It seems to be - quite complete.. - Language Identifier Constants and Strings (Windows) - http://msdn.microsoft.com/en-us/library/dd318693(VS.85).aspx + ! Hey, yet another list, maybe this one will not move around? It seems to be + ! quite complete.. + ! Language Identifier Constants and Strings (Windows) + ! http://msdn.microsoft.com/en-us/library/dd318693.aspx + ! + ! Use THAT ^^^ as of 2013-09-17 it includes also Windows 8 + For completeness, you can never have enough lists: List of supported locale identifiers in Word + Applies to Microsoft Word 2000 and 2002 http://support.microsoft.com/default.aspx?scid=KB;en-us;q221435 */ @@ -380,7 +384,10 @@ typedef unsigned short LanguageType; *! LANGUAGE_SYSTEM and then to effective system language */ #define LANGUAGE_PROCESS_OR_USER_DEFAULT0x0400 -/* And now the extensions we define, valid from + +/* And now the extensions we define, + * with primary language IDs from 0x200 to 0x3FF valid in blocks from + * * 0x0610 to 0x07FF with sublanguage ID 0x01 (default) * 0x0A00 to 0x0BFF with sublanguage ID 0x02 * ... @@ -390,6 +397,23 @@ typedef unsigned short LanguageType; * 0xFA00 to 0xFBFF with sublanguage ID 0x3E * 0xFE00 to 0x with sublanguage ID 0x3F * + * Of which we define reserved blocks: + * All primary language IDs 0x3E0 to 0x3FF with any sublanguage ID, not to be + * assigned as user-defined IDs: + * + * 0x07E0 to 0x07FF with sublanguage ID 0x01, first on-the-fly block + * 0x0BE0 to 0x0BFF with sublanguage ID 0x02, second on-the-fly block + * ... + * 0x83E0 to 0x83FF with sublanguage ID 0x20 + * 0x87E0 to 0x87FF with sublanguage ID 0x21 + * ... + * 0xFBE0 to 0xFBFF with sublanguage ID 0x3E, last on-the-fly block + * 0xFFE0 to 0x with sublanguage ID 0x3F, 32 privateuse and specials + * + * This leaves room for 480 user-defined primary language IDs (instead of 512) + * with primary bitmask comparability, and 1984 on-the-fly IDs (instead of 0) + * with arbitrary assignment. + * * Obsolete OOo user defines now have other values assigned by MS, and * different name. Mapping an obsolete value to ISO code should work provided * that such a mapping exists in i18nlangtag/source/isolang/isolang.cxx, but @@ -560,6 +584,15 @@ typedef unsigned short LanguageType; #define LANGUAGE_USER_NGAEBERE 0x0689 #define LANGUAGE_USER_ENGLISH_UK_OED0x8C09 /* makeLangID( 0x23, getPrimaryLanguage( LANGUAGE_ENGLISH_UK)) */ + +/* Primary language ID range for on-the-fly assignment. */ +#define LANGUAGE_ON_THE_FLY_START 0x03E0 +#define LANGUAGE_ON_THE_FLY_END 0x03FF +/* Sublanguage ID range for on-the-fly assignment. */ +#define LANGUAGE_ON_THE_FLY_SUB_START 0x01 +#define LANGUAGE_ON_THE_FLY_SUB_END 0x3E + +/* 0xFFE0 to 0x reserved for privateuse and specials. */ #define LANGUAGE_USER_PRIV_JOKER0xFFEB /* privateuse "*" (sic! bad! nasty!), primary 0x3eb, sub 0x3f */ #define LANGUAGE_USER_PRIV_COMMENT 0xFFEC /* privateuse "x-comment", primary 0x3ec, sub 0x3f */ #define LANGUAGE_USER_PRIV_DEFAULT 0xFFED /* privateuse "x-default", primary 0x3ed, sub 0x3f */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/calc-pluggable-opencl' - sc/source
sc/source/filter/inc/workbookhelper.hxx |2 ++
sc/source/filter/oox/formulabuffer.cxx |1 +
sc/source/filter/oox/workbookhelper.cxx | 23 +++
3 files changed, 26 insertions(+)
New commits:
commit deadff983b486f6a73b6630435bed72cc816158b
Author: Kohei Yoshida
Date: Tue Sep 17 15:56:38 2013 -0400
Pre-compile OpenCL kernels during xlsx file load as well.
Change-Id: Id31190b2a9eb496f146fbbeaaf8a223d46492a99
diff --git a/sc/source/filter/inc/workbookhelper.hxx
b/sc/source/filter/inc/workbookhelper.hxx
index e540ba0..9ea2353 100644
--- a/sc/source/filter/inc/workbookhelper.hxx
+++ b/sc/source/filter/inc/workbookhelper.hxx
@@ -275,6 +275,8 @@ public:
/** Returns the codec helper that stores the encoder/decoder object. */
BiffCodecHelper&getCodecHelper() const;
+void compileOpenCLKernels();
+
private:
WorkbookGlobals&mrBookGlob;
};
diff --git a/sc/source/filter/oox/formulabuffer.cxx
b/sc/source/filter/oox/formulabuffer.cxx
index 21e383f..cc8a50a 100644
--- a/sc/source/filter/oox/formulabuffer.cxx
+++ b/sc/source/filter/oox/formulabuffer.cxx
@@ -65,6 +65,7 @@ void FormulaBuffer::finalizeImport()
FormulaDataMap::iterator cellIt = maCellFormulas.find( nTab );
if ( cellIt != maCellFormulas.end() )
{
+compileOpenCLKernels();
applyCellFormulas( cellIt->second );
}
diff --git a/sc/source/filter/oox/workbookhelper.cxx
b/sc/source/filter/oox/workbookhelper.cxx
index 7a9a58f..9ae6fea 100644
--- a/sc/source/filter/oox/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -71,6 +71,8 @@
#include "dbdata.hxx"
#include "datauno.hxx"
#include "globalnames.hxx"
+#include "clkernelthread.hxx"
+#include "rtl/ref.hxx"
#include "formulabuffer.hxx"
#include "vcl/mapmod.hxx"
@@ -223,6 +225,8 @@ public:
/** Returns the codec helper that stores the encoder/decoder object. */
inline BiffCodecHelper& getCodecHelper() { return *mxCodecHelper; }
+void compileOpenCLKernels();
+
private:
/** Initializes some basic members and sets needed document properties. */
voidinitialize( bool bWorkbookFile );
@@ -253,6 +257,8 @@ private:
typedef ::std::auto_ptr< PageSettingsConverter >PageSettConvPtr;
typedef ::std::auto_ptr< BiffCodecHelper > BiffCodecHelperPtr;
+rtl::Reference mxCLKernelThread;
+
OUStringmaCellStyles; /// Style family name for cell
styles.
OUStringmaPageStyles; /// Style family name for page
styles.
OUStringmaCellStyleServ;/// Service name for a cell
style.
@@ -504,6 +510,15 @@ void WorkbookGlobals::useInternalChartDataTable( bool
bInternal )
// private
+void WorkbookGlobals::compileOpenCLKernels()
+{
+if (mxCLKernelThread.is())
+return;
+
+mxCLKernelThread.set(new sc::CLBuildKernelThread);
+mxCLKernelThread->launch();
+}
+
void WorkbookGlobals::initialize( bool bWorkbookFile )
{
maCellStyles = "CellStyles";
@@ -634,6 +649,9 @@ void WorkbookGlobals::finalize()
//ScDocShell::AfterXMLLoading() for ods
getScDocument().SetInsertingFromOtherDoc(false);
getScDocument().RebuildFormulaGroups();
+
+if (mxCLKernelThread.is())
+mxCLKernelThread->join();
}
}
@@ -949,6 +967,11 @@ BiffCodecHelper& WorkbookHelper::getCodecHelper() const
return mrBookGlob.getCodecHelper();
}
+void WorkbookHelper::compileOpenCLKernels()
+{
+mrBookGlob.compileOpenCLKernels();
+}
+
//
} // namespace xls
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/calc-pluggable-opencl' - sc/source
sc/source/core/tool/formulaopt.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f4627848cbeff9226b9d269e43e4008e1283d498 Author: Kohei Yoshida Date: Tue Sep 17 16:10:35 2013 -0400 Wrong config option name. Change-Id: Ibbd2d9ed7ee20b8cc911bb5f3247bade617b7c74 diff --git a/sc/source/core/tool/formulaopt.cxx b/sc/source/core/tool/formulaopt.cxx index 4c926e9..f649927 100644 --- a/sc/source/core/tool/formulaopt.cxx +++ b/sc/source/core/tool/formulaopt.cxx @@ -216,7 +216,7 @@ Sequence ScFormulaCfg::GetPropertyNames() "Load/ODFRecalcMode",// SCFORMULAOPT_ODF_RECALC "Calculation/OpenCL",// SCFORMULAOPT_OPENCL_ENABLED "Calculation/OpenCLAutoSelect", // SCFORMULAOPT_OPENCL_AUTOSELECT -"Calculation/OpenCLDevice" // SCFORMULAOPT_OPENCL_DEVICE +"Calculation/OpenCLAutoDevice" // SCFORMULAOPT_OPENCL_DEVICE }; Sequence aNames(SCFORMULAOPT_COUNT); OUString* pNames = aNames.getArray(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Bug 54157 depends on bug 34987, which changed state. Bug 34987 Summary: Impress disregards Master Slide setting of text area https://bugs.freedesktop.org/show_bug.cgi?id=34987 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/calc-pluggable-opencl' - 4 commits - sc/inc sc/Library_scfilt.mk sc/source
sc/Library_scfilt.mk |2
sc/inc/formulagroup.hxx|1
sc/source/core/opencl/formulagroupcl.cxx |5
sc/source/core/opencl/openclwrapper.cxx| 251 +
sc/source/core/opencl/openclwrapper.hxx|4
sc/source/core/tool/formulagroup.cxx | 19 ++
sc/source/filter/excel/excform.cxx |5
sc/source/filter/excel/read.cxx|6
sc/source/filter/ftools/clkernelthread.cxx | 28 +++
sc/source/filter/inc/clkernelthread.hxx| 26 +++
sc/source/filter/inc/imp_op.hxx|5
11 files changed, 185 insertions(+), 167 deletions(-)
New commits:
commit 945c7e6ab8c36307acb61e807c75d278179a5ed4
Author: Kohei Yoshida
Date: Tue Sep 17 15:14:00 2013 -0400
Let's treat oclMatrixSolve equally. No special treatment for this guy.
Change-Id: I79d36ad7c95bf4cc8cd6bb4fd55dcedd5cd70684
diff --git a/sc/source/core/opencl/openclwrapper.cxx
b/sc/source/core/opencl/openclwrapper.cxx
index ce0f662..7a8b205 100644
--- a/sc/source/core/opencl/openclwrapper.cxx
+++ b/sc/source/core/opencl/openclwrapper.cxx
@@ -125,7 +125,9 @@ const char* pKernelNames[] = {
"oclMaxDiv",
"oclAverageDiv"
"oclMinDiv",
-"oclSub"
+"oclSub",
+
+"oclMatrixSolve"
};
}
@@ -2341,20 +2343,22 @@ bool OclCalc::oclHostMatrixInverse64Bits( const char*
aKernelName, double *dpOcl
}
clStatus = clEnqueueUnmapMemObject( kEnv.mpkCmdQueue, mpClmemLeftData,
dpOclMatrixSrc, 0, NULL, NULL );
CHECK_OPENCL( clStatus, "clEnqueueUnmapMemObject" );
-cl_kernel kernel_solve = clCreateKernel( kEnv.mpkProgram,
"oclMatrixSolve", &clStatus );
-CHECK_OPENCL( clStatus, "clCreateKernel" );
-clStatus = clSetKernelArg( kernel_solve, 0, sizeof(cl_mem), (void
*)&mpClmemLeftData );
+Kernel* pKernelMatrix = fetchKernel("oclMatrixSolve");
+if (!pKernelMatrix)
+return false;
+
+clStatus = clSetKernelArg(pKernel->mpKernel, 0, sizeof(cl_mem), (void
*)&mpClmemLeftData);
CHECK_OPENCL( clStatus, "clSetKernelArg" );
-clStatus = clSetKernelArg( kernel_solve, 1, sizeof(cl_mem), (void
*)&mpClmemRightData );
+clStatus = clSetKernelArg(pKernel->mpKernel, 1, sizeof(cl_mem), (void
*)&mpClmemRightData);
CHECK_OPENCL( clStatus, "clSetKernelArg" );
-clStatus = clSetKernelArg( kernel_solve, 2, sizeof(cl_mem), (void
*)&clpPData );
+clStatus = clSetKernelArg(pKernel->mpKernel, 2, sizeof(cl_mem), (void
*)&clpPData);
CHECK_OPENCL( clStatus, "clSetKernelArg" );
-clStatus = clSetKernelArg( kernel_solve, 3, sizeof(cl_mem), (void
*)&clpYData );
+clStatus = clSetKernelArg(pKernel->mpKernel, 3, sizeof(cl_mem), (void
*)&clpYData);
CHECK_OPENCL( clStatus, "clSetKernelArg" );
-clStatus = clSetKernelArg( kernel_solve, 4, sizeof(cl_mem), (void
*)&clpNData );
+clStatus = clSetKernelArg(pKernel->mpKernel, 4, sizeof(cl_mem), (void
*)&clpNData);
CHECK_OPENCL( clStatus, "clSetKernelArg" );
-clStatus = clEnqueueNDRangeKernel( kEnv.mpkCmdQueue, kernel_solve, 1,
NULL, global_work_size, NULL, 0, NULL, NULL );
+clStatus = clEnqueueNDRangeKernel(kEnv.mpkCmdQueue, pKernel->mpKernel, 1,
NULL, global_work_size, NULL, 0, NULL, NULL);
CHECK_OPENCL( clStatus, "clEnqueueNDRangeKernel" );
clFinish( kEnv.mpkCmdQueue );
for ( uint i = 0; i < nDim; i++ )
@@ -2370,8 +2374,6 @@ bool OclCalc::oclHostMatrixInverse64Bits( const char*
aKernelName, double *dpOcl
clStatus = clReleaseMemObject( mpClmemRightData );
CHECK_OPENCL( clStatus, "clReleaseMemObject" );
mpClmemRightData = NULL;
-clStatus = clReleaseKernel( kernel_solve );
-CHECK_OPENCL( clStatus, "clReleaseKernel" );
clStatus = clReleaseMemObject( clpPData );
CHECK_OPENCL( clStatus, "clReleaseKernel" );
clStatus = clReleaseMemObject( clpYData );
@@ -2453,20 +2455,23 @@ bool OclCalc::oclHostMatrixInverse32Bits( const char*
aKernelName, float *fpOclM
clStatus = clEnqueueUnmapMemObject( kEnv.mpkCmdQueue, mpClmemLeftData,
fpOclMatrixSrc, 0, NULL, NULL );
CHECK_OPENCL( clStatus, "clEnqueueUnmapMemObject" );
-cl_kernel kernel_solve = clCreateKernel( kEnv.mpkProgram,
"oclMatrixSolve", &clStatus );
-CHECK_OPENCL( clStatus, "clCreateKernel" );
-clStatus = clSetKernelArg( kernel_solve, 0, sizeof(cl_mem), (void
*)&mpClmemLeftData );
+Kernel* pKernelMatrix = fetchKernel("oclMatrixSolve");
+if (!pKernelMatrix)
+return false;
+
+clStatus = clSetKernelArg(pKernel->mpKernel, 0, sizeof(cl_mem), (void
*)&mpClmemLeftData);
CHECK_OPENCL( clStatus, "clSetKernelArg" );
-clStatus = clSetKernelArg( kernel_solve, 1, sizeof(cl_mem), (void
*)&mpClmemRightData );
+clStatus = clSetKernelArg(pKernel->mpKernel, 1, sizeof(cl_mem), (void
*)&mpClmemRightData);
CHECK_OPENCL( clStatus, "clSetKernelArg" );
-clStatus = clSetKernelArg( kernel_solve, 2, sizeof(cl_mem), (void
*)&clpPData );
+clStatus = clSe
[Libreoffice-commits] core.git: include/xmloff sc/source xmloff/inc xmloff/source
include/xmloff/xmlexppr.hxx| 11 +++---
sc/source/filter/xml/xmlstyle.cxx |4 +-
sc/source/filter/xml/xmlstyle.hxx |2 +
xmloff/inc/XMLChartPropertySetMapper.hxx |1
xmloff/source/chart/PropertyMaps.cxx |3 +
xmloff/source/draw/sdpropls.cxx|6 ++-
xmloff/source/draw/sdpropls.hxx|2 +
xmloff/source/style/PageMasterExportPropMapper.cxx |3 +
xmloff/source/style/PageMasterExportPropMapper.hxx |1
xmloff/source/style/styleexp.cxx |2 -
xmloff/source/style/xmlexppr.cxx |7 ++-
xmloff/source/text/txtexppr.cxx| 38 -
xmloff/source/text/txtexppr.hxx|2 +
13 files changed, 53 insertions(+), 29 deletions(-)
New commits:
commit d87cb77b42b591b1333aacd60e107514d6e20864
Author: Caolán McNamara
Date: Wed Sep 4 15:35:18 2013 +0100
Resolves: fdo#68431 style:font-name unknown in non autostyles in
impress/draw
Change-Id: Ib904af4fac5659821ba3b5dbbf62370df8243001
Reviewed-on: https://gerrit.libreoffice.org/5810
Reviewed-by: Pierre-Eric Pelloux-Prayer
Tested-by: Pierre-Eric Pelloux-Prayer
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/include/xmloff/xmlexppr.hxx b/include/xmloff/xmlexppr.hxx
index b63b69c..28f8372 100644
--- a/include/xmloff/xmlexppr.hxx
+++ b/include/xmloff/xmlexppr.hxx
@@ -55,10 +55,11 @@ protected:
::std::vector< XMLPropertyState > _Filter(
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > rPropSet,
-const sal_Bool bDefault ) const;
+bool bDefault, bool bDisableFoFontFamily) const;
/** Application-specific filter. By default do nothing. */
virtual void ContextFilter(
+bool bEnableFoFontFamily,
::std::vector< XMLPropertyState >& rProperties,
::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > rPropSet ) const;
@@ -107,8 +108,8 @@ public:
filter-processes. */
::std::vector< XMLPropertyState > Filter(
const ::com::sun::star::uno::Reference<
-::com::sun::star::beans::XPropertySet > rPropSet ) const
-{ return _Filter(rPropSet, sal_False); }
+::com::sun::star::beans::XPropertySet > rPropSet, bool
bEnableFoFontFamily = false) const
+{ return _Filter(rPropSet, false, bEnableFoFontFamily); }
/** Like Filter(), except that:
* - only properties that have the map flag MID_FLAG_DEFAULT_ITEM_EXPORT
@@ -117,8 +118,8 @@ public:
*/
::std::vector< XMLPropertyState > FilterDefaults(
const ::com::sun::star::uno::Reference<
-::com::sun::star::beans::XPropertySet > rPropSet ) const
-{ return _Filter(rPropSet, sal_True); }
+::com::sun::star::beans::XPropertySet > rPropSet, bool
bEnableFoFontFamily = false) const
+{ return _Filter(rPropSet, true, bEnableFoFontFamily); }
/** Compare to arrays of XMLPropertyState */
sal_Bool Equals( const ::std::vector< XMLPropertyState >& aProperties1,
diff --git a/sc/source/filter/xml/xmlstyle.cxx
b/sc/source/filter/xml/xmlstyle.cxx
index e43ca7f..e2bd28f 100644
--- a/sc/source/filter/xml/xmlstyle.cxx
+++ b/sc/source/filter/xml/xmlstyle.cxx
@@ -186,6 +186,7 @@
ScXMLCellExportPropertyMapper::~ScXMLCellExportPropertyMapper()
}
void ScXMLCellExportPropertyMapper::ContextFilter(
+bool bEnableFoFontFamily,
::std::vector< XMLPropertyState >& rProperties,
uno::Reference< beans::XPropertySet > rPropSet ) const
{
@@ -503,7 +504,7 @@ void ScXMLCellExportPropertyMapper::ContextFilter(
pDiagonalBLTRWidthState->maValue.clear();
}
-SvXMLExportPropertyMapper::ContextFilter(rProperties, rPropSet);
+SvXMLExportPropertyMapper::ContextFilter(bEnableFoFontFamily, rProperties,
rPropSet);
}
/** this method is called for every item that has the
MID_FLAG_SPECIAL_ITEM_EXPORT flag set */
@@ -553,6 +554,7 @@
ScXMLRowExportPropertyMapper::~ScXMLRowExportPropertyMapper()
}
void ScXMLRowExportPropertyMapper::ContextFilter(
+bool /* bEnableFoFontFamily */,
::std::vector< XMLPropertyState >& /* rProperties */,
uno::Reference< beans::XPropertySet > /* rPropSet */ ) const
{
diff --git a/sc/source/filter/xml/xmlstyle.hxx
b/sc/source/filter/xml/xmlstyle.hxx
index 344bed8..4dc79a2 100644
--- a/sc/source/filter/xml/xmlstyle.hxx
+++ b/sc/source/filter/xml/xmlstyle.hxx
@@ -106,6 +106,7 @@ class ScXMLCellExportPropertyMapper : public
SvXMLExportPropertyMapper
protected:
/** Application-specific filter. By default do nothing. */
virtual void ContextFilter(
+bool bEnableFoFontFamily,
[Libreoffice-commits] core.git: 2 commits - configure.ac scp2/InstallScript_setup_osl.mk scp2/Module_scp2.mk scp2/source setup_native/Module_setup_native.mk
configure.ac |1 - scp2/InstallScript_setup_osl.mk|2 +- scp2/Module_scp2.mk|2 +- scp2/source/activex/file_activex.scp |4 scp2/source/activex/module_activex.scp |4 setup_native/Module_setup_native.mk|2 +- 6 files changed, 3 insertions(+), 12 deletions(-) New commits: commit b6fc0ac84ce68586393784713693cc6b658a2785 Author: Matúš Kukan Date: Tue Sep 17 20:28:13 2013 +0200 remove WITH_ACTIVEX_COMPONENT Change-Id: I3320b3ce3307598a479dfac5b120e85441c670dc diff --git a/configure.ac b/configure.ac index bf78f35..fda58df 100644 --- a/configure.ac +++ b/configure.ac @@ -3065,7 +3065,6 @@ if test "$_os" = "WINNT" -a "$WITH_MINGW" != yes; then AC_MSG_CHECKING([whether to use ActiveX]) if test "$enable_activex" = "yes" -o "$enable_activex" = ""; then DISABLE_ACTIVEX="" -SCPDEFS="$SCPDEFS -DWITH_ACTIVEX_COMPONENT" AC_MSG_RESULT([yes]) else DISABLE_ACTIVEX="TRUE" diff --git a/scp2/InstallScript_setup_osl.mk b/scp2/InstallScript_setup_osl.mk index 72c789d..75f2a8c2 100644 --- a/scp2/InstallScript_setup_osl.mk +++ b/scp2/InstallScript_setup_osl.mk @@ -26,7 +26,7 @@ $(eval $(call gb_InstallScript_use_modules,setup_osl,\ scp2/writer \ scp2/xsltfilter \ $(if $(filter WNT,$(OS)),\ - scp2/activex \ + $(if $(DISABLE_ACTIVEX),,scp2/activex) \ scp2/quickstart \ scp2/windows \ $(if $(filter MSC,$(COM)),\ diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk index bd30477..05911c5 100644 --- a/scp2/Module_scp2.mk +++ b/scp2/Module_scp2.mk @@ -37,7 +37,7 @@ $(eval $(call gb_Module_add_targets,scp2,\ InstallScript_sdkoo \ ) \ $(if $(filter WNT,$(OS)),\ - InstallModule_activex \ + $(if $(DISABLE_ACTIVEX),,InstallModule_activex) \ InstallModule_quickstart \ InstallModule_windows \ $(if $(filter MSC,$(COM)),\ diff --git a/scp2/source/activex/file_activex.scp b/scp2/source/activex/file_activex.scp index c710aba..e6864b8 100644 --- a/scp2/source/activex/file_activex.scp +++ b/scp2/source/activex/file_activex.scp @@ -18,8 +18,6 @@ #include "macros.inc" -#ifdef WITH_ACTIVEX_COMPONENT - File gid_File_Lib_Soactivex LIB_FILE_BODY; Styles = (PACKED); @@ -36,5 +34,3 @@ End ComponentCondition = "VersionNT64"; End #endif - -#endif // WITH_ACTIVEX_COMPONENT diff --git a/scp2/source/activex/module_activex.scp b/scp2/source/activex/module_activex.scp index 78b8954..e56ced7 100644 --- a/scp2/source/activex/module_activex.scp +++ b/scp2/source/activex/module_activex.scp @@ -19,8 +19,6 @@ #include "macros.inc" #include "AutoInstall/activexbinarytable" -#ifdef WITH_ACTIVEX_COMPONENT - Module gid_Module_Optional_Activexcontrol PackageInfo = "packinfo_office.txt"; MOD_NAME_DESC ( MODULE_OPTIONAL_ACTIVEXCONTROL ); @@ -33,5 +31,3 @@ Module gid_Module_Optional_Activexcontrol gid_File_Lib_Soactivex64, gid_File_Lib_Regpatchactivex_Msi); End - -#endif // WITH_ACTIVEX_COMPONENT commit f3464f5e0918152d8ff1552ed4932523990b2b79 Author: Korrawit Pruegsanusak Date: Sun Sep 15 23:02:25 2013 +0700 no need for Library_regactivex in --disable-activex build as stated on Repository.mk Change-Id: Id88c9d1eae27754f10246004ac8d8ae6326ae143 diff --git a/setup_native/Module_setup_native.mk b/setup_native/Module_setup_native.mk index b74ac08..3daff3f 100644 --- a/setup_native/Module_setup_native.mk +++ b/setup_native/Module_setup_native.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Module_add_targets,setup_native,\ Library_instooofiltmsi \ Library_qslnkmsi \ Library_reg4allmsdoc \ - Library_regactivex \ + $(if $(DISABLE_ACTIVEX),,Library_regactivex) \ Library_regpatchactivex \ Library_sdqsmsi \ Library_sellangmsi \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/calc-pluggable-opencl' - sc/source
sc/source/core/opencl/openclwrapper.cxx |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 11c186dea7087f60d7ae74b25ad8531ba7ed801c
Author: Kohei Yoshida
Date: Tue Sep 17 15:18:01 2013 -0400
Compiler warning.
Change-Id: Ibf3d21d2666b5c2504804141200ea0fcf9897565
diff --git a/sc/source/core/opencl/openclwrapper.cxx
b/sc/source/core/opencl/openclwrapper.cxx
index 7a8b205..2b2f8f7 100644
--- a/sc/source/core/opencl/openclwrapper.cxx
+++ b/sc/source/core/opencl/openclwrapper.cxx
@@ -56,11 +56,14 @@ namespace {
OString generateHashForSource()
{
-size_t nLength = strlen(kernel_src);
sal_uInt8 pBuffer[RTL_DIGEST_LENGTH_MD5];
+
+#ifndef NDEBUG
+size_t nLength = strlen(kernel_src);
rtlDigestError aError = rtl_digest_MD5(kernel_src, nLength,
pBuffer, RTL_DIGEST_LENGTH_MD5);
assert(aError == rtl_Digest_E_None);
+#endif
OStringBuffer aBuffer;
const char* pString = "0123456789ABCDEF";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/inc sfx2/Library_qstart_gtk.mk sfx2/Library_sfx.mk sfx2/source svtools/inc svtools/Library_svt.mk svtools/source
sfx2/Library_qstart_gtk.mk |1 - sfx2/Library_sfx.mk |2 -- sfx2/inc/bluthsndapi.hxx |2 +- sfx2/inc/pch/precompiled_sfx.hxx | 16 sfx2/source/control/thumbnailviewitem.cxx|2 +- sfx2/source/dialog/dinfdlg.cxx |4 ++-- sfx2/source/dialog/documentfontsdialog.cxx |2 +- sfx2/source/dialog/securitypage.cxx |2 +- sfx2/source/dialog/taskpane.cxx |4 ++-- sfx2/source/dialog/titledockwin.cxx |2 +- sfx2/source/doc/zoomitem.cxx |2 +- sfx2/source/sidebar/ControlFactory.cxx |2 +- sfx2/source/sidebar/ControllerItem.cxx |2 +- sfx2/source/sidebar/EnumContext.cxx |2 +- sfx2/source/sidebar/SidebarController.cxx|2 +- sfx2/source/sidebar/TabBar.cxx |2 +- svtools/Library_svt.mk |1 - svtools/inc/pch/precompiled_svt.hxx | 12 ++-- svtools/source/control/toolbarmenuimp.hxx|2 +- svtools/source/dialogs/PlaceEditDialog.cxx |4 ++-- svtools/source/dialogs/ServerDetailsControls.cxx |4 ++-- svtools/source/filter/DocumentToGraphicRenderer.cxx |2 +- svtools/source/filter/GraphicExportOptionsDialog.cxx |2 +- svtools/source/misc/bindablecontrolhelper.cxx|2 +- svtools/source/misc/transfer.cxx |2 +- 25 files changed, 38 insertions(+), 42 deletions(-) New commits: commit e95b076744da8911b2804501b418649a9147e3a9 Author: Marcos Paulo de Souza Date: Tue Sep 17 08:52:21 2013 -0300 fdo#63926: remove extra include paths in svtools/ and sfx2/ Change-Id: I0b47849ba0fa0dfaf4a481779a5ece09be496c1e Reviewed-on: https://gerrit.libreoffice.org/5973 Reviewed-by: Michael Stahl Tested-by: Michael Stahl diff --git a/sfx2/Library_qstart_gtk.mk b/sfx2/Library_qstart_gtk.mk index 2090658..a16dbd3 100644 --- a/sfx2/Library_qstart_gtk.mk +++ b/sfx2/Library_qstart_gtk.mk @@ -23,7 +23,6 @@ $(eval $(call gb_Library_Library,qstart_gtk)) $(eval $(call gb_Library_set_include,qstart_gtk,\ $$(INCLUDE) \ -I$(SRCDIR)/sfx2/inc \ --I$(SRCDIR)/include/sfx2/ \ )) $(eval $(call gb_Library_use_sdk_api,qstart_gtk)) diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index a95e2b7..46ed25d 100644 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -33,7 +33,6 @@ $(eval $(call gb_Library_use_sdk_api,sfx)) $(eval $(call gb_Library_set_include,sfx,\ -I$(SRCDIR)/sfx2/inc \ --I$(SRCDIR)/include/sfx2/ \ -I$(SRCDIR)/sfx2/source/inc \ -I$(WORKDIR)/SdiTarget/sfx2/sdi \ $$(INCLUDE) \ @@ -306,7 +305,6 @@ $(eval $(call gb_SdiTarget_SdiTarget,sfx2/sdi/sfxslots,sfx2/sdi/sfx)) $(eval $(call gb_SdiTarget_set_include,sfx2/sdi/sfxslots,\ $$(INCLUDE) \ --I$(SRCDIR)/include/sfx2/ \ -I$(SRCDIR)/sfx2/inc \ -I$(SRCDIR)/sfx2/sdi \ )) diff --git a/sfx2/inc/bluthsndapi.hxx b/sfx2/inc/bluthsndapi.hxx index abd9e42..6a190d2 100644 --- a/sfx2/inc/bluthsndapi.hxx +++ b/sfx2/inc/bluthsndapi.hxx @@ -16,7 +16,7 @@ #include #include #include "sfx2/dllapi.h" -#include "mailmodelapi.hxx" +#include // class SfxBluetoothModel_Impl --- diff --git a/sfx2/inc/pch/precompiled_sfx.hxx b/sfx2/inc/pch/precompiled_sfx.hxx index ac79cc3..7d293f1 100644 --- a/sfx2/inc/pch/precompiled_sfx.hxx +++ b/sfx2/inc/pch/precompiled_sfx.hxx @@ -76,9 +76,9 @@ #include "cppuhelper/factory.hxx" #include "cppuhelper/implementationentry.hxx" #include "cppuhelper/interfacecontainer.hxx" -#include "dinfedt.hxx" +#include #include "i18nlangtag/languagetag.hxx" -#include "imagemgr.hxx" +#include #include "officecfg/Office/Common.hxx" #include "osl/diagnose.h" #include "osl/mutex.hxx" @@ -88,15 +88,15 @@ #include "sal/config.h" #include "sal/types.h" #include "sax/tools/converter.hxx" -#include "sfxresid.hxx" -#include "sidebar/ControlFactory.hxx" -#include "sidebar/ControllerItem.hxx" -#include "sidebar/EnumContext.hxx" +#include +#include +#include +#include #include "sot/storage.hxx" #include "svl/urihelper.hxx" #include "svtools/htmlkywd.hxx" #include "svtools/treelistentry.hxx" -#include "thumbnailview.hxx" +#include #include "toolkit/awt/vclxdevice.hxx" #include "tools/datetime.hxx" #include "tools/debug.hxx" @@ -613,7 +613,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sfx2/source/control/thumbnailviewitem.cxx b/sfx2/source/control/thumbnailviewitem.cxx index b8b4bd3..b2beb6d 100644 --- a/sfx2/source/control/thumbnailviewitem.cxx +++ b/sfx2/source/control/thumbnailviewitem.cxx @@ -19,7 +19,7 @@ #include -#include "thumbnailview.hxx" +#include #include
[Libreoffice-commits] core.git: 4 commits - config_host.mk.in configure.ac desktop/source instsetoo_native/CustomTarget_setup.mk instsetoo_native/Package_setup.mk Makefile.in README.cross sal/osl sole
Makefile.in| 12
README.cross |6
config_host.mk.in |2
configure.ac | 31 -
desktop/source/app/app.cxx | 24 -
instsetoo_native/CustomTarget_setup.mk |6
instsetoo_native/Package_setup.mk |2
sal/osl/unx/file_url.cxx | 32 -
solenv/README |5
solenv/bin/linkoo | 602 -
solenv/bin/ooinstall | 13
solenv/gbuild/Library.mk |2
12 files changed, 27 insertions(+), 710 deletions(-)
New commits:
commit 5522d9aebe53952805ab24b8ffee30df439daa40
Author: Matúš Kukan
Date: Tue Sep 17 09:34:52 2013 +0200
do not copy invalid, merged libraries to instdir
Change-Id: I7f8e12530344e23e9bc68510795e90640ea8fd43
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 9064a08..2c2d5ca 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -86,7 +86,7 @@ $(call gb_Library_get_clean_target,$(1)) : $(call
gb_LinkTarget_get_clean_target
$(call gb_Library_get_clean_target,$(1)) : AUXTARGETS :=
$(call gb_Library_Library_platform,$(1),$(2),$(gb_Library_DLLDIR)/$(call
gb_Library_get_dllname,$(1)))
-$(if $(call gb_Library_get_instdir,$(1)),\
+$(if $(and $(call gb_Library_get_instdir,$(1)),$(filter-out
$(gb_MERGEDLIBS),$(1))),\
$(call gb_Library__install,$(call gb_Library__get_final_target,$(1)), \
$(call gb_Library_get_install_target,$(1)), \
$(gb_Library_DLLDIR)/$(call gb_Library_get_runtime_filename,$(1)), \
commit b900b6ed25123cce890aa7ab4bdd59e35a6223a7
Author: Matúš Kukan
Date: Tue Sep 17 18:57:52 2013 +0200
Revert "fix-linkoo.diff: Fix linkoo to work again."
This reverts commit 904e5801aea86a79d6256fcbc3cfdba4535ca8a9.
We don't use linkoo and SAL_ALLOW_LINKOO_SYMLINKS anymore.
Conflicts:
sal/osl/unx/file_url.cxx
Change-Id: I1a0211295afef79f72356677d9b3bc6c5211d496
diff --git a/sal/osl/unx/file_url.cxx b/sal/osl/unx/file_url.cxx
index 1400216..5a1dd2b 100644
--- a/sal/osl/unx/file_url.cxx
+++ b/sal/osl/unx/file_url.cxx
@@ -624,37 +624,7 @@ oslFileError osl_getAbsoluteFileURL(rtl_uString*
ustrBaseDirURL, rtl_uString* u
}
rtl::OUString resolved_path;
-
-static bool allow_symlinks = getenv("SAL_ALLOW_LINKOO_SYMLINKS") != 0;
-// getenv is not thread safe, so minimize use of result
-if (!allow_symlinks)
-{
-rc = (FileBase::RC) osl_getAbsoluteFileURL_impl_(unresolved_path,
resolved_path);
-}
-else
-{
-// SAL_ALLOW_LINKOO_SYMLINKS environment variable:
-// for linkoo to work, we need to let the symlinks to the libraries
untouched
-rtl::OUString base;
-sal_Int32 last_slash = unresolved_path.lastIndexOf( '/' );
-
-if (last_slash >= 0 && last_slash + 1 < unresolved_path.getLength()
-&& ! ( last_slash + 2 == unresolved_path.getLength() &&
unresolved_path.matchAsciiL(RTL_CONSTASCII_STRINGPARAM("."), last_slash + 1) )
-&& ! ( last_slash + 3 == unresolved_path.getLength() &&
unresolved_path.matchAsciiL(RTL_CONSTASCII_STRINGPARAM(".."), last_slash + 1) ))
-{
-base = unresolved_path.copy(last_slash+1);
-unresolved_path = unresolved_path.copy(0, last_slash);
-}
-
-rc = (FileBase::RC) osl_getAbsoluteFileURL_impl_(unresolved_path,
resolved_path);
-
-if (!base.isEmpty())
-{
-resolved_path += "/";
-resolved_path += base;
-}
-}
-
+rc = (FileBase::RC) osl_getAbsoluteFileURL_impl_(unresolved_path,
resolved_path);
if (FileBase::E_None == rc)
{
rc = (FileBase::RC) osl_getFileURLFromSystemPath(resolved_path.pData,
pustrAbsoluteURL);
commit 9759bbde8939263fb308f7f8a7315354945f859b
Author: Matúš Kukan
Date: Tue Sep 17 18:49:33 2013 +0200
Revert "warn if people havn't source the environment after linkoo"
This reverts commit b0eeac20a1c1db422eaf152c353a4101cb200de9.
Linkoo is now dead, whatever the problem was.
Conflicts:
desktop/source/app/app.cxx
Change-Id: Ic8fce7db9ac8b5e9661b2b767bfba9f7cdd84e9a
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 70036d7..2e3ee0e 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1325,23 +1325,6 @@ void Desktop::AppEvent( const ApplicationEvent&
rAppEvent )
HandleAppEvent( rAppEvent );
}
-namespace {
-void SetDocumentExtendedStyle( const Reference<
::com::sun::star::awt::XWindow > &xContainerWindow )
-{
-// set the WB_EXT_DOCUMENT style. Normally, this is done by the
TaskCreator service when a "_blank"
-// frame/window is created. Since we do not use the TaskCreator here,
we need to mimic its behavior,
-// otherwise documents loaded i
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/style/impastpl.cxx | 76 +++
xmloff/source/style/impastpl.hxx | 10 ++---
2 files changed, 43 insertions(+), 43 deletions(-)
New commits:
commit b94e46ca4950816e675d0c770d0113d6e3fc2ef8
Author: Tor Lillqvist
Date: Tue Sep 17 20:58:26 2013 +0300
If it is a set, don't call it a list, that just confuses the reader
Change-Id: I1d80c2ee463a0253e7e3a84331106006316c1ea6
diff --git a/xmloff/source/style/impastpl.cxx b/xmloff/source/style/impastpl.cxx
index d03ca31..9b54e94 100644
--- a/xmloff/source/style/impastpl.cxx
+++ b/xmloff/source/style/impastpl.cxx
@@ -57,7 +57,7 @@ XMLAutoStyleFamily::~XMLAutoStyleFamily() {}
void XMLAutoStyleFamily::ClearEntries()
{
-maParents.clear();
+maParentSet.clear();
}
// Class SvXMLAutoStylePoolProperties_Impl
@@ -77,7 +77,7 @@ XMLAutoStylePoolProperties::XMLAutoStylePoolProperties(
XMLAutoStyleFamily& rFam
sBuffer.append( OUString::number( rFamilyData.mnName ) );
msName = sBuffer.makeStringAndClear();
}
-while (rFamilyData.maNameList.find(msName) !=
rFamilyData.maNameList.end());
+while (rFamilyData.maNameSet.find(msName) != rFamilyData.maNameSet.end());
}
bool operator<( const XMLAutoStyleFamily& r1, const XMLAutoStyleFamily& r2)
@@ -155,7 +155,7 @@ sal_Bool XMLAutoStylePoolParent::AddNamed(
XMLAutoStyleFamily& rFamilyData, cons
}
}
-if (rFamilyData.maNameList.find(rName) == rFamilyData.maNameList.end())
+if (rFamilyData.maNameSet.find(rName) == rFamilyData.maNameSet.end())
{
XMLAutoStylePoolProperties* pProperties =
new XMLAutoStylePoolProperties( rFamilyData, rProperties );
@@ -238,8 +238,8 @@ void SvXMLAutoStylePoolP_Impl::AddFamily(
#if OSL_DEBUG_LEVEL > 0
XMLAutoStyleFamily aTemporary( nFamily );
-FamilyListType::iterator aFind = maFamilyList.find(aTemporary);
-if( aFind != maFamilyList.end() )
+FamilySetType::iterator aFind = maFamilySet.find(aTemporary);
+if( aFind != maFamilySet.end() )
{
// FIXME: do we really intend to replace the previous nFamily
// entry in this case ?
@@ -252,7 +252,7 @@ void SvXMLAutoStylePoolP_Impl::AddFamily(
#endif
XMLAutoStyleFamily *pFamily = new XMLAutoStyleFamily( nFamily, rStrName,
rMapper, aPrefix, bAsFamily );
-maFamilyList.insert(pFamily);
+maFamilySet.insert(pFamily);
}
void SvXMLAutoStylePoolP_Impl::SetFamilyPropSetMapper(
@@ -261,8 +261,8 @@ void SvXMLAutoStylePoolP_Impl::SetFamilyPropSetMapper(
{
XMLAutoStyleFamily aTemporary( nFamily );
-FamilyListType::iterator aFind = maFamilyList.find(aTemporary);
-if (aFind != maFamilyList.end())
+FamilySetType::iterator aFind = maFamilySet.find(aTemporary);
+if (aFind != maFamilySet.end())
aFind->mxMapper = rMapper;
}
@@ -270,11 +270,11 @@ void SvXMLAutoStylePoolP_Impl::SetFamilyPropSetMapper(
void SvXMLAutoStylePoolP_Impl::RegisterName( sal_Int32 nFamily, const
OUString& rName )
{
XMLAutoStyleFamily aTmp( nFamily );
-FamilyListType::iterator aFind = maFamilyList.find(aTmp);
-DBG_ASSERT( aFind != maFamilyList.end(),
+FamilySetType::iterator aFind = maFamilySet.find(aTmp);
+DBG_ASSERT( aFind != maFamilySet.end(),
"SvXMLAutoStylePool_Impl::RegisterName: unknown family" );
-if (aFind != maFamilyList.end())
-aFind->maNameList.insert(rName);
+if (aFind != maFamilySet.end())
+aFind->maNameSet.insert(rName);
}
//
@@ -290,12 +290,12 @@ void SvXMLAutoStylePoolP_Impl::GetRegisteredNames(
vector aNames;
// iterate over families
-for (FamilyListType::iterator aJ = maFamilyList.begin(); aJ !=
maFamilyList.end(); ++aJ)
+for (FamilySetType::iterator aJ = maFamilySet.begin(); aJ !=
maFamilySet.end(); ++aJ)
{
XMLAutoStyleFamily &rFamily = *aJ;
// iterate over names
-for (XMLAutoStyleFamily::NameSetType::const_iterator aI =
rFamily.maNameList.begin(); aI != rFamily.maNameList.end(); ++aI)
+for (XMLAutoStyleFamily::NameSetType::const_iterator aI =
rFamily.maNameSet.begin(); aI != rFamily.maNameSet.end(); ++aI)
{
aFamilies.push_back( rFamily.mnFamily );
aNames.push_back( *aI );
@@ -320,20 +320,20 @@ bool SvXMLAutoStylePoolP_Impl::Add(
const ::std::vector< XMLPropertyState >& rProperties, bool bDontSeek )
{
XMLAutoStyleFamily aTemporary( nFamily );
-FamilyListType::iterator aFind = maFamilyList.find(aTemporary);
-DBG_ASSERT(aFind != maFamilyList.end(), "SvXMLAutoStylePool_Impl::Add:
unknown family");
+FamilySetType::iterator aFind = maFamilySet.find(aTemporary);
+DBG_ASSERT(aFind != maFamilySet.end(), "SvXMLAutoStylePool_Impl::Add:
unknown family");
-if (aFind == maFamilyList.end())
+if (aFind == maFamilySet.end())
return false;
XMLAutoStyleFamily &rFamily = *aFind;
XMLAutoStylePoolParent aTmp(rParentName)
Re: [ANN] feature/instdir pushed to master
On 16 September 2013 09:43, Miklos Vajna wrote: > On Mon, Sep 16, 2013 at 09:39:09AM +0200, Matúš Kukan > wrote: >> I bet, that's because you don't use --disable-linkoo. >> linkoo is broken for sure. > > Sure, I have it enabled, as it's enabled by default. > >> I will post to gerrit patch removing it later if nobody beats me to it. linkoo died in http://cgit.freedesktop.org/libreoffice/core/commit/?id=f5b840a3ee14a2086647596246d3491a58bf33bb > Also, if linkoo doesn't work on master anymore, probably > > https://wiki.documentfoundation.org/Development/BuildingOnLinux > > should be updated as well: it suggests dev-install + debugrun, but > debugrun launches soffice from instdir, so I guess dev-install shouldn't > be advertised anymore. Yes, wiki needs to be updated, it's just not worth to do it now I think, because there will be more changes soon. Best, Matus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: scaddins/source
scaddins/source/analysis/analysishelper.cxx | 72
1 file changed, 52 insertions(+), 20 deletions(-)
New commits:
commit bb15aeb0bbd063e557f21c4edde03949c66173fd
Author: Lionel Elie Mamane
Date: Tue Sep 17 19:13:11 2013 +0200
fdo#40100 make function YEARFRAC comply with ODF Version 1.2
example of wrong result:
=YEARFRAC(DATE(2023;1;1);DATE(2024;1;1);1)
Pretty much by definition, this should be exactly 1,
but it currently returns slightly less.
Change-Id: I5ebb2ecde49dfca8a6191d2a7c11b9581669f455
diff --git a/scaddins/source/analysis/analysishelper.cxx
b/scaddins/source/analysis/analysishelper.cxx
index 85eff90..33c035f 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -437,6 +437,7 @@ sal_Int32 GetDaysInYear( sal_Int32 nNullDate, sal_Int32
nDate, sal_Int32 nMode )
//fdo40100 toDo: make function fully compliant with ODFF1.2
+// LEM: I fixed case nMode==1; anything else to fix?
/**
* Function GetYearFrac implements YEARFRAC as defined in:
* Open Document Format for Office Applications version 1.2 Part 2, par.
6.10.24
@@ -522,7 +523,8 @@ double GetYearFrac( sal_Int32 nNullDate, sal_Int32
nStartDate, sal_Int32 nEndDat
break;
case 1: // 1=exact/exact
{
-bool isYearDifferent = ( nYear1 != nYear2 );
+const bool isYearDifferent = ( nYear1 != nYear2 );
+// ODFv1.2 part 2 section 4.11.7.7.7
if ( isYearDifferent &&
( ( nYear2 != nYear1 + 1 ) ||
( nMonth1 < nMonth2 ) ||
@@ -535,32 +537,62 @@ double GetYearFrac( sal_Int32 nNullDate, sal_Int32
nStartDate, sal_Int32 nEndDat
nDaysInYear = ( double ) nDayCount / ( double ) ( nYear2 -
nYear1 + 1 );
}
+// we take advantage of the fact that (ODFv1.2 part 2)
4.11.7.7.9
+// 4.11.7.7.10 can be permuted without changing the end result
+// ODFv1.2 part 2 section 4.11.7.7.8 and 4.11.7.7.10
+else if ( ( isYearDifferent && IsLeapYear( nYear1 ) ) ||
+ ( nMonth2 == 2 && nDay2 == 29) )
+{
+nDaysInYear = 366;
+}
else
{
-if ( isYearDifferent && IsLeapYear( nYear1 ) )
+// ODFv1.2 part 2 section 4.11.7.7.9:
+// we need to determine whether there is a 29 February
+// between nDate1 and nDate2
+// LEM FIXME: I have a doubt concerning nDate1 == "29
February "
+//In this case, is the "29 February "
between nDate1 and nDate2
+//in the meaning of ODFv1.2 part 2, section
4.11.7.7.9?
+//I assume "no", since if "between" is to be
understood as "inclusive"
+//then 4.11.7.7.10 has no point.
+//OTOH, it could theoretically be possible
that "between"
+//is to be understood as "inclusive the lower
bound, exclusive in upper bound".
+
+assert(nYear1 == nYear2 || nYear1 + 1 == nYear2);
+// as a consequence, nYearDifferent iff nYear2 == nYear +
1, and
+// there are only two possible 29 Februaries to consider:
+// "29 February nYear1" and "29 February nYear2"
+
+// nDate2=="29 February " is handled above and the
following conditions
+// rely on that for simplification.
+assert( ! (nMonth2 == 2 && nDay2 == 29));
+
+if( IsLeapYear( nYear1 ) )
+ assert(nYear1 == nYear2);
+
+// is 29/2/nYear1 between nDate1 and nDate2?
+// that is only possible if IsLeapYear( nYear1 ),
+// which implies nYear1 == nYear2
+if( IsLeapYear( nYear1 ) &&
+( nMonth1 == 1 || ( nMonth1 == 2 && nDay1 <= 28 )) &&
+nMonth2 > 2 )
+{
+nDaysInYear = 366;
+}
+// is 29/2/nYear2 between nDate1 and nDate2?
+// if nYear1==nYear2, then that is adequately tested by
the previous test,
+// so no need to retest it here.
+else if(isYearDifferent && nMonth2 > 2 && IsLeapYear(
nYear2 ))
{
nDaysInYear = 366;
}
else
{
-//if Feb 29 is between nDate1 and ndate2, inclusive
-if ( ( IsLeapYear( nYear1 ) && nMonth1 <= 2 && nDay1
<= 29 ) ||
-
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Eike Rathke changed: What|Removed |Added Depends on||69440 --- Comment #84 from Eike Rathke --- (In reply to comment #83) > Added Bug 60270 That was meant to be bug 69440 that was already present and got removed from the list instead again.. re-adding. -- 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 - Repository.mk unoidl/Executable_unoidl-read.mk unoidl/Module_unoidl.mk unoidl/source
Repository.mk|1
unoidl/Executable_unoidl-read.mk | 22
unoidl/Module_unoidl.mk |1
unoidl/source/unoidl-read.cxx| 1112 +++
unoidl/source/unoidl-write.cxx | 18
5 files changed, 1145 insertions(+), 9 deletions(-)
New commits:
commit 78dde8745e6fbc9ca73378d0ef093f3159d25d16
Author: Stephan Bergmann
Date: Tue Sep 17 18:29:58 2013 +0200
New unoidl-read tool to translate registries into readable .idl files
Change-Id: Ibd6ce23d2698280105469fb75c4afa225dc237ee
diff --git a/Repository.mk b/Repository.mk
index b3111fb..d91c021 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -59,6 +59,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \
treex \
uiex \
ulfex \
+ unoidl-read \
unoidl-write \
xrmex \
))
diff --git a/unoidl/Executable_unoidl-read.mk b/unoidl/Executable_unoidl-read.mk
new file mode 100644
index 000..af9c5fd
--- /dev/null
+++ b/unoidl/Executable_unoidl-read.mk
@@ -0,0 +1,22 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call gb_Executable_Executable,unoidl-read))
+
+$(eval $(call gb_Executable_add_exception_objects,unoidl-read, \
+unoidl/source/unoidl-read \
+))
+
+$(eval $(call gb_Executable_use_libraries,unoidl-read, \
+sal \
+salhelper \
+unoidl \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/unoidl/Module_unoidl.mk b/unoidl/Module_unoidl.mk
index c035257..308ccf1 100644
--- a/unoidl/Module_unoidl.mk
+++ b/unoidl/Module_unoidl.mk
@@ -10,6 +10,7 @@
$(eval $(call gb_Module_Module,unoidl))
$(eval $(call gb_Module_add_targets,unoidl, \
+Executable_unoidl-read \
Library_unoidl \
))
diff --git a/unoidl/source/unoidl-read.cxx b/unoidl/source/unoidl-read.cxx
new file mode 100644
index 000..aaab9a8
--- /dev/null
+++ b/unoidl/source/unoidl-read.cxx
@@ -0,0 +1,1112 @@
+/* -*- 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/.
+ */
+
+#include "sal/config.h"
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "config_version.h"
+#include "osl/endian.h"
+#include "osl/file.h"
+#include "osl/file.hxx"
+#include "osl/process.h"
+#include "rtl/process.h"
+#include "rtl/string.h"
+#include "rtl/string.hxx"
+#include "rtl/textenc.h"
+#include "rtl/textcvt.h"
+#include "rtl/ustring.hxx"
+#include "sal/macros.h"
+#include "sal/main.h"
+#include "unoidl/unoidl.hxx"
+
+namespace {
+
+void badUsage() {
+std::cerr
+<< "Usage:" << std::endl << std::endl
+<< " unoidl-read [--published] [] "
+<< std::endl << std::endl
+<< ("where each is either a new- or legacy-format .rdb
file,"
+" a single .idl")
+<< std::endl
+<< ("file, or a root directory of an .idl file tree. The complete"
+" content of the")
+<< std::endl
+<< ("last is written to stdout; if --published is
specified,"
+" only the")
+<< std::endl << "published entities are written out." << std::endl;
+std::exit(EXIT_FAILURE);
+}
+
+OUString getArgumentUri(sal_uInt32 argument) {
+OUString arg;
+rtl_getAppCommandArg(argument, &arg.pData);
+OUString url;
+osl::FileBase::RC e1 = osl::FileBase::getFileURLFromSystemPath(arg, url);
+if (e1 != osl::FileBase::E_None) {
+std::cerr
+<< "Cannot convert \"" << arg << "\" to file URL, error code "
+<< +e1 << std::endl;
+std::exit(EXIT_FAILURE);
+}
+OUString cwd;
+oslProcessError e2 = osl_getProcessWorkingDir(&cwd.pData);
+if (e2 != osl_Process_E_None) {
+std::cerr
+<< "Cannot obtain working directory, error code " << +e2
+<< std::endl;
+std::exit(EXIT_FAILURE);
+}
+OUString abs;
+e1 = osl::FileBase::getAbsoluteFileURL(cwd, url, abs);
+if (e1 != osl::FileBase::E_None) {
+std::cerr
+<< "Cannot make \"" << url
+<< "\" into an absolute file URL, error code " << +e1 << std::endl;
+std::exit(EXIT_FAILURE);
+}
+return abs;
+}
+
+OUString decomposeType(
+OUString const & type, std::size_t * rank,
+std::vector * typeArguments, bool * entity)
+{
+assert(rank != 0);
+assert(typeArguments != 0);
+assert(entity != 0);
+OUString nucl(type);
+*rank = 0;
+typeArguments->clear();
+while (nucl.startsWith("[]")) {
+
[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-4.1.2.2'
Tag 'libreoffice-4.1.2.2' created by Christian Lohmaier at 2013-09-17 17:28 -0700 Tag libreoffice-4.1.2.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJSOIMxAAoJEPQ0oe+v7q6jxg8P/3W3H3UAmiPwDVV3/bJ90KiI jaPLTAS0um+eBgIkc4PuFZkPi8yjDT/L3ov+dTLP4qTveqpuNhDxT300l3sflnHG 6aa8wMj28i6RgIhqecxmzLMN6/O9fuWvzrC+QtkUtx4rxS0prc9xXaMHv+/BVQP/ cmDDGDNfUofW9+AdA66GgWhc+1lqe2micCxd9Bhefi1RqlchqzLPE8jv5T9o3u6c k8I9VOqghWTpKcohYGRswVktGnrTnL2WIa0VcNlSiKI2g5/CWPQPWCDLajzRxw9M 1X118LvqXeQ8yTeGhEonUP8Mor58IZ8P+tcHmaljnVT8fsN2RrFU8XueSMXtDzho aiLn48d/rbCScp33tDM8ylpNRWs9OzO1+gbf5OwRHjBEEueYJlO8sWvCXpijLYin tTQgPWV1tctwi/Dh0eCdeO8kAEUig7q3ZF2Eilp4WAlreOJ2mzt31WYzsT6+zspt 4MZNKvy1uYBHwv1tZ57V6pvslL2VpqNkcQAsugatMT4A7U8jctG7Srn7UwM5fwxD 2u80NRsIZ+jLproLPq7Cd5OoQqrmS40NITe4p2IG2bERSs3V9n62voJLNF1jHAsn JWbWIIxd22SPKrJ+vYVHylt5N+EgjNT5hFxGpKVhjBne7q9GOlpNvmBD5BC9K1NZ A95rgiMSRXC5mpcqj2H2 =fVDx -END PGP SIGNATURE- Changes since libreoffice-4-1-branch-point-16: --- 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.2.2'
Tag 'libreoffice-4.1.2.2' created by Christian Lohmaier at 2013-09-17 17:28 -0700 Tag libreoffice-4.1.2.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJSOIM2AAoJEPQ0oe+v7q6j8dUQAJgUmL6R/tE+XfuJ+THxFI/1 ESc19GXxF4C9nGalX2XeXi9RqRZSRtApOEB5rjoNV8zcl6UEqFPpvTZAeMIHCLY4 UZvFu7UW3M/pnF/RJ4n8tAMVhgw9VebpovfhJ8p5nv89aHts+mkV8ZLYGX6C2BV9 Qr7qvjEIDq9Byj/dA9D3aa8/EliylwDQMf/WaYzZ7jrKKkCRC4e+/I/f0zGI+JuT 0TMFgs1jAMNROtvAQRF5PeAoV9YEtqkxS8QHnuIU7H/vehuV+kbG/fPxVE11TvXE +C2pPhfbCwhi63AaVXqDkwxS/SQXskt7LKIyZr55bPCaPI70j19Vvahkr+69ffIT TptG1QocZJw2ocng6/3GhhAsIXJn2DU1xsYZ1jh1sCSFPqZQ8fmpcBtRh+0DJN7v tQG5NxWk/eenN7youk8ZREMmc2JtUnT2gmHEHy7nriSK11RGy4Qg1Ab9DlAz2Gu+ axsaleIygI0oRMYywmZqU8XeT/eXwQ/Ob1Z5LB/xiRljWoRh4/nX13lMcY4uUZ+v ovMHSmvNi/t/5DrSG7QBi5aj9btxaKQ9hQk42kX9RbrSA8bOY4SbkMvTNGy1xy9P jqXTuIv6TFc5L6aQdfRMhCCDIfiMB8ORd1Uh8/dBd0DZH9a97Ho7OvEaXisAgcgR 7blXt3aaSBLRwd9IdntV =8Z2M -END PGP SIGNATURE- Changes since libreoffice-4-1-branch-point-41: --- 0 files changed --- ___ 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.2.2'
Tag 'libreoffice-4.1.2.2' created by Christian Lohmaier at 2013-09-17 17:28 -0700 Tag libreoffice-4.1.2.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJSOIMpAAoJEPQ0oe+v7q6jFi0P/RRS/WWxxx6thTWYU3RT3DkC 4lppbflfTrQDeoOUuua2FhaFhUWy9pGWSB9OQrWH+XXBPjXIE4uJS+/Fy6M7mFje 9kRMcBp3B/XhhMUbYP22OyCrEm7TA9MO3kNZ9ytmx7gXJbLNAphUfLCd/qx1Fmtv 7B3uukwpD+0EevrCNXQbmnNlp9zPk+W+teT0D7aecnbDF3yH6nVlEYRQsRGcXa1W 3dhLKVYmbivQVwVQiW0PkenE8Wxa0kesLFuV25pBj/aC70Sb3TvpVeCErAWQmx7i Qv0MJnvrYB+i/AaMreJbm3n3OBW4FMUtUWaSvdBo0qqvuRmuZ9D+vDqjpXPHRLIZ WmxoJmmHwjEWgmuXyuvnobKsA87fDyz7+zLNn86v6PERQdO8D9LhfnoZP4BvBydc aKQ4ZoYab973G/NDgUTTW+kUZvoqDgqRiB4PbL/QUl0bvIbJ6nI8XGbNTw/N7rYF S5LdmOD/+esMDCunGIA/jOMzMWwxRty5jd4FcP9FAi8IeJzcKAVxR+NZqnz32s6P g4jnf6f16RiNVlicsXwUhOGGdo8PngiiLVaN5nbNjGrSc3WL3klYV6M0ruiy3Wd0 0yv5j0sQbQTskSe/ViMpkyrUg809TH3rXVY8IJmkSiN5Vlz68eEmrUSMgZlkenmC D76HDQKNdbY9vEHvJtcp =zGGD -END PGP SIGNATURE- Changes since libreoffice-4-1-branch-point-16: --- 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.2.2'
Tag 'libreoffice-4.1.2.2' created by Christian Lohmaier at 2013-09-17 17:28 -0700 Tag libreoffice-4.1.2.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJSOINAAAoJEPQ0oe+v7q6jiEwQAJ72LRpXtt/ugTEHwBX15ZUY J0GGMvP/NB+Umy7qZBPC5wG8iPO3ZWSiyfKTMkXhX9MQZpvd4J1hAxnDKFNk50hX l5QnuJoFq94tIFIRTGb9aeLQ0f1lFZBd8i/WY52JEYF8PpRjrsWJGg1JSDXlEJQt BUpLOfhFd44r2teGIc6YF3Lb645ioHwqUWqSvAd3L0oAXURNQ8ncS1+rPn/NwsCQ UWYDZfSfA/+PLmNvWsfCgKZLYbRGQokAXCpHX1JIS7tyJBREgb6DMiBx71R2fbmk xN31YsbYb1/VMb5L/Lq7jbdQH3mIqzUb5LBhml5Xan1hpEuIu+9iBsA6FE7PBD6j 7MBhpGXeCMsL8uJRYWCg+AH2MYhGS1ACQ9aQACCNdf8EYGaV4JDOrjJ116V56imr jQNMlSJwYUsXM306LyxMOGHcanovT8ZsR13qwZ7l5UF1Z6or0ecrUiDxnunfbBc2 5MWJweUT4V8arRjb/m93lFzTiXCf6AGcyC19ACiI73oWj+6/+N2cbQU7RdhRX5An Bdi/hYUQYKwyKFtadZjfcll1QI6OTIpbbyFk/liSiFLHwQIMholm2Zo5mR//eRCi a7JgsfrVvRb9yy+hOCBm7eb8UZDAM0X7+q/Rkr3NGdJTRnAE9MzjJOdnS8vcpFSe pJlJO6t4HZ+p0QuYizeW =8tGA -END PGP SIGNATURE- Changes since libreoffice-4.1.0.1-542: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - svtools/source
svtools/source/misc/langtab.src|4 +++- svtools/source/misc/sampletext.cxx |3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit d8cc122981724d50c1285accba023f8dcf8d3b30 Author: Eike Rathke Date: Tue Sep 17 18:11:55 2013 +0200 added "Uzbek Cyrillic" Change-Id: I9a542f09d9f09e25082eea1327722b0021a34d0c diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src index 9ff5cf2..1752742 100644 --- a/svtools/source/misc/langtab.src +++ b/svtools/source/misc/langtab.src @@ -195,6 +195,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE < "Urdu (India)" ; LANGUAGE_URDU_INDIA ; > ; < "Ukrainian" ; LANGUAGE_UKRAINIAN ; > ; < "Uzbek Latin" ; LANGUAGE_UZBEK_LATIN ; > ; +< "Uzbek Cyrillic" ; LANGUAGE_UZBEK_CYRILLIC ; > ; < "Welsh" ; LANGUAGE_WELSH ; > ; < "Latin" ; LANGUAGE_LATIN ; > ; < "Esperanto" ; LANGUAGE_USER_ESPERANTO ; > ; commit 562ba963be28db0eb8dc3043db9e28319d1da1c8 Author: Eike Rathke Date: Tue Sep 17 18:06:28 2013 +0200 USCRIPT_MONGOLIAN only for LANGUAGE_MONGOLIAN_MONGOLIAN Although LANGUAGE_MONGOLIAN and LANGUAGE_MONGOLIAN_MONGOLIAN have the same primary language they are of different scripts. Change-Id: If72bf51a339b8daa71dfd2f8cd97877c17bbe5f4 diff --git a/svtools/source/misc/sampletext.cxx b/svtools/source/misc/sampletext.cxx index fc54c0d..c8ba114 100644 --- a/svtools/source/misc/sampletext.cxx +++ b/svtools/source/misc/sampletext.cxx @@ -587,7 +587,8 @@ OUString makeRepresentativeTextForLanguage(LanguageType eLang) sRet = makeRepresentativeTextForScript(USCRIPT_KHMER); break; case LANGUAGE_MONGOLIAN & LANGUAGE_MASK_PRIMARY: -sRet = makeRepresentativeTextForScript(USCRIPT_MONGOLIAN); +if (eLang == LANGUAGE_MONGOLIAN_MONGOLIAN) +sRet = makeRepresentativeTextForScript(USCRIPT_MONGOLIAN); break; case LANGUAGE_JAPANESE & LANGUAGE_MASK_PRIMARY: sRet = makeRepresentativeTextForScript(USCRIPT_JAPANESE); commit ac60f166dae444618503d569d12823bc9a8c925a Author: Eike Rathke Date: Tue Sep 17 18:03:24 2013 +0200 "Mongolian Cyrillic" and "Mongolian Mongolian" Change-Id: I6b4e6ae9eb1c2c54b9b876b675344ced34315e29 diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src index ddc190c..9ff5cf2 100644 --- a/svtools/source/misc/langtab.src +++ b/svtools/source/misc/langtab.src @@ -204,7 +204,8 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE < "Dhivehi" ; LANGUAGE_DHIVEHI ; > ; < "Northern Sotho" ; LANGUAGE_SEPEDI ; > ; < "Gaelic (Scotland)" ; LANGUAGE_GAELIC_SCOTLAND ; > ; -< "Mongolian" ; LANGUAGE_MONGOLIAN ; > ; +< "Mongolian Cyrillic" ; LANGUAGE_MONGOLIAN ; > ; +< "Mongolian Mongolian" ; LANGUAGE_MONGOLIAN_MONGOLIAN ; > ; < "Interlingua" ; LANGUAGE_USER_INTERLINGUA ; > ; < "Bosnian" ; LANGUAGE_BOSNIAN_BOSNIA_HERZEGOVINA ; > ; < "Bengali (Bangladesh)" ; LANGUAGE_BENGALI_BANGLADESH ; > ; ___ 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-2' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7b4accc1ca6c8c8684047a5b7952e61d259389b4 Author: Christian Lohmaier Date: Tue Sep 17 17:34:13 2013 +0200 Updated core Project: translations 36fc2c0c4f118dc2ab7952679c79516caf167445 diff --git a/translations b/translations index ff3cff1..36fc2c0 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit ff3cff1f9e31f89c0648340f952dcb52a0403aaa +Subproject commit 36fc2c0c4f118dc2ab7952679c79516caf167445 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: i18nlangtag/source
i18nlangtag/source/isolang/isolang.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 86cbe18a6143bf054c31f69dc97368dfdd3ad374
Author: Eike Rathke
Date: Tue Sep 17 17:46:01 2013 +0200
mn-Cyrl and mn-Mong
Change-Id: I2a62bb4098e73058161f1808052556fdb86da81c
diff --git a/i18nlangtag/source/isolang/isolang.cxx
b/i18nlangtag/source/isolang/isolang.cxx
index 6561bcc..5b9c967 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -344,8 +344,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
{ LANGUAGE_KIRGHIZ, "ky", "KG", false },
{ LANGUAGE_LAO, "lo", "LA", false },
{ LANGUAGE_MALTESE, "mt", "MT", false },
-{ LANGUAGE_MONGOLIAN, "mn", "MN", false }, // Cyrillic
script
-{ LANGUAGE_MONGOLIAN_MONGOLIAN, "mn", "MN", false },
+{ LANGUAGE_MONGOLIAN, "mn", "MN", true }, // Cyrillic
script
{ LANGUAGE_RUSSIAN_MOLDOVA, "mo", "MD", false },
{ LANGUAGE_SWAHILI, "sw", "KE", false },
{ LANGUAGE_USER_SWAHILI_TANZANIA, "sw", "TZ", false },
@@ -581,6 +580,8 @@ static IsoLanguageScriptCountryEntry const
aImplIsoLangScriptEntries[] =
{ LANGUAGE_BOSNIAN_CYRILLIC_BOSNIA_HERZEGOVINA, "bs-Cyrl", "BA" },
{ LANGUAGE_AZERI_CYRILLIC, "az-Cyrl", "AZ" }, //
macrolanguage code
{ LANGUAGE_UZBEK_CYRILLIC, "uz-Cyrl", "UZ" }, //
macrolanguage code
+{ LANGUAGE_MONGOLIAN, "mn-Cyrl", "MN" }, //
macrolanguage code
+{ LANGUAGE_MONGOLIAN_MONGOLIAN, "mn-Mong", "MN" }, //
macrolanguage code
{ LANGUAGE_USER_PALI_LATIN, "pi-Latn", "" },
{ LANGUAGE_DONTKNOW,"","" } // marks
end of table
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Add non-breaking space before punctuation in French
On 17/09/13 17:26, Laurent BP wrote: > Hi, > > Does something change in LibO 4.2 with AutoCorrect option "Add non breaking > space before specific punctuation marks in french text"? > I tested with Version: 4.2.0.0.alpha0+ > Build ID: bd8f84ceb36954496fd9f053436b0c4a8a5c38db > TinderBox: Win-x86@39, Branch:master, Time: 2013-09-16_00:22:32 > on Win7, and it does not work anymore in Calc or Impress, neither in > Comments in Writer. Is it a bug or a new feature? As some claimed to remove > it from Calc > https://bugs.freedesktop.org/show_bug.cgi?id=54686 i wonder if somebody has converted some EditEngine functions to OUString and that broke it; the same thing happened in Writer and was fixed by http://cgit.freedesktop.org/libreoffice/core/commit/?id=e2b9946022c2a286ebac625ccb45f5d5a5d6 ... in which case the ImpEditEngine::AutoCorrect line marked with FIXME would need fixing ... ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED: master,4-1,4-0] fdo#64455 Handle unknown color in color line toolbox
> > De : Ivan Timofeev [via Document Foundation Mail Archive] > >À : Laurent BP >Envoyé le : Mardi 17 septembre 2013 17h08 >Objet : Re: [PUSHED: master,4-1,4-0] fdo#64455 Handle unknown color in color >line toolbox > > > >On 17.09.2013 17:37, Laurent BP [via Document Foundation Mail Archive] >wrote: >> Moreover, I realized afterwards it may be better to use OUString than >> String? I saw many patches proposing to replace String by OUString. > >Yes, OUString should be used in new code instead of String. You can help >with this long-standing conversion btw. :) I will have a look at it tonight. And if I change also for Fill toolbox, I will contribute to this long-standing conversion ;) Laurent BP - LibreOffice 4.1.1.2 -- View this message in context: http://nabble.documentfoundation.org/PATCH-fdo-64455-Handle-unknown-color-in-color-line-toolbox-tp4074169p4074511.html Sent from the Dev mailing list archive at Nabble.com.___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED: master,4-1,4-0] fdo#64455 Handle unknown color in color line toolbox
On 17.09.2013 17:37, Laurent BP [via Document Foundation Mail Archive] wrote: > Moreover, I realized afterwards it may be better to use OUString than > String? I saw many patches proposing to replace String by OUString. Yes, OUString should be used in new code instead of String. You can help with this long-standing conversion btw. :) Regards, Ivan -- View this message in context: http://nabble.documentfoundation.org/PATCH-fdo-64455-Handle-unknown-color-in-color-line-toolbox-tp4074169p4074506.html Sent from the Dev mailing list archive at Nabble.com.___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Add non-breaking space before punctuation in French
Hi, Does something change in LibO 4.2 with AutoCorrect option "Add non breaking space before specific punctuation marks in french text"? I tested with Version: 4.2.0.0.alpha0+ Build ID: bd8f84ceb36954496fd9f053436b0c4a8a5c38db TinderBox: Win-x86@39, Branch:master, Time: 2013-09-16_00:22:32 on Win7, and it does not work anymore in Calc or Impress, neither in Comments in Writer. Is it a bug or a new feature? As some claimed to remove it from Calc https://bugs.freedesktop.org/show_bug.cgi?id=54686 Laurent BP - LibreOffice 4.1.1.2 -- View this message in context: http://nabble.documentfoundation.org/Add-non-breaking-space-before-punctuation-in-French-tp4074509.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/ui/docvw/SidebarWin.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ddbcb6687722314b37cfda3170596ac7a4f69602
Author: Ivan Timofeev
Date: Tue Sep 17 18:34:17 2013 +0400
fdo#41833: fix visual cursor position after resizing
SetOutputArea updates a cursor position, SetVisArea doesn't => call
SetOutputArea
after SetVisArea.
Change-Id: Ie8f079cb3d567f759c84587a8072b98fab43588b
diff --git a/sw/source/ui/docvw/SidebarWin.cxx
b/sw/source/ui/docvw/SidebarWin.cxx
index 4a0ae75..4cf128a 100644
--- a/sw/source/ui/docvw/SidebarWin.cxx
+++ b/sw/source/ui/docvw/SidebarWin.cxx
@@ -597,11 +597,11 @@ void SwSidebarWin::DoResize()
}
mpOutliner->SetPaperSize( PixelToLogic( Size(aWidth,aHeight) ) ) ;
-mpOutlinerView->SetOutputArea( PixelToLogic( Rectangle(0,0,aWidth,aHeight)
) );
if (!mpVScrollbar->IsVisible())
{ // if we do not have a scrollbar anymore, we want to see the complete
text
mpOutlinerView->SetVisArea( PixelToLogic(
Rectangle(0,0,aWidth,aHeight) ) );
}
+mpOutlinerView->SetOutputArea( PixelToLogic( Rectangle(0,0,aWidth,aHeight)
) );
if (!Application::GetSettings().GetLayoutRTL())
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source xmloff/source
sw/source/filter/xml/xmlexp.cxx|2 -
xmloff/source/chart/PropertyMaps.cxx | 26 +++---
xmloff/source/chart/SchXMLChartContext.cxx |6 +--
xmloff/source/chart/SchXMLChartContext.hxx |2 -
xmloff/source/core/DocumentSettingsContext.cxx | 46 -
xmloff/source/core/RDFaImportHelper.cxx|4 +-
xmloff/source/core/xmlexp.cxx |4 +-
xmloff/source/core/xmltkmap.cxx|4 +-
xmloff/source/core/xmluconv.cxx| 18 -
9 files changed, 56 insertions(+), 56 deletions(-)
New commits:
commit 2ef38f3739aff407f6cdfe4ea9c46591c18dd2f8
Author: Takeshi Abe
Date: Tue Sep 17 23:22:55 2013 +0900
sal_Bool to bool
Change-Id: I81767fda35b52e73bc78c07b660244a6808a0409
diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx
index 84ab097..d26eb60 100644
--- a/sw/source/filter/xml/xmlexp.cxx
+++ b/sw/source/filter/xml/xmlexp.cxx
@@ -444,7 +444,7 @@ void SwXMLExport::SetBodyAttributes()
if( pDoc->GetCurrentViewShell() &&
pDoc->GetCurrentViewShell()->GetPageCount() > 1 )
{
-sal_Bool bValue = sal_True;
+bool bValue = true;
OUStringBuffer sBuffer;
::sax::Converter::convertBool(sBuffer, bValue);
AddAttribute(XML_NAMESPACE_TEXT, XML_USE_SOFT_PAGE_BREAKS,
diff --git a/xmloff/source/chart/PropertyMaps.cxx
b/xmloff/source/chart/PropertyMaps.cxx
index 6970d59..f712aeb 100644
--- a/xmloff/source/chart/PropertyMaps.cxx
+++ b/xmloff/source/chart/PropertyMaps.cxx
@@ -195,7 +195,7 @@ void XMLChartExportPropertyMapper::ContextFilter(
uno::Reference< beans::XPropertySet > rPropSet ) const
{
OUString aAutoPropName;
-sal_Bool bCheckAuto = sal_False;
+bool bCheckAuto = false;
// filter properties
for( std::vector< XMLPropertyState >::iterator property =
rProperties.begin();
@@ -208,24 +208,24 @@ void XMLChartExportPropertyMapper::ContextFilter(
{
// if Auto... is set the corresponding properties mustn't be
exported
case XML_SCH_CONTEXT_MIN:
-bCheckAuto = sal_True;
+bCheckAuto = true;
aAutoPropName = "AutoMin";
break;
case XML_SCH_CONTEXT_MAX:
-bCheckAuto = sal_True;
+bCheckAuto = true;
aAutoPropName = "AutoMax";
break;
case XML_SCH_CONTEXT_STEP_MAIN:
-bCheckAuto = sal_True;
+bCheckAuto = true;
aAutoPropName = "AutoStepMain";
break;
case XML_SCH_CONTEXT_STEP_HELP_COUNT:
-bCheckAuto = sal_True;
+bCheckAuto = true;
aAutoPropName = "AutoStepHelp";
break;
case XML_SCH_CONTEXT_ORIGIN:
-bCheckAuto = sal_True;
+bCheckAuto = true;
aAutoPropName = "AutoOrigin";
break;
@@ -262,7 +262,7 @@ void XMLChartExportPropertyMapper::ContextFilter(
{
}
}
-bCheckAuto = sal_False;
+bCheckAuto = false;
}
}
@@ -359,13 +359,13 @@ void XMLChartExportPropertyMapper::handleSpecialItem(
const ::std::vector< XMLPropertyState > *pProperties,
sal_uInt32 nIdx ) const
{
-sal_Bool bHandled = sal_False;
+bool bHandled = false;
sal_Int32 nContextId = getPropertySetMapper()->GetEntryContextId(
rProperty.mnIndex );
if( nContextId )
{
-bHandled = sal_True;
+bHandled = true;
OUString sAttrName = getPropertySetMapper()->GetEntryXMLName(
rProperty.mnIndex );
sal_uInt16 nNameSpace = getPropertySetMapper()->GetEntryNameSpace(
rProperty.mnIndex );
@@ -373,7 +373,7 @@ void XMLChartExportPropertyMapper::handleSpecialItem(
OUString sValue;
sal_Int32 nValue = 0;
-sal_Bool bValue = sal_False;
+bool bValue = false;
switch( nContextId )
{
@@ -475,7 +475,7 @@ void XMLChartExportPropertyMapper::handleSpecialItem(
break;
default:
-bHandled = sal_False;
+bHandled = false;
break;
}
@@ -532,7 +532,7 @@ bool XMLChartImportPropertyMapper::handleSpecialItem(
const SvXMLNamespaceMap& rNamespaceMap ) const
{
sal_Int32 nContextId = maPropMapper->GetEntryContextId( rProperty.mnIndex
);
-sal_Bool bRet = (nContextId != 0);
+bool bRet = (nContextId != 0);
if( nContextId )
{
@@ -648,7 +648,7 @@ bool XMLChartImportPropertyMapper::handleSpecialItem(
break;
default:
-bRet = sal_False;
+bRet = false;
break;
}
}
diff --git a/xmloff/source/chart/SchXMLChartContext.cxx
b/xmloff/source/chart/SchXMLChartCont
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/window.cxx |6 +- 1 file changed, 1 insertion(+), 5 deletions(-) New commits: commit 8ecda4405a1160ade824bfde72d10513cacb9b1a Author: Caolán McNamara Date: Tue Sep 17 15:31:41 2013 +0100 pFontSubst is always NULL Change-Id: Ied4eda5b29e2df3fa9260bcf456b8dd360ffafcc diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index d027eaa..95c6f61 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -4198,12 +4198,8 @@ void Window::ImplNewInputContext() else aSize.Height() = (12*pFocusWin->mnDPIY)/72; } -// TODO: No display device uses ImplDirectFontSubstitution thingy, right? => remove it -ImplDirectFontSubstitution* pFontSubst = NULL; -//if( pFocusWin->mpOutDevData ) -//pFontSubst = &pFocusWin->mpOutDevData->maDevFontSubst; pFontEntry = pFocusWin->mpFontCache->GetFontEntry( pFocusWin->mpFontList, - rFont, aSize, static_cast(aSize.Height()), pFontSubst ); + rFont, aSize, static_cast(aSize.Height()), NULL ); if ( pFontEntry ) aNewContext.mpFont = &pFontEntry->maFontSelData; } ___ 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/core/edit/eddel.cxx |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 0fb4adcff534e3841cf6df0e2363fb0797af7022
Author: Miklos Vajna
Date: Tue Sep 17 16:11:09 2013 +0200
fdo#37606 SwEditShell::DeleteSel(): handle document starting with a table
If the whole document is selected and the document starts with a table,
then we used to delete the contents of the document, except the starting
table, which was just cleared. Change this and do what is expected:
remove the table as well, so the document will have a single empty
paragraph only.
Change-Id: I47d3fab462e2a4149f6459d61e487fee8c5c30ed
diff --git a/sw/source/core/edit/eddel.cxx b/sw/source/core/edit/eddel.cxx
index 2d7adb6..8ea582c 100644
--- a/sw/source/core/edit/eddel.cxx
+++ b/sw/source/core/edit/eddel.cxx
@@ -35,6 +35,7 @@
void SwEditShell::DeleteSel( SwPaM& rPam, sal_Bool* pUndo )
{
+bool bSelectAll = StartsWithTable() && ExtendedSelectedAll();
// only for selections
if( !rPam.HasMark() || *rPam.GetPoint() == *rPam.GetMark())
return;
@@ -42,10 +43,11 @@ void SwEditShell::DeleteSel( SwPaM& rPam, sal_Bool* pUndo )
// Is the selection in a table? Then delete only the content of the
selected boxes.
// Here, there are two cases:
// 1. Point and Mark are in one box, delete selection as usual
-// 2. Point and Mare are in different boxes, search all selected boxes and
delete content
+// 2. Point and Mark are in different boxes, search all selected boxes and
delete content
+// 3. Point and Mark are at the document start and end, Point is in a
table: delete selection as usual
if( rPam.GetNode()->FindTableNode() &&
rPam.GetNode()->StartOfSectionNode() !=
-rPam.GetNode(sal_False)->StartOfSectionNode() )
+rPam.GetNode(sal_False)->StartOfSectionNode() && !bSelectAll )
{
// group the Undo in the table
if( pUndo && !*pUndo )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - editeng/source
editeng/source/editeng/editdoc.cxx |1 -
editeng/source/misc/svxacorr.cxx | 31 +++
2 files changed, 23 insertions(+), 9 deletions(-)
New commits:
commit 7f76c90a982eb06396a96c32088bfd5de941516a
Author: Caolán McNamara
Date: Tue Sep 17 14:47:43 2013 +0100
silence annoying warning
Change-Id: I90c77df2ef8424ece5b8b37097d62bd5e8955616
diff --git a/editeng/source/editeng/editdoc.cxx
b/editeng/source/editeng/editdoc.cxx
index 32e0da2..16bfe8f 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -1750,7 +1750,6 @@ const WrongList* ContentNode::GetWrongList() const
void ContentNode::SetWrongList( WrongList* p )
{
-DBG_ASSERT(!mpWrongList, "WrongList already exist!");
mpWrongList.reset(p);
}
commit 98214397cd5fc10cdefd6ba9c36746532942709b
Author: Caolán McNamara
Date: Tue Sep 17 14:46:05 2013 +0100
don't access string out of bounds
Change-Id: I304b74270f73b9f94568edf2613e2581459cc4f9
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index dd2a6ec..bb24fe0 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -845,8 +845,15 @@ sal_Bool SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc&
rDoc,
sal::static_int_cast< xub_StrLen >( pWordStt - pStart ) ) ) )
return sal_False; // already ok
-if (INetURLObject::CompareProtocolScheme(rTxt.copy(pWordStt - pStart,
pDelim - pWordStt + 1)) != INET_PROT_NOT_VALID)
-return sal_False; // already ok
+//See if the text is the start of a protocol string, e.g. have text of
+//"http" see if it is the start of "http:" and if so leave it alone
+sal_Int32 nIndex = pWordStt - pStart;
+sal_Int32 nProtocolLen = pDelim - pWordStt + 1;
+if (nIndex + nProtocolLen <= rTxt.getLength())
+{
+if (INetURLObject::CompareProtocolScheme(rTxt.copy(nIndex,
nProtocolLen)) != INET_PROT_NOT_VALID)
+return sal_False; // already ok
+}
if (0x1 == *pWordStt || 0x2 == *pWordStt)
return sal_False; // already ok
commit 7fff7c6aab15b3a7de3bf6056669ec217d41bb60
Author: Caolán McNamara
Date: Tue Sep 17 14:38:42 2013 +0100
unfold this god-awful mess, logic unchanged
Change-Id: Ib76617e3c500268dfe423b9947100f6ce7f0eaec
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index f95d921..dd2a6ec 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -832,16 +832,24 @@ sal_Bool SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc&
rDoc,
}
} while( 0 == ( bAtStart = (pStart == pStr)) );
-if( !pWordStt ||
-rCC.isDigit(
-aText, sal::static_int_cast< xub_StrLen >( pStr - pStart ) ) ||
-IsUpperLetter(
+if (!pWordStt)
+return sal_False;// no character to be replaced
+
+
+if (rCC.isDigit( aText, sal::static_int_cast< xub_StrLen >( pStr - pStart
) ))
+return sal_False; // already ok
+
+if (IsUpperLetter(
rCC.getCharacterType(
aText,
-sal::static_int_cast< xub_StrLen >( pWordStt - pStart ) ) ) ||
-INetURLObject::CompareProtocolScheme(rTxt.copy(pWordStt - pStart,
pDelim - pWordStt + 1)) != INET_PROT_NOT_VALID ||
-0x1 == *pWordStt || 0x2 == *pWordStt )
-return sal_False; // no character to be replaced, or already ok
+sal::static_int_cast< xub_StrLen >( pWordStt - pStart ) ) ) )
+return sal_False; // already ok
+
+if (INetURLObject::CompareProtocolScheme(rTxt.copy(pWordStt - pStart,
pDelim - pWordStt + 1)) != INET_PROT_NOT_VALID)
+return sal_False; // already ok
+
+if (0x1 == *pWordStt || 0x2 == *pWordStt)
+return sal_False; // already ok
if( *pDelim && 2 >= pDelim - pWordStt &&
lcl_IsInAsciiArr( ".-)>", *pDelim ) )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED: master,4-1,4-0] fdo#64455 Handle unknown color in color line toolbox
Hi Ivan, Thanks for this good news. I was wondering if I could use the same code as for Fill toolbox, but I did not understand all the links between classes. So I duplicate the code. Moreover, I realized afterwards it may be better to use OUString than String? I saw many patches proposing to replace String by OUString. Laurent BP PS Do not worry for the authoring of this patch. ;) - LibreOffice 4.1.1.2 -- View this message in context: http://nabble.documentfoundation.org/PATCH-fdo-64455-Handle-unknown-color-in-color-line-toolbox-tp4074169p4074488.html Sent from the Dev mailing list archive at Nabble.com. ___ 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 Caolán McNamara changed: What|Removed |Added Depends on||69467 -- 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: cuitabarea.hxx
On Thu, 2013-09-12 at 16:41 -0300, Olivier Hallot wrote: > While converting the format page dialog in sdraw I stumbled into > > sd/source/ui/dlg/dlgpage.cxx > > > > -AddTabPage( RID_SVXPAGE_PAGE); > -AddTabPage( RID_SVXPAGE_AREA); > > If there is a way to build the Page and Area tabs pages of cui/ inside > sd/ I'll be happy to learn how. Apologies for late reply. Try again now after... http://cgit.freedesktop.org/libreoffice/core/commit/?id=e2aa5ab249edaeb8e9e3603ba8ae09faea90122c and it should be easier to convert now that it explicitly gets the factory to find the creator methods by direct id rather than relying on the implicit "tab page id" is the same as "tab page creator function id" mapping of this AddTabPage variant. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sd/source
sd/source/ui/dlg/dlgpage.cxx |8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) New commits: commit e2aa5ab249edaeb8e9e3603ba8ae09faea90122c Author: Caolán McNamara Date: Tue Sep 17 14:11:25 2013 +0100 tweak AddTabPage to use the factory directly to facilitate easier .ui conversion Change-Id: Icee821b37c1fe1801937066f9defbff4a05fc9e2 diff --git a/sd/source/ui/dlg/dlgpage.cxx b/sd/source/ui/dlg/dlgpage.cxx index 5e1dbca..e0bae00 100644 --- a/sd/source/ui/dlg/dlgpage.cxx +++ b/sd/source/ui/dlg/dlgpage.cxx @@ -27,6 +27,7 @@ #include "DrawDocShell.hxx" #include #include +#include #include /** @@ -52,8 +53,11 @@ SdPageDlg::SdPageDlg( SfxObjectShell* pDocSh, Window* pParent, const SfxItemSet* FreeResource(); -AddTabPage( RID_SVXPAGE_PAGE); -AddTabPage( RID_SVXPAGE_AREA); +SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); +OSL_ENSURE(pFact, "Dialogdiet fail!"); + +AddTabPage( RID_SVXPAGE_PAGE, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ), 0 ); +AddTabPage( RID_SVXPAGE_AREA, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_AREA ), 0 ); if(!bAreaPage) // I have to add the page before I remove it ! RemoveTabPage( RID_SVXPAGE_AREA ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED: master,4-1,4-0] fdo#64455 Handle unknown color in color line toolbox
Hi Laurent, Thanks, I fixed the indentation and pushed it. Sadly I forgot to amend the author while pushing to 4-1 and stole your commit :( sorry for that. Regards, Ivan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - svx/source
svx/source/tbxctrls/itemwin.cxx | 38 +-
1 file changed, 37 insertions(+), 1 deletion(-)
New commits:
commit c85506265c8d78a103a267489e498aeee9434853
Author: Laurent Balland-Poirier
Date: Tue Sep 17 16:53:26 2013 +0400
fdo#64455 Handle unknown color in color line
Change-Id: Ice4205056cc64ae50bd3c8136aeae6f648adbd0b
Signed-off-by: Ivan Timofeev
diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx
index 7d26fdc..3058ca0 100644
--- a/svx/source/tbxctrls/itemwin.cxx
+++ b/svx/source/tbxctrls/itemwin.cxx
@@ -30,6 +30,9 @@
#include
+#define TMP_STR_BEGIN '['
+#define TMP_STR_END ']'
+
#define DELAY_TIMEOUT 100
#include
@@ -299,7 +302,40 @@ SvxColorBox::~SvxColorBox()
void SvxColorBox::Update( const XLineColorItem* pItem )
{
if ( pItem )
-SelectEntry( pItem->GetColorValue() );
+{
+ // fdo#64455
+::Color aColor = pItem->GetColorValue();
+String aString( pItem->GetName() );
+SelectEntry(aString);
+if( GetSelectEntryPos() == LISTBOX_ENTRY_NOTFOUND ||
+GetSelectEntryColor() != aColor )
+{
+SelectEntry( aColor );
+}
+// Check if the entry is not in the list
+if( GetSelectEntryPos() == LISTBOX_ENTRY_NOTFOUND ||
+GetSelectEntryColor() != aColor )
+{
+sal_uInt16 nCount = GetEntryCount();
+String aTmpStr;
+if( nCount > 0 )
+{
+// Last entry gets tested against temporary color
+aTmpStr = GetEntry( nCount - 1 );
+if( aTmpStr.GetChar(0) == TMP_STR_BEGIN &&
+ aTmpStr.GetChar(aTmpStr.Len()-1) == TMP_STR_END )
+{
+RemoveEntry( nCount - 1 );
+}
+}
+aTmpStr = TMP_STR_BEGIN;
+aTmpStr += aString;
+aTmpStr += TMP_STR_END;
+
+sal_uInt16 nPos = InsertEntry( aColor, aTmpStr );
+SelectEntryPos( nPos );
+}
+}
else
SetNoSelection();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Bugous bug fix
On Thu, 2013-09-12 at 10:49 +0200, Zolnai Tamás wrote: > Hi Tomofumi and Cedric, > I found that the next commit is bugous: > http://cgit.freedesktop.org/libreoffice/core/commit/?id=8c2902ecbf135fae070ea032fa10a59bb76ec1b0 > > I have problem mostly with using the ApplyLineDashing method with > scale parameter (borderlineprimitive2d.cxx). > I know two reasons why this is wrong: > ... > There is a small part of the patch, which make to draw hairline > primitive, when the line is solid (before only the width was checked). > Maybe this part fixed the original bug, because as I see the hairline > primitive means a solid line. Can you submit a patch that reverts the parts that you believe are problematic and keeps the part you think might be useful for the original problem ? How do we visually see the problems you describe ? If I put some dashed borders on some cells in calc and zoom in and out it doesn't seem to look particularly wrong for me. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - svx/source
svx/source/tbxctrls/itemwin.cxx | 38 +-
1 file changed, 37 insertions(+), 1 deletion(-)
New commits:
commit 03a341775507502dd58598edc3fd805a8518550d
Author: Ivan Timofeev
Date: Tue Sep 17 16:49:14 2013 +0400
fdo#64455 Handle unknown color in color line
Change-Id: Ice4205056cc64ae50bd3c8136aeae6f648adbd0b
Signed-off-by: Ivan Timofeev
diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx
index dbc2ede..dd44ac7 100644
--- a/svx/source/tbxctrls/itemwin.cxx
+++ b/svx/source/tbxctrls/itemwin.cxx
@@ -28,6 +28,9 @@
#include
+#define TMP_STR_BEGIN '['
+#define TMP_STR_END ']'
+
#define DELAY_TIMEOUT 100
#include
@@ -295,7 +298,40 @@ SvxColorBox::~SvxColorBox()
void SvxColorBox::Update( const XLineColorItem* pItem )
{
if ( pItem )
-SelectEntry( pItem->GetColorValue() );
+{
+ // fdo#64455
+::Color aColor = pItem->GetColorValue();
+String aString( pItem->GetName() );
+SelectEntry(aString);
+if( GetSelectEntryPos() == LISTBOX_ENTRY_NOTFOUND ||
+GetSelectEntryColor() != aColor )
+{
+SelectEntry( aColor );
+}
+// Check if the entry is not in the list
+if( GetSelectEntryPos() == LISTBOX_ENTRY_NOTFOUND ||
+GetSelectEntryColor() != aColor )
+{
+sal_uInt16 nCount = GetEntryCount();
+String aTmpStr;
+if( nCount > 0 )
+{
+// Last entry gets tested against temporary color
+aTmpStr = GetEntry( nCount - 1 );
+if( aTmpStr.GetChar(0) == TMP_STR_BEGIN &&
+ aTmpStr.GetChar(aTmpStr.Len()-1) == TMP_STR_END )
+{
+RemoveEntry( nCount - 1 );
+}
+}
+aTmpStr = TMP_STR_BEGIN;
+aTmpStr += aString;
+aTmpStr += TMP_STR_END;
+
+sal_uInt16 nPos = InsertEntry( aColor, aTmpStr );
+SelectEntryPos( nPos );
+}
+}
else
SetNoSelection();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/tbxctrls/itemwin.cxx | 38 +-
1 file changed, 37 insertions(+), 1 deletion(-)
New commits:
commit 338ccf09e3d02dfd872464bb78c4e2d44aecf0b2
Author: Laurent Balland-Poirier
Date: Sat Sep 14 15:13:08 2013 +0200
fdo#64455 Handle unknown color in color line
Change-Id: Ice4205056cc64ae50bd3c8136aeae6f648adbd0b
diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx
index 4514d42..daa035b 100644
--- a/svx/source/tbxctrls/itemwin.cxx
+++ b/svx/source/tbxctrls/itemwin.cxx
@@ -28,6 +28,9 @@
#include
+#define TMP_STR_BEGIN '['
+#define TMP_STR_END ']'
+
#define DELAY_TIMEOUT 100
#include
@@ -295,7 +298,40 @@ SvxColorBox::~SvxColorBox()
void SvxColorBox::Update( const XLineColorItem* pItem )
{
if ( pItem )
-SelectEntry( pItem->GetColorValue() );
+{
+ // fdo#64455
+::Color aColor = pItem->GetColorValue();
+String aString( pItem->GetName() );
+SelectEntry(aString);
+if( GetSelectEntryPos() == LISTBOX_ENTRY_NOTFOUND ||
+GetSelectEntryColor() != aColor )
+{
+SelectEntry( aColor );
+}
+// Check if the entry is not in the list
+if( GetSelectEntryPos() == LISTBOX_ENTRY_NOTFOUND ||
+GetSelectEntryColor() != aColor )
+{
+sal_uInt16 nCount = GetEntryCount();
+String aTmpStr;
+if( nCount > 0 )
+{
+// Last entry gets tested against temporary color
+aTmpStr = GetEntry( nCount - 1 );
+if( aTmpStr.GetChar(0) == TMP_STR_BEGIN &&
+ aTmpStr.GetChar(aTmpStr.Len()-1) == TMP_STR_END )
+{
+RemoveEntry( nCount - 1 );
+}
+}
+aTmpStr = TMP_STR_BEGIN;
+aTmpStr += aString;
+aTmpStr += TMP_STR_END;
+
+sal_uInt16 nPos = InsertEntry( aColor, aTmpStr );
+SelectEntryPos( nPos );
+}
+}
else
SetNoSelection();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source
filter/source/t602/t602filter.cxx |5 +
1 file changed, 1 insertion(+), 4 deletions(-)
New commits:
commit ed9a82918b87e6c82ba4fbc3324e6aaf21784468
Author: Caolán McNamara
Date: Tue Sep 17 13:45:33 2013 +0100
this SUPD is wrong since the .res stopped getting versioned
Change-Id: I93e970902f4862fa895aa768cdcb72399a1997d8
diff --git a/filter/source/t602/t602filter.cxx
b/filter/source/t602/t602filter.cxx
index 5dc1312..a5c3842 100644
--- a/filter/source/t602/t602filter.cxx
+++ b/filter/source/t602/t602filter.cxx
@@ -1103,10 +1103,7 @@ sal_Bool T602ImportFilterDialog::OptionsDlg()
void T602ImportFilterDialog::initLocale()
{
-OString aModName( "t602filter" );
-aModName += OString::number( SUPD );
-
-mpResMgr = ResMgr::CreateResMgr( aModName.getStr(), LanguageTag( meLocale)
);
+mpResMgr = ResMgr::CreateResMgr( "t602filter", LanguageTag( meLocale) );
}
ResMgr* T602ImportFilterDialog::getResMgr()
___
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' - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 56ec59f10541b924b2ee305dabb8a98c2971e848 Author: Lionel Elie Mamane Date: Tue Sep 10 16:18:36 2013 +0200 Updated core Project: help d78c3cb249a11ea45542d340754e960d47a35fa6 documentation for new UNO Date/Time/DateTime struct <-> Basic Time conversions Change-Id: I8679534affa1ac5ee22393189188ff1ac09aa0f5 Reviewed-on: https://gerrit.libreoffice.org/5945 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/helpcontent2 b/helpcontent2 index 0d8b37c..d78c3cb 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 0d8b37cd9e0b89d1136b09a81671c88fc91fee3e +Subproject commit d78c3cb249a11ea45542d340754e960d47a35fa6 ___ 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 0e0f356136ef1e481810504c1c3920b49ec1532a Author: Lionel Elie Mamane Date: Tue Sep 10 16:18:36 2013 +0200 Updated core Project: help fa2ebef5199a795f3f02a2888d6e7cac2c5d261c documentation for new UNO Date/Time/DateTime struct <-> Basic Time conversions Change-Id: I8679534affa1ac5ee22393189188ff1ac09aa0f5 Reviewed-on: https://gerrit.libreoffice.org/5899 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/helpcontent2 b/helpcontent2 index dfce9aa..fa2ebef 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit dfce9aab714cf56ec272985dd9754aa6520a813e +Subproject commit fa2ebef5199a795f3f02a2888d6e7cac2c5d261c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Branch 'libreoffice-4-1' - source/auxiliary source/text
source/auxiliary/sbasic.tree |6 +++ source/text/sbasic/shared/03030111.xhp | 58 + source/text/sbasic/shared/03030112.xhp | 58 + source/text/sbasic/shared/03030113.xhp | 58 + source/text/sbasic/shared/03030114.xhp | 58 + source/text/sbasic/shared/03030115.xhp | 57 source/text/sbasic/shared/03030116.xhp | 57 7 files changed, 352 insertions(+) New commits: commit d78c3cb249a11ea45542d340754e960d47a35fa6 Author: Lionel Elie Mamane Date: Tue Sep 10 16:18:36 2013 +0200 documentation for new UNO Date/Time/DateTime struct <-> Basic Time conversions Change-Id: I8679534affa1ac5ee22393189188ff1ac09aa0f5 Reviewed-on: https://gerrit.libreoffice.org/5945 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/source/auxiliary/sbasic.tree b/source/auxiliary/sbasic.tree index 054daad..c04ca39 100644 --- a/source/auxiliary/sbasic.tree +++ b/source/auxiliary/sbasic.tree @@ -58,6 +58,12 @@ Blue Function [Runtime] CBool Function [Runtime] CByte Function [Runtime] +CDateFromUnoDateTime Function [Runtime] +CDateToUnoDateTime Function [Runtime] +CDateFromUnoTime Function [Runtime] +CDateToUnoTime Function [Runtime] +CDateFromUnoDate Function [Runtime] +CDateToUnoDate Function [Runtime] CDateFromIso Function [Runtime] CDateToIso Function [Runtime] CDate Function [Runtime] diff --git a/source/text/sbasic/shared/03030111.xhp b/source/text/sbasic/shared/03030111.xhp new file mode 100644 index 000..e80b20d --- /dev/null +++ b/source/text/sbasic/shared/03030111.xhp @@ -0,0 +1,58 @@ + + + + + + + + + CDateToUnoDate Function [Runtime] + /text/sbasic/shared/03030111.xhp + + + Lionel Elie Mamane + Created as fork of 030107.xhp + + + + + CDateToUnoDate function + CDateToUnoDate Function [Runtime] + Returns the date as a UNO com.sun.star.util.Date struct. + +Syntax: + + CDateToUnoDate(aDate) + +Return value: +com.sun.star.util.Date +Parameters: + +aDate:Date to convert + + +Example: + + Sub ExampleCDateToUnoDate + aDatabaseRow.updateDate(3, CDateToUnoDate(Now)) + aDateControl.Date = CDateToUnoDate(Now) + End Sub + + + diff --git a/source/text/sbasic/shared/03030112.xhp b/source/text/sbasic/shared/03030112.xhp new file mode 100644 index 000..864ce7c --- /dev/null +++ b/source/text/sbasic/shared/03030112.xhp @@ -0,0 +1,58 @@ + + + + + + + + + CDateFromUnoDate Function [Runtime] + /text/sbasic/shared/03030112.xhp + + + Lionel Elie Mamane + Created as fork of 030111.xhp + + + + + CDateFromUnoDate function + CDateFromUnoDate Function [Runtime] + Converts a UNO com.sun.star.util.Date struct to a Date value. + +Syntax: + + CDateFromUnoDate(aDate) + +Return value: +Date +Parameters: + +aDate:Date to convert + + +Example: + + Sub ExampleCDateFromUnoDate + MsgBox(aDatabaseRow.getDate(3)) + MsgBox(CDateFromUnoDate(aDateControl.Date)) + End Sub + + + diff --git a/source/text/sbasic/shared/03030113.xhp b/source/text/sbasic/shared/03030113.xhp new file mode 100644 index 000..e72af81 --- /dev/null +++ b/source/text/sbasic/shared/03030113.xhp @@ -0,0 +1,58 @@ + + + + + + + + + CDateToUnoDate Function [Runtime] + /text/sbasic/shared/03030113.xhp + + + Lionel Elie Mamane + Created as fork of 030111.xhp + + + + + CDateToUnoTime function + CDateToUnoTime Function [Runtime] + Returns the time part of the date as a UNO com.sun.star.util.Time struct. + +Syntax: + + CDateToUnoTime(aDate) + +Return value: +com.sun.star.util.Time +Parameters: + +aDate:Date value to convert + + +Example: + + Sub ExampleCDateToUnoTime + aDatabaseRow.updateTime(3, CDateToUnoTime(Now)) + aTimeControl.Time = CDateToUnoTime(Now) + End Sub + + + diff --git a/source/text/sbasic/shared/03030114.xhp b/source/text/sbasic/shared/03030114.xhp new file mode 100644 index 000..7eb540b --- /dev/null +++ b/source/text/sbasic/shared/03030114.xhp @@ -0,0 +1,58 @@ + + + + + + + + + CDateFromUnoTime Function [Runtime] + /text/sbasic/shared/03030114.xhp + + + Lionel Elie Mamane + Created as fork of 030111.xhp + + + + + CDateFromUnoTime function + CDateFromUnoTime Function [Runtime] + Converts a UNO com.sun.star.util.Time struct to a Date value. + +Syntax: + + CDateFromUnoTime(aTime) + +Return value: +Date +Parameters: + +aTi
[Libreoffice-commits] help.git: source/auxiliary source/text
source/auxiliary/sbasic.tree |6 +++ source/text/sbasic/shared/03030111.xhp | 58 + source/text/sbasic/shared/03030112.xhp | 58 + source/text/sbasic/shared/03030113.xhp | 58 + source/text/sbasic/shared/03030114.xhp | 58 + source/text/sbasic/shared/03030115.xhp | 57 source/text/sbasic/shared/03030116.xhp | 57 7 files changed, 352 insertions(+) New commits: commit fa2ebef5199a795f3f02a2888d6e7cac2c5d261c Author: Lionel Elie Mamane Date: Tue Sep 10 16:18:36 2013 +0200 documentation for new UNO Date/Time/DateTime struct <-> Basic Time conversions Change-Id: I8679534affa1ac5ee22393189188ff1ac09aa0f5 Reviewed-on: https://gerrit.libreoffice.org/5899 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/source/auxiliary/sbasic.tree b/source/auxiliary/sbasic.tree index 054daad..c04ca39 100644 --- a/source/auxiliary/sbasic.tree +++ b/source/auxiliary/sbasic.tree @@ -58,6 +58,12 @@ Blue Function [Runtime] CBool Function [Runtime] CByte Function [Runtime] +CDateFromUnoDateTime Function [Runtime] +CDateToUnoDateTime Function [Runtime] +CDateFromUnoTime Function [Runtime] +CDateToUnoTime Function [Runtime] +CDateFromUnoDate Function [Runtime] +CDateToUnoDate Function [Runtime] CDateFromIso Function [Runtime] CDateToIso Function [Runtime] CDate Function [Runtime] diff --git a/source/text/sbasic/shared/03030111.xhp b/source/text/sbasic/shared/03030111.xhp new file mode 100644 index 000..e80b20d --- /dev/null +++ b/source/text/sbasic/shared/03030111.xhp @@ -0,0 +1,58 @@ + + + + + + + + + CDateToUnoDate Function [Runtime] + /text/sbasic/shared/03030111.xhp + + + Lionel Elie Mamane + Created as fork of 030107.xhp + + + + + CDateToUnoDate function + CDateToUnoDate Function [Runtime] + Returns the date as a UNO com.sun.star.util.Date struct. + +Syntax: + + CDateToUnoDate(aDate) + +Return value: +com.sun.star.util.Date +Parameters: + +aDate:Date to convert + + +Example: + + Sub ExampleCDateToUnoDate + aDatabaseRow.updateDate(3, CDateToUnoDate(Now)) + aDateControl.Date = CDateToUnoDate(Now) + End Sub + + + diff --git a/source/text/sbasic/shared/03030112.xhp b/source/text/sbasic/shared/03030112.xhp new file mode 100644 index 000..864ce7c --- /dev/null +++ b/source/text/sbasic/shared/03030112.xhp @@ -0,0 +1,58 @@ + + + + + + + + + CDateFromUnoDate Function [Runtime] + /text/sbasic/shared/03030112.xhp + + + Lionel Elie Mamane + Created as fork of 030111.xhp + + + + + CDateFromUnoDate function + CDateFromUnoDate Function [Runtime] + Converts a UNO com.sun.star.util.Date struct to a Date value. + +Syntax: + + CDateFromUnoDate(aDate) + +Return value: +Date +Parameters: + +aDate:Date to convert + + +Example: + + Sub ExampleCDateFromUnoDate + MsgBox(aDatabaseRow.getDate(3)) + MsgBox(CDateFromUnoDate(aDateControl.Date)) + End Sub + + + diff --git a/source/text/sbasic/shared/03030113.xhp b/source/text/sbasic/shared/03030113.xhp new file mode 100644 index 000..e72af81 --- /dev/null +++ b/source/text/sbasic/shared/03030113.xhp @@ -0,0 +1,58 @@ + + + + + + + + + CDateToUnoDate Function [Runtime] + /text/sbasic/shared/03030113.xhp + + + Lionel Elie Mamane + Created as fork of 030111.xhp + + + + + CDateToUnoTime function + CDateToUnoTime Function [Runtime] + Returns the time part of the date as a UNO com.sun.star.util.Time struct. + +Syntax: + + CDateToUnoTime(aDate) + +Return value: +com.sun.star.util.Time +Parameters: + +aDate:Date value to convert + + +Example: + + Sub ExampleCDateToUnoTime + aDatabaseRow.updateTime(3, CDateToUnoTime(Now)) + aTimeControl.Time = CDateToUnoTime(Now) + End Sub + + + diff --git a/source/text/sbasic/shared/03030114.xhp b/source/text/sbasic/shared/03030114.xhp new file mode 100644 index 000..7eb540b --- /dev/null +++ b/source/text/sbasic/shared/03030114.xhp @@ -0,0 +1,58 @@ + + + + + + + + + CDateFromUnoTime Function [Runtime] + /text/sbasic/shared/03030114.xhp + + + Lionel Elie Mamane + Created as fork of 030111.xhp + + + + + CDateFromUnoTime function + CDateFromUnoTime Function [Runtime] + Converts a UNO com.sun.star.util.Time struct to a Date value. + +Syntax: + + CDateFromUnoTime(aTime) + +Return value: +Date +Parameters: + +aTi
[Libreoffice-commits] help.git: source/text
source/text/scalc/01/04060110.xhp |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit dfce9aab714cf56ec272985dd9754aa6520a813e
Author: Stanislav Horacek
Date: Fri Sep 13 10:02:42 2013 +0200
more illustrative example for TRIM function
in old example function has no effect
Change-Id: If0c0778d61569b37c091e6d1a3b96eea75b37285
Reviewed-on: https://gerrit.libreoffice.org/5928
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/source/text/scalc/01/04060110.xhp
b/source/text/scalc/01/04060110.xhp
index d99a61b..4411f3e 100644
--- a/source/text/scalc/01/04060110.xhp
+++ b/source/text/scalc/01/04060110.xhp
@@ -583,11 +583,11 @@
oldref="56">Syntax
TRIM("Text")
-Text refers to text in which spaces are
removed.
+Text refers to text in which spaces are to be
removed.
Example
-=TRIM("hello") returns hello.
+=TRIM(" hello world ") returns hello
world without leading and trailing zeros and with single space between
words.
___
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 3f0c03aea689ef592810601c6b138ff52403e960 Author: Stanislav Horacek Date: Fri Sep 13 10:02:42 2013 +0200 Updated core Project: help dfce9aab714cf56ec272985dd9754aa6520a813e more illustrative example for TRIM function in old example function has no effect Change-Id: If0c0778d61569b37c091e6d1a3b96eea75b37285 Reviewed-on: https://gerrit.libreoffice.org/5928 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/helpcontent2 b/helpcontent2 index a84633c..dfce9aa 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit a84633cbbe1af244cf25fab8a5bd25b4acddd3d3 +Subproject commit dfce9aab714cf56ec272985dd9754aa6520a813e ___ 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' - svx/source
svx/source/tbxctrls/tbcontrl.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 95dfcdcf7710a2b384d3ef8a94443efee86eb701
Author: Ivan Timofeev
Date: Sat Sep 14 09:16:28 2013 +0400
fdo#68874: Highlighter icon doesn't change color if no text is selected
the problem is that bChoiceFromPalette becomes false too early when
StateChanged
is called with nSID=SID_ATTR_CHAR_COLOR_BACKGROUND_EXT (we don't handle it
in the
switch) and the following call with nSID=SID_ATTR_CHAR_COLOR_BACKGROUND
(which
we actually want to handle) is no-op.
Change-Id: I024f6a443535411648bda44576e838c3d863e7de
(cherry picked from commit 1d0e18703523139e5fd6d11b6f3d72bb0b368036)
Reviewed-on: https://gerrit.libreoffice.org/5941
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 112ef1f..94a3ebe 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2500,7 +2500,7 @@ void SvxColorExtToolBoxControl::StateChanged(
{
const SvxColorItem* pItem = 0;
-if ( bChoiceFromPalette )
+if ( bChoiceFromPalette && nSID == GetSlotId() )
{
bChoiceFromPalette = sal_False;
switch( nSID )
___
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' - vcl/unx
vcl/unx/gtk/gdi/salprn-gtk.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit f8f5c9eaab6cd3675358064feec68c7481a38154
Author: Arnaud Versini
Date: Sun Sep 15 17:54:06 2013 +0200
Fix fdo#69381 by skipping empty option groups
Change-Id: Idaf0f0a3f5430a5aea6f77a003e205116a87cc67
Reviewed-on: https://gerrit.libreoffice.org/5949
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
Reviewed-on: https://gerrit.libreoffice.org/5972
diff --git a/vcl/unx/gtk/gdi/salprn-gtk.cxx b/vcl/unx/gtk/gdi/salprn-gtk.cxx
index 228413b..b94397d 100644
--- a/vcl/unx/gtk/gdi/salprn-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salprn-gtk.cxx
@@ -483,6 +483,11 @@ GtkPrintDialog::impl_initCustomTab()
GtkWidget* pGroup = NULL;
bool bGtkInternal = false;
+//Fix fdo#69381
+//Next options if this one is empty
+if ( aOptProp.getLength() == 0)
+continue;
+
for (int n = 0; n != aOptProp.getLength(); n++)
{
const beans::PropertyValue& rEntry(aOptProp[ n ]);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: lingucomponent/source
lingucomponent/source/spellcheck/spell/sspellimp.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 91a1e61ec6ad00b1ed91af47e2fde90b7365cc06
Author: Eike Rathke
Date: Tue Sep 17 14:06:00 2013 +0200
clearly it's enough to obtain the const array once
Change-Id: I6d9ffef6b052012d09ff54d2a457e1314e6239ee
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
index 9d48775..7e1a1c5 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
@@ -243,10 +243,10 @@ sal_Bool SAL_CALL SpellChecker::hasLocale(const Locale&
rLocale)
if (!aSuppLocales.getLength())
getLocales();
+const Locale *pLocale = aSuppLocales.getConstArray();
sal_Int32 nLen = aSuppLocales.getLength();
for (sal_Int32 i = 0; i < nLen; ++i)
{
-const Locale *pLocale = aSuppLocales.getConstArray();
if (rLocale == pLocale[i])
{
bRes = sal_True;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |6 -- source/text/shared/02/01170300.xhp | 21 + 2 files changed, 9 insertions(+), 18 deletions(-) New commits: commit a84633cbbe1af244cf25fab8a5bd25b4acddd3d3 Author: Caolán McNamara Date: Tue Sep 17 12:48:58 2013 +0100 update helpids for forms taborder change dialog Change-Id: I36706ca1a0c290151cbe72b2a17a84f6ed0a3b7f diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index cd4ad8c..a00e5e0 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -2808,7 +2808,6 @@ HID_PROP_SUBMIT_METHOD,37825, HID_PROP_SUBMIT_TARGET,37828, HID_PROP_SYMBOLCOLOR,37907, HID_PROP_TABINDEX,37773, -HID_PROP_TABORDER_CONTROLS,37916, HID_PROP_TABSTOP,37821, HID_PROP_TAG,37858, HID_PROP_TARGET_FRAME,37857, @@ -3658,7 +3657,6 @@ HID_TABLE_DESIGN_NO_CONNECTION,38926, HID_TABLE_DESIGN_TABPAGE_GENERAL,38893, HID_TABLE_TEXTFLOW,53196, HID_TABLE_TOOLBOX,54828, -HID_TABORDER_CONTROLS,38193, HID_TAB_AUTOINCREMENTVALUE,38996, HID_TAB_DESIGN_DESCWIN,38882, HID_TAB_DESIGN_FIELDCONTROL,38880, @@ -5993,7 +5991,6 @@ extensions_ModalDialog_RID_DLG_NEW_DATA_TYPE,1090191360, extensions_ModalDialog_RID_DLG_OEMWIZARD,1090519040, extensions_ModalDialog_RID_DLG_SELECTION,1090174976, extensions_ModalDialog_RID_DLG_SELECTLABELCONTROL,1090125824, -extensions_ModalDialog_RID_DLG_TABORDER,1090142208, extensions_ModalDialog_RID_SANE_DIALOG,1090125824, extensions_MultiLineEdit_RID_TP_LICENSE_ML_LICENSE,553667083, extensions_NumericBox_RID_SANE_DIALOG_RID_SCAN_RESOLUTION_BOX,1090135057, @@ -6002,9 +5999,6 @@ extensions_PushButton_GRID_DIALOG_GRID_DIALOG_RESET_BTN,1091768835, extensions_PushButton_RID_DLG_FORMLINKS_PB_SUGGEST,1090163204, extensions_PushButton_RID_DLG_OEMWIZARD_PB_NEXT,1090523650, extensions_PushButton_RID_DLG_OEMWIZARD_PB_PREV,1090523649, -extensions_PushButton_RID_DLG_TABORDER_PB_AUTO_ORDER,1090146819, -extensions_PushButton_RID_DLG_TABORDER_PB_MOVE_DOWN,1090146818, -extensions_PushButton_RID_DLG_TABORDER_PB_MOVE_UP,1090146817, extensions_PushButton_RID_PAGE_ADMININVOKATION_PB_INVOKE_ADMIN_DIALOG,860639745, extensions_PushButton_RID_PAGE_FIELDMAPPING_PB_INVOKE_FIELDS_DIALOG,860672514, extensions_PushButton_RID_PAGE_FINAL_PB_BROWSE,860688899, diff --git a/source/text/shared/02/01170300.xhp b/source/text/shared/02/01170300.xhp index 1228290..cbc9771 100644 --- a/source/text/shared/02/01170300.xhp +++ b/source/text/shared/02/01170300.xhp @@ -31,7 +31,7 @@ -Tab Order +Tab Order In the Tab Order dialog you can modify the order in which control fields get the focus when the user presses the tab key. the button Activation Order on Form Design toolbar opens the Tab Order dialog @@ -41,16 +41,13 @@ If form elements are inserted into a document, %PRODUCTNAME automatically determines in which order to move from one control to the next when using the Tab key. Every new control added is automatically placed at the end of this series. In the Tab Order dialog, you can adapt the order of this series to your individual needs. You can also define the index of a control through its specific properties by entering the desired value under Order in the Properties dialog of the control. A radio button inside a group can only be accessed by the Tab key when one of the radio buttons is set to "selected". If you have designed a group of radio buttons where no button is set to "selected", then the user will not be able to access the group or any of the radio buttons by keyboard. -Controls -Lists all controls in the form. These controls can be selected with the tab key in the given order from top to bottom. Select a control from the Controls list to assign the desired position in the tab order. - -Move Up -Click the Move Up button to shift the selected control one position higher in the tab order. - -Move Down -Click the Move Down button to shift the selected control one position lower in the tab order. - -Automatic Sort -Click the Automatic Sort button to automatically sort the controls according to their position in the document. +Controls +Lists all controls in the form. These controls can be selected with the tab key in the given order from top to bottom. Select a control from the Controls list to assign the desired position in the tab order. +Move Up +Click the Move Up button to shift the selected control one position higher in the tab order. +Move Down +Click the Move Down button to shift the selected control one position lower in the tab order. +Automatic Sort +Click the Automatic Sort button to automatically sort the controls according to their position in the document. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - extensions/inc helpcontent2
extensions/inc/propctrlr.hrc |1 - helpcontent2 |2 +- 2 files changed, 1 insertion(+), 2 deletions(-) New commits: commit 9d026b55cb93fd209a09d495acd56f316b3ac41b Author: Caolán McNamara Date: Tue Sep 17 12:49:08 2013 +0100 drop unused hids Change-Id: I504e2abd967476f2346095fea23c8cd8fbf9ebfc diff --git a/extensions/inc/propctrlr.hrc b/extensions/inc/propctrlr.hrc index 8d729f9..da26a11 100644 --- a/extensions/inc/propctrlr.hrc +++ b/extensions/inc/propctrlr.hrc @@ -226,7 +226,6 @@ #define HID_PROP_REPEAT "EXTENSIONS_HID_PROP_REPEAT" #define HID_PROP_WORDBREAK "EXTENSIONS_HID_PROP_WORDBREAK" #define HID_PROP_SHOW_SCROLLBARS "EXTENSIONS_HID_PROP_SHOW_SCROLLBARS" -#define HID_PROP_TABORDER_CONTROLS "EXTENSIONS_HID_PROP_TABORDER_CONTROLS" #define HID_FIELDLINK_DETAIL_COLUMN "EXTENSIONS_HID_FIELDLINK_DETAIL_COLUMN" #define HID_FIELDLINK_MASTER_COLUMN "EXTENSIONS_HID_FIELDLINK_MASTER_COLUMN" #define UID_FIELDLINK_DETAIL1 "EXTENSIONS_UID_FIELDLINK_DETAIL1" commit a17e638e58bf8e4eee9c01025a789f417eb6e738 Author: Caolán McNamara Date: Tue Sep 17 12:48:58 2013 +0100 Updated core Project: help a84633cbbe1af244cf25fab8a5bd25b4acddd3d3 diff --git a/helpcontent2 b/helpcontent2 index f4fb073..a84633c 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit f4fb073eb945af1070a0fe797eb81d7c3011489c +Subproject commit a84633cbbe1af244cf25fab8a5bd25b4acddd3d3 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extensions/source extensions/uiconfig extensions/UIConfig_sbibliography.mk extensions/UIConfig_spropctrlr.mk
extensions/UIConfig_sbibliography.mk | 2 extensions/UIConfig_spropctrlr.mk | 2 extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml | 88 - extensions/source/propctrlr/uiconfig/spropctrlr/ui/taborder.ui| 170 -- extensions/uiconfig/sbibliography/menubar/menubar.xml | 88 + extensions/uiconfig/spropctrlr/ui/taborder.ui | 170 ++ 6 files changed, 260 insertions(+), 260 deletions(-) New commits: commit 910bfc08e3e0cd03d3483fd38175852f8103543a Author: Caolán McNamara Date: Tue Sep 17 12:40:04 2013 +0100 move uiconfig stuff into the same toplevel source dir Change-Id: I5cbb4d2cd367cb62af3d6ddde24e7e2d3598b75b diff --git a/extensions/UIConfig_sbibliography.mk b/extensions/UIConfig_sbibliography.mk index 465563c..1517d1d 100644 --- a/extensions/UIConfig_sbibliography.mk +++ b/extensions/UIConfig_sbibliography.mk @@ -10,7 +10,7 @@ $(eval $(call gb_UIConfig_UIConfig,modules/sbibliography)) $(eval $(call gb_UIConfig_add_menubarfiles,modules/sbibliography,\ - extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar \ + extensions/uiconfig/sbibliography/menubar/menubar \ )) # vim: set noet sw=4 ts=4: diff --git a/extensions/UIConfig_spropctrlr.mk b/extensions/UIConfig_spropctrlr.mk index 4a4becc..faf134a 100644 --- a/extensions/UIConfig_spropctrlr.mk +++ b/extensions/UIConfig_spropctrlr.mk @@ -10,7 +10,7 @@ $(eval $(call gb_UIConfig_UIConfig,modules/spropctrlr)) $(eval $(call gb_UIConfig_add_uifiles,modules/spropctrlr,\ - extensions/source/propctrlr/uiconfig/spropctrlr/ui/taborder \ + extensions/uiconfig/spropctrlr/ui/taborder \ )) # vim: set noet sw=4 ts=4: diff --git a/extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml b/extensions/uiconfig/sbibliography/menubar/menubar.xml similarity index 100% rename from extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml rename to extensions/uiconfig/sbibliography/menubar/menubar.xml diff --git a/extensions/source/propctrlr/uiconfig/spropctrlr/ui/taborder.ui b/extensions/uiconfig/spropctrlr/ui/taborder.ui similarity index 100% rename from extensions/source/propctrlr/uiconfig/spropctrlr/ui/taborder.ui rename to extensions/uiconfig/spropctrlr/ui/taborder.ui ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extensions/AllLangResTarget_pcr.mk extensions/Module_extensions.mk extensions/source extensions/UIConfig_spropctrlr.mk extras/source scp2/source
extensions/AllLangResTarget_pcr.mk |1
extensions/Module_extensions.mk|1
extensions/UIConfig_spropctrlr.mk | 16
extensions/source/propctrlr/taborder.cxx | 75 ++--
extensions/source/propctrlr/taborder.hrc | 36 --
extensions/source/propctrlr/taborder.hxx | 15
extensions/source/propctrlr/taborder.src | 96 -
extensions/source/propctrlr/uiconfig/spropctrlr/ui/taborder.ui | 170
++
extras/source/glade/libreoffice-catalog.xml.in |3
scp2/source/ooo/file_ooo.scp |1
10 files changed, 238 insertions(+), 176 deletions(-)
New commits:
commit 2f7f7e7717075867080433ba09188a09830584ab
Author: Manal Alhassoun
Date: Tue Sep 17 08:46:10 2013 +0300
Convert tab order dialog to widget UI
Change-Id: I2aebcf6486b80af31f1a06e9ae38e5610bee0cb4
Reviewed-on: https://gerrit.libreoffice.org/5970
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/extensions/AllLangResTarget_pcr.mk
b/extensions/AllLangResTarget_pcr.mk
index ad32eb5..415cb55 100644
--- a/extensions/AllLangResTarget_pcr.mk
+++ b/extensions/AllLangResTarget_pcr.mk
@@ -28,7 +28,6 @@ $(eval $(call gb_SrsTarget_add_files,pcr/res,\
extensions/source/propctrlr/propres.src \
extensions/source/propctrlr/formres.src \
extensions/source/propctrlr/pcrmiscres.src \
- extensions/source/propctrlr/taborder.src \
extensions/source/propctrlr/fontdialog.src \
extensions/source/propctrlr/selectlabeldialog.src \
extensions/source/propctrlr/formlinkdialog.src \
diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk
index 0f7857e..20fc58c 100644
--- a/extensions/Module_extensions.mk
+++ b/extensions/Module_extensions.mk
@@ -35,6 +35,7 @@ $(eval $(call gb_Module_add_targets,extensions,\
Library_dbp \
Library_pcr \
UIConfig_sbibliography \
+ UIConfig_spropctrlr \
))
endif
diff --git a/extensions/UIConfig_spropctrlr.mk
b/extensions/UIConfig_spropctrlr.mk
new file mode 100644
index 000..4a4becc
--- /dev/null
+++ b/extensions/UIConfig_spropctrlr.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call gb_UIConfig_UIConfig,modules/spropctrlr))
+
+$(eval $(call gb_UIConfig_add_uifiles,modules/spropctrlr,\
+ extensions/source/propctrlr/uiconfig/spropctrlr/ui/taborder \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extensions/source/propctrlr/taborder.cxx
b/extensions/source/propctrlr/taborder.cxx
index bbb0f6f..285aedc 100644
--- a/extensions/source/propctrlr/taborder.cxx
+++ b/extensions/source/propctrlr/taborder.cxx
@@ -18,7 +18,6 @@
*/
#include "taborder.hxx"
-#include "taborder.hrc"
#include "modulepcr.hxx"
#include "formresid.hrc"
@@ -29,7 +28,8 @@
#include
#include
#include
-#include "svtools/treelistentry.hxx"
+#include
+#include
//
namespace pcr
@@ -74,27 +74,25 @@ namespace pcr
//
TabOrderDialog::TabOrderDialog( Window* _pParent, const Reference<
XTabControllerModel >& _rxTabModel,
const Reference< XControlContainer >& _rxControlCont,
const Reference< XComponentContext >& _rxORB )
-:ModalDialog( _pParent, PcrRes( RID_DLG_TABORDER ) )
+:ModalDialog( _pParent, "TabOrderDialog",
"modules/spropctrlr/ui/taborder.ui")
,m_xModel( _rxTabModel )
,m_xControlContainer( _rxControlCont )
,m_xORB( _rxORB )
-,aFT_Controls( this, PcrRes( FT_CONTROLS ) )
-,aLB_Controls( this, PcrRes( CTRL_TREE ) )
-,aPB_OK( this, PcrRes( PB_OK ) )
-,aPB_CANCEL( this, PcrRes( PB_CANCEL ) )
-,aPB_HELP( this, PcrRes( PB_HELP ) )
-,aPB_MoveUp( this, PcrRes( PB_MOVE_UP ) )
-,aPB_MoveDown( this, PcrRes( PB_MOVE_DOWN ) )
-,aPB_AutoOrder( this, PcrRes( PB_AUTO_ORDER ) )
,pImageList( NULL )
{
+get(m_pLB_Controls, "CTRLtree");
+get(m_pPB_OK, "ok");
+get(m_pPB_MoveUp, "upB");
+get(m_pPB_MoveDown, "downB");
+get(m_pPB_AutoOrder, "autoB");
+
DBG_CTOR(TabOrderDialog,NULL);
-aPB_MoveUp.SetClickHdl( LINK( this, TabOrderDialog, MoveUpClickHdl ) );
-aPB_MoveDown.SetClickHdl( LINK( this, TabOrderDialog, MoveDownClickHdl
) );
-aPB_AutoOrder.SetClickHdl( LINK( this, TabOrderDialog,
AutoOrderClickHdl )
[Libreoffice-commits] core.git: extras/source include/svtools svtools/source
extras/source/glade/libreoffice-catalog.xml.in | 13 -
include/svtools/treelistbox.hxx|5 +
svtools/source/contnr/treelistbox.cxx | 25 +++--
3 files changed, 40 insertions(+), 3 deletions(-)
New commits:
commit eae6c400109c91237ea5e7890f8d950ee0e52cbb
Author: Caolán McNamara
Date: Tue Sep 17 12:34:53 2013 +0100
add a min-width-chars property to SvTreeListBox
Change-Id: If6213ab630222d0d9483beea602ea9d54be2396c
Reviewed-on: https://gerrit.libreoffice.org/5971
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/extras/source/glade/libreoffice-catalog.xml.in
b/extras/source/glade/libreoffice-catalog.xml.in
index b291c13..8f9b780 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -388,7 +388,18 @@
icon-name="widget-gtk-treeview"/>
+icon-name="widget-gtk-treeview">
+
+
+
+GParamInt
+-1
+
+ The desired minimum width of the SvTreeListBox, in
characters
+
+
+
+
diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx
index 699300f..404689a 100644
--- a/include/svtools/treelistbox.hxx
+++ b/include/svtools/treelistbox.hxx
@@ -238,6 +238,7 @@ class SVT_DLLPUBLIC SvTreeListBox
DragDropModenOldDragMode;
SelectionMode eSelMode;
sal_Int8nDragOptions;
+sal_Int32 nMinWidthInChars;
SvTreeListEntry*pEdEntry;
SvLBoxItem* pEdItem;
@@ -501,6 +502,10 @@ public:
/** Enables, that one cell of a tablistbox entry can be focused */
void EnableCellFocus();
+void set_min_width_in_chars(sal_Int32 nChars);
+
+virtual bool set_property(const OString &rKey, const OString &rValue);
+
protected:
using SvListView::Expand;
using SvListView::Collapse;
diff --git a/svtools/source/contnr/treelistbox.cxx
b/svtools/source/contnr/treelistbox.cxx
index b942469..ec29608 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -401,7 +401,8 @@ SvTreeListBox::SvTreeListBox(Window* pParent, WinBits
nWinStyle) :
DragSourceHelper(this),
mpImpl(new SvTreeListBoxImpl(*this)),
mbContextBmpExpanded(false),
-eSelMode(NO_SELECTION)
+eSelMode(NO_SELECTION),
+nMinWidthInChars(0)
{
DBG_CTOR(SvTreeListBox,0);
nDragOptions = DND_ACTION_COPYMOVE | DND_ACTION_LINK;
@@ -430,7 +431,8 @@ SvTreeListBox::SvTreeListBox(Window* pParent, const ResId&
rResId) :
DragSourceHelper(this),
mpImpl(new SvTreeListBoxImpl(*this)),
mbContextBmpExpanded(false),
-eSelMode(NO_SELECTION)
+eSelMode(NO_SELECTION),
+nMinWidthInChars(0)
{
DBG_CTOR(SvTreeListBox,0);
pTargetEntry = 0;
@@ -3454,6 +3456,8 @@ Size SvTreeListBox::GetOptimalSize() const
aRet.Width() += rStyleSettings.GetBorderSize() * 2;
aRet.Height() += rStyleSettings.GetBorderSize() * 2;
}
+long nMinWidth = nMinWidthInChars * approximate_char_width();
+aRet.Width() = std::max(aRet.Width(), nMinWidth);
return aRet;
}
@@ -3983,4 +3987,21 @@ void SvTreeListBox::FillAccessibleStateSet(
::utl::AccessibleStateSetHelper& /*r
{
}
+void SvTreeListBox::set_min_width_in_chars(sal_Int32 nChars)
+{
+nMinWidthInChars = nChars;
+queue_resize();
+}
+
+bool SvTreeListBox::set_property(const OString &rKey, const OString &rValue)
+{
+if (rKey == "min-width-chars")
+{
+set_min_width_in_chars(rValue.toInt32());
+}
+else
+return Control::set_property(rKey, rValue);
+return true;
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 mariosv changed: What|Removed |Added Depends on||69450 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/sc-notes-storage' - sc/source
sc/source/core/data/column.cxx |9 ++--
sc/source/core/data/column3.cxx | 41
2 files changed, 36 insertions(+), 14 deletions(-)
New commits:
commit 0a09abdf5f33b9d4a283af26b00c8ee8ad8dde14
Author: Laurent Godard
Date: Tue Sep 17 12:57:13 2013 +0200
notes & clipboard
a note is now copied, but at wrong line
Change-Id: Idc3f4ec64007ba4b8430353c0e33c1d8fdbc1b96
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 1ade76b..18592fd 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -1430,9 +1430,14 @@ public:
{
ScPostIt* pSrcNote =
maSrcCellNotes.get(nTopRow);
if (pSrcNote)
-pSrcNote->Clone( ScAddress(mrSrcCol.GetCol(), nTopRow,
mrSrcCol.GetTab() ),
+{
+ScAddress aDestPos = ScAddress(mrDestCol.GetCol(),
nTopRow, mrDestCol.GetTab());
+ScPostIt* pClonedNote = pSrcNote->Clone(
ScAddress(mrSrcCol.GetCol(), nTopRow, mrSrcCol.GetTab() ),
mrDestCol.GetDoc(),
- ScAddress(mrDestCol.GetCol(),
nTopRow, mrDestCol.GetTab()), true );
+ aDestPos, true );
+mrDestCol.GetDoc().ReleaseNote(aDestPos);
+mrDestCol.GetDoc().SetNote(aDestPos, pClonedNote);
+}
}
}
}
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index d7a6014..19f2aa7 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -769,14 +769,19 @@ public:
{
ScPostIt* pSrcNote =
maCellNotesSrc.get(nSrcRow);
if (pSrcNote)
-pSrcNote->Clone( ScAddress(mnSrcCol, nSrcRow,
mnSrcTab ),
+{
+ScAddress aDestPos =
ScAddress(mrDestCol.GetCol(), nSrcRow, mrDestCol.GetTab());
+ScPostIt* pClonedNote = pSrcNote->Clone(
ScAddress(mrSrcCol.GetCol(), nSrcRow, mrSrcCol.GetTab() ),
mrDestCol.GetDoc(),
- ScAddress(mnCol , nSrcRow,
mnTab),
- true );
+ aDestPos, true );
+mrDestCol.GetDoc().ReleaseNote(aDestPos);
+mrDestCol.GetDoc().SetNote(aDestPos,
pClonedNote);
+}
}
}
}
}
+
break;
case sc::element_type_string:
{
@@ -803,10 +808,14 @@ public:
{
ScPostIt* pSrcNote =
maCellNotesSrc.get(nSrcRow);
if (pSrcNote)
-pSrcNote->Clone( ScAddress(mnSrcCol, nSrcRow,
mnSrcTab ),
+{
+ScAddress aDestPos =
ScAddress(mrDestCol.GetCol(), nSrcRow, mrDestCol.GetTab());
+ScPostIt* pClonedNote = pSrcNote->Clone(
ScAddress(mrSrcCol.GetCol(), nSrcRow, mrSrcCol.GetTab() ),
mrDestCol.GetDoc(),
- ScAddress(mnCol , nSrcRow,
mnTab),
- true );
+ aDestPos, true );
+mrDestCol.GetDoc().ReleaseNote(aDestPos);
+mrDestCol.GetDoc().SetNote(aDestPos,
pClonedNote);
+}
}
}
}
@@ -838,10 +847,14 @@ public:
{
ScPostIt* pSrcNote =
maCellNotesSrc.get(nSrcRow);
if (pSrcNote)
-pSrcNote->Clone( ScAddress(mnSrcCol, nSrcRow,
mnSrcTab ),
+{
+ScAddress aDestPos =
ScAddress(mrDestCol.GetCol(), nSrcRow, mrDestCol.GetTab());
+ScPostIt* pClonedNote = pSrcNote->Clone(
ScAddress(mrSrcCol.GetCol(), nSrcRow, mrSrcCol.GetTab() ),
mrDestCol.GetDoc(),
- ScAddress(mnCol , nSrcRow,
mnTab),
- true );
+ aDestPos, true );
+mrDestCol.GetDoc().ReleaseNote(aDestPos);
+mrDestC
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4af723397ec041f006ffce57f6347e669076e167 Author: Stanislav Horacek Date: Sun Sep 15 15:07:55 2013 +0200 Updated core Project: help f4fb073eb945af1070a0fe797eb81d7c3011489c fdo#60711 update chart object description Change-Id: Ie903e86e4903b74e9c5271f5bb2f5312815fd051 Reviewed-on: https://gerrit.libreoffice.org/5947 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/helpcontent2 b/helpcontent2 index 397491d..f4fb073 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 397491d21c2c306e9913ca2672ee968153bdcffe +Subproject commit f4fb073eb945af1070a0fe797eb81d7c3011489c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk/gdi/salprn-gtk.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit 0c47695fd3ee85b8c24d6969e3061ec23a0cfdc4
Author: Arnaud Versini
Date: Sun Sep 15 17:54:06 2013 +0200
Fix fdo#69381 by skipping empty option groups
Change-Id: Idaf0f0a3f5430a5aea6f77a003e205116a87cc67
Reviewed-on: https://gerrit.libreoffice.org/5949
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/vcl/unx/gtk/gdi/salprn-gtk.cxx b/vcl/unx/gtk/gdi/salprn-gtk.cxx
index 0722f78..4a28fcd 100644
--- a/vcl/unx/gtk/gdi/salprn-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salprn-gtk.cxx
@@ -483,6 +483,11 @@ GtkPrintDialog::impl_initCustomTab()
GtkWidget* pGroup = NULL;
bool bGtkInternal = false;
+//Fix fdo#69381
+//Next options if this one is empty
+if ( aOptProp.getLength() == 0)
+continue;
+
for (int n = 0; n != aOptProp.getLength(); n++)
{
const beans::PropertyValue& rEntry(aOptProp[ n ]);
___
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/guide/chart_insert.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f4fb073eb945af1070a0fe797eb81d7c3011489c Author: Stanislav Horacek Date: Sun Sep 15 15:07:55 2013 +0200 fdo#60711 update chart object description Change-Id: Ie903e86e4903b74e9c5271f5bb2f5312815fd051 Reviewed-on: https://gerrit.libreoffice.org/5947 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/source/text/shared/guide/chart_insert.xhp b/source/text/shared/guide/chart_insert.xhp index ae28369..5462588 100644 --- a/source/text/shared/guide/chart_insert.xhp +++ b/source/text/shared/guide/chart_insert.xhp @@ -57,7 +57,7 @@ YJ: checked new bits These charts are snapshots of the data at the time of copying. They do not change when the source data changes. -In Calc, a chart is an object on a sheet, it cannot be a sheet of its own. +In Calc, a chart is an object on a sheet that can be copied and pasted on another sheet of the same document, the data series will stay linked to the range on the other sheet. If it is pasted on another Calc document, it has its own chart data table and is no more linked to the original range. Chart in a Calc spreadsheet ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk vcl/inc vcl/source
sw/UIConfig_swriter.mk |1
sw/inc/helpid.h|1
sw/source/ui/config/mailconfigpage.src |1
sw/uiconfig/swriter/ui/testmailsettings.ui | 177 +
vcl/inc/outdev.h |2
vcl/source/app/svmain.cxx |1
vcl/source/gdi/outdev3.cxx |4
7 files changed, 178 insertions(+), 9 deletions(-)
New commits:
commit abe21b68fa7d384085a5e2788dcb32bba15025f1
Author: Caolán McNamara
Date: Tue Sep 17 11:50:48 2013 +0100
I think the CWS-gfbfcfg dust has safely settled by now
Change-Id: I23201c96fff514cf5eaaf69f9841d3ea6ade6070
diff --git a/vcl/inc/outdev.h b/vcl/inc/outdev.h
index fdeae8b..6291866 100644
--- a/vcl/inc/outdev.h
+++ b/vcl/inc/outdev.h
@@ -245,8 +245,6 @@ struct ImplOutDevData
basegfx::B2DHomMatrix* mpInverseViewTransform;
};
-void ImplFreeOutDevFontData();
-
#endif // _SV_OUTDEV_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index fdfe580..5bae2df 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -550,7 +550,6 @@ void DeInitVCL()
pSVData->maGDIData.mpScreenFontList = NULL;
delete pSVData->maGDIData.mpScreenFontCache;
pSVData->maGDIData.mpScreenFontCache = NULL;
-ImplFreeOutDevFontData();
if ( pSVData->mpResMgr )
{
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 084d62d..2a0a3b6 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -288,10 +288,6 @@ void OutputDevice::ImplUpdateAllFontData( bool
bNewFontLists )
}
}
-// TODO: remove this method when the CWS-gfbfcfg dust has settled
-void ImplFreeOutDevFontData()
-{}
-
void OutputDevice::BeginFontSubstitution()
{
ImplSVData* pSVData = ImplGetSVData();
commit cedb2fb971cafee49a2f545ea29aa2257e14de06
Author: Caolán McNamara
Date: Tue Sep 17 09:10:07 2013 +0100
convert test email account settings to .ui
Change-Id: I0582dc7e437382c5802acc45fa3da396e254e0a3
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 9df8021..8160b80 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -183,6 +183,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/splittable \
sw/uiconfig/swriter/ui/statisticsinfopage \
sw/uiconfig/swriter/ui/stringinput \
+ sw/uiconfig/swriter/ui/testmailsettings \
sw/uiconfig/swriter/ui/tocdialog \
sw/uiconfig/swriter/ui/tocentriespage \
sw/uiconfig/swriter/ui/tocindexpage \
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 344a790..5e2c42a 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -382,7 +382,6 @@
#define HID_MM_ASSIGNFIELDS
"SW_HID_MM_ASSIGNFIELDS"
#define HID_MM_LAYOUT_PAGE
"SW_HID_MM_LAYOUT_PAGE"
#define HID_MM_ADDRESSLIST_HB
"SW_HID_MM_ADDRESSLIST_HB"
-#define HID_MM_TESTACCOUNTSETTINGS
"SW_HID_MM_TESTACCOUNTSETTINGS"
#define HID_MM_TESTACCOUNTSETTINGS_TLB
"SW_HID_MM_TESTACCOUNTSETTINGS_TLB"
#define HID_MM_TESTACCOUNTSETTINGS_HB
"SW_HID_MM_TESTACCOUNTSETTINGS_HB"
#define HID_MM_MAILBODY
"SW_HID_MM_MAILBODY"
diff --git a/sw/source/ui/config/mailconfigpage.src
b/sw/source/ui/config/mailconfigpage.src
index aaf1588..11b1c91 100644
--- a/sw/source/ui/config/mailconfigpage.src
+++ b/sw/source/ui/config/mailconfigpage.src
@@ -28,7 +28,6 @@ ModalDialog DLG_MM_TESTACCOUNTSETTINGS
{
OutputSize = TRUE ;
SVLook = TRUE ;
-HelpID = HID_MM_TESTACCOUNTSETTINGS;
Size = MAP_APPFONT ( 250 , 176 ) ;
Moveable = TRUE ;
diff --git a/sw/uiconfig/swriter/ui/testmailsettings.ui
b/sw/uiconfig/swriter/ui/testmailsettings.ui
new file mode 100644
index 000..1307d52
--- /dev/null
+++ b/sw/uiconfig/swriter/ui/testmailsettings.ui
@@ -0,0 +1,177 @@
+
+
+
+
+False
+6
+Test Account Settings
+dialog
+
+
+False
+vertical
+12
+
+
+True
+False
+True
+True
+0
+none
+
+
+True
+False
+True
+True
+6
+12
+
+
+True
+False
+True
+True
+
+
+
+
+
+
+True
+False
+%PRODUCTNAME is testing the e-mail
account settings...
+
+
+
+
+
[Libreoffice-commits] core.git: Branch 'feature/sc-notes-storage' - sc/inc sc/source
sc/inc/clipcontext.hxx |2 +
sc/inc/column.hxx | 30 +++
sc/inc/mtvelements.hxx |3 +
sc/source/core/data/clipcontext.cxx | 10 -
sc/source/core/data/column.cxx | 48
sc/source/core/data/column3.cxx | 70
sc/source/core/data/table2.cxx | 45 ++-
7 files changed, 159 insertions(+), 49 deletions(-)
New commits:
commit 01b9b4e09fdd9b306d617cdb37d82f48df6d60fe
Author: Laurent Godard
Date: Tue Sep 17 12:40:47 2013 +0200
notes & clipboard
still not working at this stage, at least it builds
Change-Id: Ic2deabe2e35ff9e09146a75396f1dda76929864b
diff --git a/sc/inc/clipcontext.hxx b/sc/inc/clipcontext.hxx
index 8a847bd..dd63ba6 100644
--- a/sc/inc/clipcontext.hxx
+++ b/sc/inc/clipcontext.hxx
@@ -46,6 +46,7 @@ class CopyFromClipContext : public ClipContextBase
sal_uInt16 mnInsertFlag;
boolmbAsLink:1;
boolmbSkipAttrForEmptyCells:1;
+boolmbCloneNotes;
CopyFromClipContext(); // disabled
@@ -66,6 +67,7 @@ public:
sal_uInt16 getInsertFlag() const;
bool isAsLink() const;
bool isSkipAttrForEmptyCells() const;
+bool isCloneNotes() const;
};
class CopyToClipContext : public ClipContextBase
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 75270d6..6c01bb2 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -208,22 +208,20 @@ public:
boolIsAllAttrEqual( const ScColumn& rCol, SCROW nStartRow, SCROW
nEndRow ) const;
boolTestInsertCol( SCROW nStartRow, SCROW nEndRow) const;
-bool TestInsertRow( SCROW nStartRow, SCSIZE nSize ) const;
-voidInsertRow( SCROW nStartRow, SCSIZE nSize );
-voidDeleteRow( SCROW nStartRow, SCSIZE nSize );
-voidDeleteArea(SCROW nStartRow, SCROW nEndRow, sal_uInt16 nDelFlag
);
-void CopyToClip(
-sc::CopyToClipContext& rCxt, SCROW nRow1, SCROW nRow2, ScColumn&
rColumn ) const;
-void CopyStaticToDocument(SCROW nRow1, SCROW nRow2, ScColumn& rDestCol);
-void CopyCellToDocument( SCROW nSrcRow, SCROW nDestRow, ScColumn& rDestCol
);
-bool InitBlockPosition( sc::ColumnBlockPosition& rBlockPos );
-bool InitBlockPosition( sc::ColumnBlockConstPosition& rBlockPos ) const;
-void CopyFromClip(
-sc::CopyFromClipContext& rCxt, SCROW nRow1, SCROW nRow2, long nDy,
ScColumn& rColumn );
-
-void StartListeningInArea( sc::StartListeningContext& rCxt, SCROW nRow1,
SCROW nRow2 );
-
-voidRemoveEditAttribs( SCROW nStartRow, SCROW nEndRow );
+boolTestInsertRow( SCROW nStartRow, SCSIZE nSize ) const;
+voidInsertRow( SCROW nStartRow, SCSIZE nSize );
+voidDeleteRow( SCROW nStartRow, SCSIZE nSize );
+voidDeleteArea(SCROW nStartRow, SCROW nEndRow, sal_uInt16 nDelFlag );
+voidCopyToClip( sc::CopyToClipContext& rCxt, SCROW nRow1, SCROW nRow2,
ScColumn& rColumn ) const;
+voidCopyStaticToDocument(SCROW nRow1, SCROW nRow2, ScColumn& rDestCol);
+voidCopyCellToDocument( SCROW nSrcRow, SCROW nDestRow, ScColumn&
rDestCol );
+boolInitBlockPosition( sc::ColumnBlockPosition& rBlockPos );
+boolInitBlockPosition( sc::ColumnBlockConstPosition& rBlockPos ) const;
+voidCopyFromClip( sc::CopyFromClipContext& rCxt, SCROW nRow1, SCROW
nRow2, long nDy, ScColumn& rColumn );
+
+voidStartListeningInArea( sc::StartListeningContext& rCxt, SCROW
nRow1, SCROW nRow2 );
+
+voidRemoveEditAttribs( SCROW nStartRow, SCROW nEndRow );
// Selection (?) of this document
void MixMarked(
diff --git a/sc/inc/mtvelements.hxx b/sc/inc/mtvelements.hxx
index f7dd3cb..818be1b 100644
--- a/sc/inc/mtvelements.hxx
+++ b/sc/inc/mtvelements.hxx
@@ -118,6 +118,7 @@ struct ColumnBlockPosition
CellStoreType::iterator miCellPos;
ColumnBlockPosition(): miCellPos() {}
+
};
struct ColumnBlockConstPosition
@@ -128,6 +129,7 @@ struct ColumnBlockConstPosition
CellStoreType::const_iterator miCellPos;
ColumnBlockConstPosition(): miCellPos() {}
+
};
class ColumnBlockPositionSet
@@ -142,6 +144,7 @@ public:
ColumnBlockPositionSet(ScDocument& rDoc);
ColumnBlockPosition* getBlockPosition(SCTAB nTab, SCCOL nCol);
+
};
}
diff --git a/sc/source/core/data/clipcontext.cxx
b/sc/source/core/data/clipcontext.cxx
index 782c0f9..8013684 100644
--- a/sc/source/core/data/clipcontext.cxx
+++ b/sc/source/core/data/clipcontext.cxx
@@ -29,7 +29,10 @@ CopyFromClipContext::CopyFromClipContext(ScDocument& rDoc,
ClipContextBase(rDoc),
mnTabStart(-1), mnTabEnd(-1),
mpRefUndoDoc(pRefUndoDoc), mpClipDoc(pClipDoc), mnInsertFlag(nInsertFlag),
-mbAsLink(bAsLink), mbSkipAttrForEmptyCells(bSkipAttrForEmptyCells) {}
+mbAsLink(bAsLink), mbSkipAttrForEmptyCells(bSkipAttrForEmptyCells),
+mbCloneNotes (mnInsertFlag & (IDF_NOTE|IDF_ADD
License Statement
All of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. Matthieu GAY This message contains information that may be privileged or confidential and is the property of the Capgemini Group. It is intended only for the person to whom it is addressed. If you are not the intended recipient, you are not authorized to read, print, retain, copy, disseminate, distribute, or use this message or any part thereof. If you receive this message in error, please notify the sender immediately and delete all copies of this message. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: unoidl/source
unoidl/source/sourceprovider-parser.y |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit be55ed02c0cdc590c044491b9b8f7cc8b3c4
Author: Khaled Hosny
Date: Tue Sep 17 11:48:15 2013 +0200
Fix build with Bison 3
The Bison 3 generated sources do not seem to define YYID, so our
YYLLOC_DEFAULT definition was broken. No idea what any of this means,
but sberg said I can safely remove the YYID usage, so if it kills your
pet, you know whom to blame.
Change-Id: I464564be941e0a49da264057923bf8e8e82d5ffd
diff --git a/unoidl/source/sourceprovider-parser.y
b/unoidl/source/sourceprovider-parser.y
index 92deb23..c2e1d7e 100644
--- a/unoidl/source/sourceprovider-parser.y
+++ b/unoidl/source/sourceprovider-parser.y
@@ -59,7 +59,7 @@
#include "sourceprovider-scanner.hxx"
#define YYLLOC_DEFAULT(Current, Rhs, N) \
-do { (Current) = YYRHSLOC((Rhs), YYID((N)) ? 1 : 0); } while (YYID(0))
+do { (Current) = YYRHSLOC((Rhs), (N) ? 1 : 0); } while (0)
void yyerror(YYLTYPE * locp, yyscan_t yyscanner, char const * msg) {
assert(locp != 0);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source
filter/source/pdf/impdialog.hxx |2 -- 1 file changed, 2 deletions(-) New commits: commit 6fbf0762abf2947d2774d685414bd409361bc1fa Author: Tor Lillqvist Date: Tue Sep 17 12:45:01 2013 +0300 WaE: private field 'nWidth' is not used Change-Id: I855a92d55646eff1c79634a839726564bf973744 diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx index cf81c0a..7df190b 100644 --- a/filter/source/pdf/impdialog.hxx +++ b/filter/source/pdf/impdialog.hxx @@ -364,8 +364,6 @@ class ImpPDFTabSecurityPage : public SfxTabPage com::sun::star::uno::Reference< com::sun::star::beans::XMaterialHolder > mxPreparedPasswords; -long nWidth; - DECL_LINK( ClickmaPbSetPwdHdl, void* ); void enablePermissionControls(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - desktop/source framework/source include/formula svtools/source unotools/source vcl/inc vcl/source
desktop/source/app/app.cxx | 10 +++---
desktop/source/app/dispatchwatcher.hxx | 10 --
desktop/source/deployment/gui/dp_gui_dialog2.cxx |3 --
desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx | 16 +--
framework/source/uielement/headermenucontroller.cxx |2 -
framework/source/uielement/langselectionmenucontroller.cxx |6 ++--
framework/source/uielement/toolbarsmenucontroller.cxx|2 -
include/formula/FormulaCompiler.hxx | 12 +---
svtools/source/uno/genericunodialog.cxx |2 -
unotools/source/config/cmdoptions.cxx| 13 +---
unotools/source/config/extendedsecurityoptions.cxx | 10 --
unotools/source/config/optionsdlg.cxx| 10 --
unotools/source/config/pathoptions.cxx | 12 +---
vcl/inc/svids.hrc|1
vcl/source/src/btntext.src |5 +++
vcl/source/window/builder.cxx|2 +
16 files changed, 37 insertions(+), 79 deletions(-)
New commits:
commit 0cd21c2bedb2eacc3d0898046d43047bcc3ac1a9
Author: Caolán McNamara
Date: Tue Sep 17 09:32:56 2013 +0100
drop intermediate Strings
Change-Id: I7f730d4f5329525eda9f78514dcaa3788149d077
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index e4320e6..70036d7 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -363,7 +363,7 @@ OUString GetMsgString(
{
ResMgr* resMgr = Desktop::GetDesktopResManager();
if ( resMgr )
-return OUString( ResId( nId, *resMgr ) );
+return ResId(nId, *resMgr).toString();
}
return aFallbackMsg;
}
@@ -391,7 +391,7 @@ OUString MakeStartupConfigAccessErrorMessage( OUString
const & aInternalErrMsg )
ResMgr* pResMgr = Desktop::GetDesktopResManager();
if ( pResMgr )
-aDiagnosticMessage.append( OUString(
ResId(STR_BOOTSTRAP_ERR_CFG_DATAACCESS, *pResMgr ) ) );
+aDiagnosticMessage.append( ResId(STR_BOOTSTRAP_ERR_CFG_DATAACCESS,
*pResMgr).toString() );
else
aDiagnosticMessage.appendAscii( "The program cannot be started." );
@@ -399,7 +399,7 @@ OUString MakeStartupConfigAccessErrorMessage( OUString
const & aInternalErrMsg )
{
aDiagnosticMessage.appendAscii( "\n\n" );
if ( pResMgr )
-aDiagnosticMessage.append( OUString( ResId(STR_INTERNAL_ERRMSG,
*pResMgr ) ) );
+aDiagnosticMessage.append( ResId(STR_INTERNAL_ERRMSG,
*pResMgr).toString() );
else
aDiagnosticMessage.appendAscii( "The following internal error has
occurred:\n\n" );
aDiagnosticMessage.append( aInternalErrMsg );
@@ -1169,7 +1169,7 @@ void restartOnMac(bool passArguments) {
#if HAVE_FEATURE_MACOSX_SANDBOX
(void) passArguments; // avoid warnings
ResMgr *resMgr = Desktop::GetDesktopResManager();
-OUString aMessage = OUString( ResId( STR_LO_MUST_BE_RESTARTED, *resMgr ) );
+OUString aMessage = ResId(STR_LO_MUST_BE_RESTARTED, *resMgr).toString();
ErrorBox aRestartBox( NULL, WB_OK, aMessage );
aRestartBox.Execute();
@@ -1494,7 +1494,7 @@ int Desktop::Main()
// create title string
LanguageTag aLocale( LANGUAGE_SYSTEM);
ResMgr* pLabelResMgr = ResMgr::SearchCreateResMgr( "ofa", aLocale );
-OUString aTitle = pLabelResMgr ? OUString( ResId( RID_APPTITLE,
*pLabelResMgr ) ) : OUString();
+OUString aTitle = pLabelResMgr ? ResId(RID_APPTITLE,
*pLabelResMgr).toString() : OUString();
delete pLabelResMgr;
#ifdef DBG_UTIL
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index a653d1b..6a90a98 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -96,8 +96,7 @@ struct StrAllFiles : public rtl::StaticWithInit< OUString,
StrAllFiles >
const SolarMutexGuard guard;
::std::auto_ptr< ResMgr > const resmgr( ResMgr::CreateResMgr(
"fps_office" ) );
OSL_ASSERT( resmgr.get() != 0 );
-OUString ret( ResId( STR_FILTERNAME_ALL, *resmgr.get() ) );
-return ret;
+return ResId(STR_FILTERNAME_ALL, *resmgr.get()).toString();
}
};
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
index fa5db69..3c15ca3 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
@@ -217,14 +217,14 @@ UpdateInstallDialog::UpdateInstallDialog(
m_bError(false),
m_bNoEntry(true),
m_bActivated(false),
-m_sInstalling(OUString(DpGuiResId(RID_DLG_U
Template initialization on OSX master
Since master build 342b1895d768dc633c3067df6618cd3567b72a6d I am seeing a whole load of the following error messages on startup (one for each template) : warn:tools.urlobj:10469:1:tools/source/fsys/urlobj.cxx:1739: cannot make <../AbstractGreen.otp> absolute against broken base <> warn:tools.urlobj:10469:1:tools/source/fsys/urlobj.cxx:1739: cannot make <../AbstractRed.otp> absolute against broken base <> warn:tools.urlobj:10469:1:tools/source/fsys/urlobj.cxx:1739: cannot make <../AbstractYellow.otp> absolute against broken base <> I am building with the --enable-extra-template switch Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [ANN] feature/instdir pushed to master
Le 17/09/13 09:29, Stephan Bergmann a écrit : Hi Stephan, > > For me with (from-scratch, at least) builds of last night's master, > everything is fine: --enable-release-build produces a LibreOffice.app > while (implicit) --disable-release-build produces a LibreOfficeDev.app. Well, after rebuilding I now have a single LibreOfficeDev.app again, but it is still in a separate folder within the DMG. Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [ANN] feature/instdir pushed to master
On 09/16/2013 11:24 AM, Alexander Thurgood wrote: FWIW, my Mac OSX master DMG images now contain 2 *.app files, one called LibreOffice.app weighing in at 323Mb (normal build) and another called LibreOfficeDev.app weighing in at 964.8Mb (debug build). Both are contained within a folder called LibreOfficeDev_4.2.0.0.alpha0_MacOS_x86-64 Normal ? For me with (from-scratch, at least) builds of last night's master, everything is fine: --enable-release-build produces a LibreOffice.app while (implicit) --disable-release-build produces a LibreOfficeDev.app. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - cui/source
cui/source/inc/autocdlg.hxx |2 +-
cui/source/tabpages/autocdlg.cxx | 21 ++---
2 files changed, 19 insertions(+), 4 deletions(-)
New commits:
commit 8af5a2b08dd8fa319ae02d9947f0906ecb1a4805
Author: Caolán McNamara
Date: Mon Sep 16 15:04:47 2013 +0100
Resolves: fdo#67697 source formatting option list in autocorrect
regression from 0513e10635c85fc1aa214948de4992d4b76d555c
"fdo#49350 Speedup "OK" action of auto-correct dialog"
Change-Id: Iede6063729433beb3ac50dbdb45230c1d774cea0
(cherry picked from commit 95e566b9a0df06d130e118181058273f034bcf2c)
Reviewed-on: https://gerrit.libreoffice.org/5956
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index 3d518d2..ee72856 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -280,7 +280,7 @@ public:
voidSetLanguage(LanguageType eSet);
voidDeleteEntry(String sShort, String sLong);
-voidNewEntry(String sShort, String sLong);
+voidNewEntry(String sShort, String sLong, bool bKeepSourceFormatting);
};
// class OfaAutocorrExceptPage -
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index bfde63b..df874d7 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -943,6 +943,17 @@ sal_Bool OfaAutocorrReplacePage::FillItemSet( SfxItemSet& )
for (sal_uInt32 i = 0; i < rStringChangeList.aNewEntries.size(); i++)
{
DoubleString& newEntry = rStringChangeList.aNewEntries[i];
+
+//fdo#67697 if the user data is set then we want to retain the
+//source formatting of the entry, so don't use the optimized
+//text-only MakeCombinedChanges for this entry
+bool bKeepSourceFormatting = newEntry.pUserData ==
&bHasSelectionText;
+if (bKeepSourceFormatting)
+{
+pAutoCorrect->PutText(newEntry.sShort,
*SfxObjectShell::Current(), eCurrentLang);
+continue;
+}
+
SvxAutocorrWord aNewWord( newEntry.sShort, newEntry.sLong );
aNewWords.push_back( aNewWord );
}
@@ -1120,7 +1131,7 @@ IMPL_LINK(OfaAutocorrReplacePage, SelectHdl,
SvTabListBox*, pBox)
return 0;
};
-void OfaAutocorrReplacePage::NewEntry(String sShort, String sLong)
+void OfaAutocorrReplacePage::NewEntry(String sShort, String sLong, bool
bKeepSourceFormatting)
{
DoubleStringArray& rNewArray = aChangesTable[eLang].aNewEntries;
for (sal_uInt32 i = 0; i < rNewArray.size(); i++)
@@ -1146,6 +1157,8 @@ void OfaAutocorrReplacePage::NewEntry(String sShort,
String sLong)
aNewString.sShort = sShort;
aNewString.sLong = sLong;
rNewArray.push_back(aNewString);
+if (bKeepSourceFormatting)
+rNewArray.back().pUserData = &bHasSelectionText;
}
void OfaAutocorrReplacePage::DeleteEntry(String sShort, String sLong)
@@ -1197,7 +1210,9 @@ IMPL_LINK(OfaAutocorrReplacePage, NewDelHdl, PushButton*,
pBtn)
if(sEntry.Len() && ( !m_pReplaceED->GetText().isEmpty() ||
( bHasSelectionText && bSWriter ) ))
{
-NewEntry(m_pShortED->GetText(), m_pReplaceED->GetText());
+bool bKeepSourceFormatting = !bReplaceEditChanged &&
!m_pTextOnlyCB->IsChecked();
+
+NewEntry(m_pShortED->GetText(), m_pReplaceED->GetText(),
bKeepSourceFormatting);
m_pReplaceTLB->SetUpdateMode(sal_False);
sal_uInt32 nPos = UINT_MAX;
sEntry += '\t';
@@ -1221,7 +1236,7 @@ IMPL_LINK(OfaAutocorrReplacePage, NewDelHdl, PushButton*,
pBtn)
SvTreeListEntry* pInsEntry = m_pReplaceTLB->InsertEntry(
sEntry, static_cast< SvTreeListEntry *
>(NULL), false,
nPos == UINT_MAX ? LIST_APPEND : nPos);
-if( !bReplaceEditChanged && !m_pTextOnlyCB->IsChecked())
+if (bKeepSourceFormatting)
{
pInsEntry->SetUserData(&bHasSelectionText); // new formatted
text
}
___
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' - cui/source cui/uiconfig
cui/source/options/optcolor.cxx |2
cui/uiconfig/ui/colorconfigwin.ui | 268 +++---
2 files changed, 136 insertions(+), 134 deletions(-)
New commits:
commit 9ed5fd9e6726d435b798ae27005887a9dcb52188
Author: Caolán McNamara
Date: Mon Sep 16 12:15:54 2013 +0100
Resolves: fdo#67730 Preview colors on Smart Tags & Shadows are swapped
Change-Id: I63916283c67b9acd79df96a48485dba6b25cf8cb
(cherry picked from commit 342b1895d768dc633c3067df6618cd3567b72a6d)
Related: fdo#67730 automatic turns the preview a blue color
Change-Id: I31c9129472ab64bfda283bb766fad949acb96754
(cherry picked from commit e2fc3ae88dafd13215019532845db76d726f151d)
Related: fdo#67730 label overlaps listbox and steals its click
Change-Id: I9b803bb966916210495025e3811732224585c213
(cherry picked from commit d6e9bb17675200e12777ed23d0c685fbd2bb4c59)
Reviewed-on: https://gerrit.libreoffice.org/5955
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index e359353..edaae1c 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -346,7 +346,6 @@ ColorConfigWindow_Impl::Entry::Entry( Window *pGrid,
unsigned nYPos,
, m_aDefaultColor(rColorEntry.getDefaultColor())
{
m_pText = new FixedText(pGrid, WB_LEFT|WB_VCENTER|WB_3DLOOK);
-m_pText->set_grid_width(3);
m_pText->set_grid_left_attach(0);
m_pText->set_grid_top_attach(nYPos);
m_pText->set_margin_left(6 + nCheckBoxLabelOffset);
@@ -755,6 +754,7 @@ void ColorConfigWindow_Impl::ColorHdl (
// extended entries
unsigned const nExtCount = pExtConfig->GetComponentCount();
+i = ColorConfigEntryCount;
for (unsigned j = 0; j != nExtCount; ++j)
{
OUString sComponentName = pExtConfig->GetComponentName(j);
diff --git a/cui/uiconfig/ui/colorconfigwin.ui
b/cui/uiconfig/ui/colorconfigwin.ui
index d4af11f..c0d7d0e 100644
--- a/cui/uiconfig/ui/colorconfigwin.ui
+++ b/cui/uiconfig/ui/colorconfigwin.ui
@@ -1,6 +1,7 @@
+
True
False
@@ -13,9 +14,9 @@
True
True
False
+6
0
True
-6
0
@@ -28,9 +29,9 @@
True
False
+6
0
Document
background
-6
0
@@ -53,11 +54,10 @@
-True
True
False
6
-6
+True
2
@@ -68,10 +68,10 @@
-True
True
False
6
+True
2
@@ -123,10 +123,10 @@
-True
True
False
6
+True
2
@@ -139,9 +139,9 @@
True
False
+6
0
Application
background
-6
0
@@ -156,9 +156,9 @@
True
True
False
+6
0
True
-6
0
@@ -181,10 +181,10 @@
-True
True
False
6
+True
2
@@ -199,9 +199,9 @@
True
True
False
+6
0
True
-6
0
@@ -224,10 +224,10 @@
-True
True
False
6
+True
2
@@ -240,9 +240,9 @@
True
False
+6
0
Font color
-6
0
@@ -265,10 +265,10 @@
-True
True
False
6
+True
2
@@ -283,9 +283,9 @@
True
True
False
+6
0
True
-6
0
@@ -308,10 +308,10 @@
-True
True
False
6
+True
2
@@ -326,9 +326,9 @@
True
True
False
+6
0
True
-6
0
@@ -351,10 +351,10 @@
-True
True
False
6
+True
2
@@ -367,9 +367,9 @@
True
False
+6
0
AutoSpellcheck
-6
0
@@ -382,9 +382,9 @@
True
False
+6
0
Smart Tags
-6
0
@@ -394,58 +394,15 @@
-
-True
-False
-0
-Shadows
-6
-
-
-0
-11
-1
-1
-
-
-
-True
True
False
6
-
-
-2
-9
-1
-1
-
-
-
LibreOffice Gerrit News 2013-09-17
Moin! * Open changes on master for project core changed in the last 25 hours: + String to OUString in https://gerrit.libreoffice.org/5968 from Matteo Casalin + Prefer OUString primitives to handwritten code in https://gerrit.libreoffice.org/5965 from Matteo Casalin + Too many parentheses, for a wrong check in https://gerrit.libreoffice.org/5964 from Matteo Casalin + These support functions can be local in https://gerrit.libreoffice.org/5963 from Matteo Casalin + Really loop over ExtInput ring in https://gerrit.libreoffice.org/5962 from Matteo Casalin + [WIP] fdo#50118 use English add-in function names in https://gerrit.libreoffice.org/5691 from Winfried Donkers + Use LO_JAVA_DIR for HSQLDB classpath. in https://gerrit.libreoffice.org/5953 from Andrzej J.R. Hunt + DOCX:fdo#43093 fix wrong directionality for RTL files in https://gerrit.libreoffice.org/5944 from Faisal al-otaibi + Implement hsqldb loading test. in https://gerrit.libreoffice.org/5934 from Andrzej J.R. Hunt + Add LO_JAVA_DIR to solver's unorc. in https://gerrit.libreoffice.org/5954 from Andrzej J.R. Hunt * Merged changes on master for project core changed in the last 25 hours: + Prefer a 'for' loop to a 'while' one in https://gerrit.libreoffice.org/5967 from Matteo Casalin + Remove two temporary variables in https://gerrit.libreoffice.org/5966 from Matteo Casalin + fdo#69091: Copying data from Base-table to Calc by drag and drop in https://gerrit.libreoffice.org/5952 from Julien Nabet + Set URE_INTERNAL_JAVA_DIR for unorc to allow jvm in unit tests. in https://gerrit.libreoffice.org/5936 from Andrzej J.R. Hunt * Abandoned changes on master for project core changed in the last 25 hours: + Fixed effectless unit test. in https://gerrit.libreoffice.org/5969 from Sandro Steger * Open changes needing tweaks, but being untouched for more than a week: + fdo#39468: Translate German comments (first part) in include/svl/filerec. in https://gerrit.libreoffice.org/5793 from Philipp Riemer + fdo#44689: fix for specific case restart value 0 in https://gerrit.libreoffice.org/5681 from Adam CloudOn + Dynamically align toolbars in LibreOffice in https://gerrit.libreoffice.org/5655 from Prashant Pandey + fdo#36791 : fix for import of greeting card in https://gerrit.libreoffice.org/4240 from Adam CloudOn + fdo#66401: fix for combined characters in https://gerrit.libreoffice.org/5018 from Adam CloudOn + more debug logs, extra debug layer, file is not used in p3k in https://gerrit.libreoffice.org/5267 from James Michael Dupont + Remove old outdated gallery images and sounds in https://gerrit.libreoffice.org/4993 from Samuel Mehrbrodt + Positional Tab additions in https://gerrit.libreoffice.org/5387 from Adam CloudOn + fdo#64817 : fix for rectangle with image fill in https://gerrit.libreoffice.org/4718 from Adam CloudOn Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: unoidl/source
unoidl/source/sourcetreeprovider.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 805738b0ee3504e34a0960fe82f092fb319f9fc9
Author: Julien Nabet
Date: Tue Sep 17 07:46:07 2013 +0200
-Werror=shadow
Change-Id: Ia344d5a68118ba9896672ebbf4cccaf0511f8186
diff --git a/unoidl/source/sourcetreeprovider.cxx
b/unoidl/source/sourcetreeprovider.cxx
index d389f0c..dd87ea3 100755
--- a/unoidl/source/sourcetreeprovider.cxx
+++ b/unoidl/source/sourcetreeprovider.cxx
@@ -130,10 +130,10 @@ rtl::Reference
SourceTreeProvider::findEntity(OUString const & name)
uri += ".idl";
SourceProviderScannerData data(manager_);
if (parse(uri, &data)) {
-std::map::const_iterator i(
+std::map::const_iterator j(
data.entities.find(name));
-if (i != data.entities.end()) {
-ent = i->second.entity;
+if (j != data.entities.end()) {
+ent = j->second.entity;
}
SAL_WARN_IF(
!ent.is(), "unoidl",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/optlanguagespage.ui |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6e7380da285f9b248de189e63e18718c7de450b0 Author: abdulmajeed ahmed Date: Mon Sep 16 14:30:42 2013 +0300 add "complex text layout" for CTL option Change-Id: I0c9a0442bf617f397651ae0027c824d6f0709c14 diff --git a/cui/uiconfig/ui/optlanguagespage.ui b/cui/uiconfig/ui/optlanguagespage.ui index 1bae6d2..bf14d21 100644 --- a/cui/uiconfig/ui/optlanguagespage.ui +++ b/cui/uiconfig/ui/optlanguagespage.ui @@ -279,7 +279,7 @@ -C_TL +Complex _text layout (CTL) True True False ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 5 commits - codemaker/source unoidl/Library_unoidl.mk unoidl/source
codemaker/source/codemaker/typemanager.cxx |3
unoidl/Library_unoidl.mk |3
unoidl/source/sourcefileprovider.cxx | 142 +
unoidl/source/sourcefileprovider.hxx | 44
unoidl/source/sourceprovider-parser-requires.hxx |2
unoidl/source/sourceprovider-parser.y| 122 +++
unoidl/source/sourceprovider-scanner.hxx | 25 +-
unoidl/source/sourceprovider.cxx | 235 ---
unoidl/source/sourceprovider.hxx | 46
unoidl/source/sourcetreeprovider.cxx | 152 ++
unoidl/source/sourcetreeprovider.hxx | 46
unoidl/source/unoidl.cxx |8
12 files changed, 531 insertions(+), 297 deletions(-)
New commits:
commit 14bc5fc0ec652650deb9a41505e97c3b4d3854b2
Author: Stephan Bergmann
Date: Mon Sep 16 23:25:43 2013 +0200
WIP: additional unoidl::Provider that directly reads a single .idl file
Change-Id: Iab795a34a657cb36ced24a1a05f6c21a6c1637aa
diff --git a/unoidl/Library_unoidl.mk b/unoidl/Library_unoidl.mk
index 411e0a9..c98fc69 100644
--- a/unoidl/Library_unoidl.mk
+++ b/unoidl/Library_unoidl.mk
@@ -13,6 +13,7 @@ $(eval $(call
gb_Library_add_defs,unoidl,-DLO_DLLIMPLEMENTATION_UNOIDL))
$(eval $(call gb_Library_add_exception_objects,unoidl, \
unoidl/source/legacyprovider \
+unoidl/source/sourcefileprovider \
unoidl/source/sourcetreeprovider \
unoidl/source/unoidl \
unoidl/source/unoidlprovider \
diff --git a/unoidl/source/sourcefileprovider.cxx
b/unoidl/source/sourcefileprovider.cxx
new file mode 100644
index 000..4c522e8
--- /dev/null
+++ b/unoidl/source/sourcefileprovider.cxx
@@ -0,0 +1,142 @@
+/* -*- 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/.
+ */
+
+#include "sal/config.h"
+
+#include
+#include
+#include
+
+#include "sourcefileprovider.hxx"
+#include "sourceprovider-scanner.hxx"
+
+namespace unoidl { namespace detail {
+
+namespace {
+
+class Cursor: public MapCursor {
+public:
+explicit Cursor(std::map< OUString, rtl::Reference > const & map):
+map_(map), iterator_(map_.begin())
+{}
+
+private:
+virtual ~Cursor() throw () {}
+
+virtual rtl::Reference< Entity > getNext(OUString * name);
+
+std::map< OUString, rtl::Reference > const & map_; //TODO: extent
+std::map< OUString, rtl::Reference >::const_iterator iterator_;
+};
+
+rtl::Reference< Entity > Cursor::getNext(OUString * name) {
+assert(name != 0);
+rtl::Reference< Entity > ent;
+if (iterator_ != map_.end()) {
+*name = iterator_->first;
+ent = iterator_->second;
+++iterator_;
+}
+return ent;
+}
+
+class Module: public ModuleEntity {
+public:
+Module() {}
+
+std::map< OUString, rtl::Reference > map;
+
+private:
+virtual ~Module() throw () {}
+
+virtual std::vector getMemberNames() const;
+
+virtual rtl::Reference createCursor() const
+{ return new Cursor(map); }
+};
+
+std::vector Module::getMemberNames() const {
+std::vector names;
+for (std::map< OUString, rtl::Reference >::const_iterator i(
+ map.begin());
+ i != map.end(); ++i)
+{
+names.push_back(i->first);
+}
+return names;
+}
+
+}
+
+SourceFileProvider::SourceFileProvider(
+rtl::Reference const & manager, OUString const & uri)
+{
+SourceProviderScannerData data(manager);
+if (!parse(uri, &data)) {
+throw NoSuchFileException(uri);
+}
+for (std::map::iterator i(
+ data.entities.begin());
+ i != data.entities.end(); ++i)
+{
+if (i->second.kind == SourceProviderEntity::KIND_LOCAL) {
+assert(i->second.entity.is());
+assert(i->second.entity->getSort() != Entity::SORT_MODULE);
+std::map< OUString, rtl::Reference > * map = &rootMap_;
+for (sal_Int32 j = 0;;) {
+OUString id(i->first.getToken(0, '.', j));
+if (j == -1) {
+map->insert(std::make_pair(id, i->second.entity));
+break;
+}
+std::map< OUString, rtl::Reference >::const_iterator k(
+map->find(id));
+if (k == map->end()) {
+k = map->insert(std::make_pair(id, new Module)).first;
+}
+Module * mod = dynamic_cast< Module * >(k->second.get());
+assert(mod != 0);
+map = &mod->map;
+}
+}
+}
+}
+
+rtl::Reference SourceFileProvider::createRootCursor() const {
+return new Cursor(rootMap_);
+}
+
+rtl::R
