LibreOffice Gerrit News for core on 2014-01-03
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things ! + This is a second batch of HiDPI changes. It fixes the following areas: in https://gerrit.libreoffice.org/7261 from Keith Curtis about module sc, sd, sfx2, svx, sw, vcl + fdo#73217 : Textbox with picture fill are rendered and saved properly. in https://gerrit.libreoffice.org/7259 from Sushil Shinde about module oox, sw + fdo#69649 Fix for pre-rendered Table Of Contents in https://gerrit.libreoffice.org/7207 from Vinaya Mandke about module sc, sw, writerfilter + fdo#69613:Fix for TOC field flag 'b' should preserved after RT. in https://gerrit.libreoffice.org/7256 from Priyanka Gaikwad about module sw, writerfilter + fdo#69613: Code changes for TOC with flag '\x' should get preserved after in https://gerrit.libreoffice.org/7257 from Yogesh Bharate about module sw, writerfilter End of freshness * Merged changes on master for project core changed in the last 25 hours: + get rid of custom all-caps ui widget in https://gerrit.libreoffice.org/6903 from Christian Lohmaier + sdremote: show notes also in landscape orientation in https://gerrit.libreoffice.org/6889 from Christian Lohmaier + Add unit-test for 'track changes - inserted paragraph mark' preservation in https://gerrit.libreoffice.org/7241 from Adam CloudOn + Add unit-test for 'track changes - deleted paragraph mark' preservation in https://gerrit.libreoffice.org/7240 from Adam CloudOn + fdo#73046 DOCX For anchor tag relativeHeight attribute should be always p in https://gerrit.libreoffice.org/7208 from Nikhil Walvekar * Abandoned changes on master for project core changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: + Export CoreText-related SPI stuff in https://gerrit.libreoffice.org/7143 from Douglas Mencken + remove BluetoothOperator wrapper in https://gerrit.libreoffice.org/7092 from Christian Lohmaier + fix previous commit in https://gerrit.libreoffice.org/7101 from Markus Mohrhard + CID#736173: Out-of-bound read in https://gerrit.libreoffice.org/6973 from Julien Nabet + move from ActionBarSherlock to corresponding android support lib in https://gerrit.libreoffice.org/7082 from Christian Lohmaier + fdo#60698: Merge animcore into sd and slideshow in https://gerrit.libreoffice.org/7108 from Marcos Souza + fix Bluetooth lifecycle problems and respect UI guidelines in https://gerrit.libreoffice.org/7083 from Christian Lohmaier + Double toolbar icon size for HiDPI screens. in https://gerrit.libreoffice.org/6994 from Andrzej Hunt + sw/export docx: add unit test for document with header and section(s) in https://gerrit.libreoffice.org/6249 from Pierre-Eric Pelloux-Prayer + add a header to provide posix compatible wrapper for platform lacking in https://gerrit.libreoffice.org/6837 from Norbert Thiebaud + Code clean-up/consolidation task. in https://gerrit.libreoffice.org/5926 from Vishv Brahmbhatt + fix for exporting of text watermark to DOCX in https://gerrit.libreoffice.org/5568 from Adam CloudOn + WIP: fdo#33980 Preserve selection across all slide sorters. in https://gerrit.libreoffice.org/6633 from Andrzej Hunt + fdo#71043 - Use STACK lint tool to clean code in https://gerrit.libreoffice.org/6529 from José Guilherme Vanz + new cell-border handling in calc in https://gerrit.libreoffice.org/6093 from Viktor Varga + Increase number of remembered recent documents from 10 to 25 in https://gerrit.libreoffice.org/6101 from Krisztian Pinter + startcenter: Make SC open faster by timeouting thumbnails in https://gerrit.libreoffice.org/6102 from Krisztian Pinter + Simplify oslThreadIdentifier on Linux 32. in https://gerrit.libreoffice.org/5553 from Arnaud Versini + 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 + more debug logs, extra debug layer, file is not used in p3k in https://gerrit.libreoffice.org/5267 from James Michael Dupont + 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 Gerrit News for submodules on 2014-01-03
Moin! ~~ Project dictionaries ~~ * Open changes on master for project dictionaries changed in the last 25 hours: None * Merged changes on master for project dictionaries changed in the last 25 hours: + Update Swedish spelling dictionary in https://gerrit.libreoffice.org/7260 from Niklas Johansson + Update pt_BR dictionary in https://gerrit.libreoffice.org/7258 from Marcos Souza * Abandoned changes on master for project dictionaries changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: None ~~ Project translations ~~ Nothing moved in the project for the last 25 hours ~~ Project help ~~ * Open changes on master for project help changed in the last 25 hours: + Update help for X error bars in https://gerrit.libreoffice.org/7262 from Laurent BP * Merged changes on master for project help changed in the last 25 hours: None * Abandoned changes on master for project help changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: None 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
¿ TODAVIA NO TIENES TU CHEQUE-REGALO 'CAMPUS ASECE' ?
Distinguido/da Profesional: Te deseo un prospero Año Nuevo 2014. En nombre de la Asociación ASECE y de toda su organización y Plataformas, te deseamos lo mejor. De todo corazón. Ya son más de 2.000 profesionales los que han elegido ampliar su formación en nuestro CAMPUS ASECE, en el cual hay actualmente 7 cursos operativos (2 son gratuitos), y están previstos 10 nuevos en el primer trimestre de 2014. Todos los detalles los puedes comprobar en <> Estos 2 años han sido toda una experiencia para el equipo de CAMPUS ASECE, gracias a la cual hemos aprendido y evolucionado, permitiendo entrar en nuevos campos y materias. CAMPUS ASECE ha decidido hacerte uno de los mejores regalos que hemos podido considerar acertado y oportuno para un Profesional del sector como el nuestro: UN CHEQUE-REGALO. Este CHEQUE-REGALO podrá utilizarse en cualquiera de los cursos que irán saliendo a lo largo del primer trimestre de 2014. Cursos muy interesantes y de alta importancia laboral, desarrollados por profesionales y empresas relacionadas con el objeto del curso. Puede ser un interesante regalo para un compañero de profesión, de estudios o para tí. Además, estos nuevos cursos cuentan con un sistema de comunicación único y exclusivo de CAMPUS ASECE con los tutores, gracias a la Video-Tutoría. Todo un reto tecnológico para los alumnos de CAMPUS ASECE. El CHEQUE-REGALO se obtiene de forma automática al matricularte en CUALQUIER CURSO. El importe de tu CHEQUE-REGALO será el mismo que el del curso matriculado y abonado. Por ejemplo, si decides matricularte en el CURSO RITE 2013, cuyo importe es de 200,00 euros, al activar tu cuenta de usuario en el nuevo curso, recibirás en tu cuenta el cheque-regalo por importe de 200,00 euros. Este cheque-regalo podrás utilizarlo en cualquier otro curso de CAMPUS ASECE. No dudes en aprovechar esta oportunidad. NOTAS IMPORTANTES: Esta promoción es valida desde el 01/01/2014 hasta el 10/01/2014 (inclusive) Si tuvieras cualquier dificultad en el proceso de matriculación , o quieres enviarnos cualquier mensaje, puedes utilizar el http://campusasece.es/index.php?option=com_breezingforms&view=form&Itemid=507 Reiterando mi deseo de tener un Feliz Año Nuevo, recibe un cordial saludo. Adrián Sánchez Molina Presidente Asociación Española para la Calidad en la Edificación ASECE.ORG ASECE.NET cenews.es Tu periódico Digital Asociación ASECE En cumplimiento de la Ley Orgánica 15/1999, de 13 de diciembre de Protección de Datos de Carácter Personal (LOPD), Asociación ASECE como responsable del fichero informa de las siguientes consideraciones: Los datos de carácter personal que le solicitamos, quedarán incorporados a un fichero cuya finalidad es la de mantenerse informado a nuestros contactos.. Queda igualmente informado de la posibilidad de ejercitar los derechos de acceso, rectificación, cancelación y oposición, de sus datos personales enviando una notificación de la misma a: Asociación Española para la Calidad en la Edificación - C/ San Romualdo, 12-14 - 28037 - Madrid. También si lo desea puede enviar un correo electrónico a : as...@asece.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: wizards/source
wizards/source/euro/Init.xba | 34 +++---
wizards/source/euro/euro.src |7 ++-
2 files changed, 33 insertions(+), 8 deletions(-)
New commits:
commit 5bf0a838e800605e95b5b03157bdf0780db497e6
Author: Eike Rathke
Date: Fri Jan 3 01:56:43 2014 +0100
added LVL Latvian Lats to Euro Converter, fdo#73239
Change-Id: Icc6f9c40a39f08bb0bcbed6d25c99f0e67cb608c
diff --git a/wizards/source/euro/Init.xba b/wizards/source/euro/Init.xba
index d01d500..33d9eb8 100644
--- a/wizards/source/euro/Init.xba
+++ b/wizards/source/euro/Init.xba
@@ -89,6 +89,7 @@ Public sCurrCYPRIOT as String
Public sCurrMALTESE as String
Public sCurrSLOVAK as String
Public sCurrESTONIAN as String
+Public sCurrLATVIAN as String
Public sCurrUNKNOWN as String
Public sCurrSYSUNKNOWN as String
@@ -133,8 +134,8 @@ Public CurExtension(2) as String
Public Currfactor as Double
Public CurrSymbolList(2) as String
Public CurrLanguage as String
-Public CurrValue(16,5)
-Public LangIDValue(16,2,2) as String
+Public CurrValue(17,5)
+Public LangIDValue(17,2,2) as String
Public PreName as String
Public Separator as String
Public BitmapDir as String
@@ -214,8 +215,9 @@ Dim LocWorkPath as String
sCurrMALTESE = GetResText(1514)
sCurrSLOVAK = GetResText(1515)
sCurrESTONIAN = GetResText(1516)
- sCurrUNKNOWN = GetResText(1517)
- sCurrSYSUNKNOWN = GetResText(1518)
+ sCurrLATVIAN = GetResText(1517)
+ sCurrUNKNOWN = GetResText(1518)
+ sCurrSYSUNKNOWN = GetResText(1519)
.cmdCancel.Label = sCANCEL
.cmdHelp.Label = sHELP
.cmdBack.Label = GetResText(1002)
@@ -377,9 +379,18 @@ Sub InitializeLanguages()
LangIDValue(15,0,2) = "-41B"
' CURRENCIES_ESTONIAN
- LangIDValue(16,0,0) = "et"
- LangIDValue(16,0,1) = "ET"
- LangIDValue(16,0,2) = "-425"
+LangIDValue(16,0,0) = "et"
+LangIDValue(16,0,1) = "ET"
+LangIDValue(16,0,2) = "-425"
+
+' CURRENCIES_LATVIAN
+LangIDValue(17,0,0) = "lv"
+LangIDValue(17,0,1) = "LV"
+LangIDValue(17,0,2) = "-426"
+' and Latgalian
+LangIDValue(17,1,0) = "ltg"
+LangIDValue(17,1,1) = "LV"
+LangIDValue(17,1,2) = "-64B"
End Sub
@@ -542,6 +553,15 @@ Dim i as Integer
CurrValue(16,4) = "kr"
CurrValue(16,5) = "EEK"
+ CurrValue(17,0) = sCurrLATVIAN
+ ' real conversion rate
+ CurrValue(17,1) = 0.702804
+ ' rounded conversion rate
+ CurrValue(17,2) = 0.7
+ CurrValue(17,3) = "Ls"
+ CurrValue(17,4) = "Ls"
+ CurrValue(17,5) = "LVL"
+
i = -1
CurrSymbolList(0) = ""
CurrSymbolList(1) = ""
diff --git a/wizards/source/euro/euro.src b/wizards/source/euro/euro.src
index 0a42451..9db7204 100644
--- a/wizards/source/euro/euro.src
+++ b/wizards/source/euro/euro.src
@@ -438,11 +438,16 @@ Text [ en-US ] = "Estonian Kroon";
String CURRENCIES + 17
{
-Text [ en-US ] = "The currency set for the document is not a European
currency!";
+Text [ en-US ] = "Latvian Lats";
};
String CURRENCIES + 18
{
+Text [ en-US ] = "The currency set for the document is not a European
currency!";
+};
+
+String CURRENCIES + 19
+{
Text [ en-US ] = "The language set for your operating system is not a language
of the European Monetary Union.";
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - wizards/source
wizards/source/euro/AutoPilotRun.xba | 60 ---
1 file changed, 22 insertions(+), 38 deletions(-)
New commits:
commit 6f4ed937fb53e6104aecb6ee4d17f1ab8acd35ae
Author: Eike Rathke
Date: Fri Jan 3 00:34:06 2014 +0100
die binfilter die die die
Euro Converter tried to obtain filters for names of binary filters that
don't exist anymore and can't be resolved hence the TypeDetection
GetByName() bailed out with an exception when calling the file picker
(e.g. when attempting to select a document), stopping in Basic
environment and effectively rendering the wizard useless.
Change-Id: Ifdef6f59abdc16bedd0f54ec317dc44af8f1e628
(cherry picked from commit e625d00439f725b01f3818859e95e431e6173d57)
diff --git a/wizards/source/euro/AutoPilotRun.xba
b/wizards/source/euro/AutoPilotRun.xba
index 47d7959..fe2bed7 100644
--- a/wizards/source/euro/AutoPilotRun.xba
+++ b/wizards/source/euro/AutoPilotRun.xba
@@ -28,7 +28,7 @@ Public Source as String
Public SubstFile as String
Public SubstDir as String
Public NoArgs()
-Public TypeList(14) as String
+Public TypeList(6) as String
Public GoOn as Boolean
Public DoUnprotect as Integer
Public Password as String
@@ -74,21 +74,13 @@ Dim bDisposable as Boolean
TargetStemDir = TargetDir
TypeList(0) = "calc8"
TypeList(1) = "calc_StarOffice_XML_Calc"
- TypeList(2) = "calc_StarCalc_30"
- TypeList(3) = "calc_StarCalc_40"
- TypeList(4) = "calc_StarCalc_50"
If DialogModel.chkTextDocuments.State = 1 Then
- ReDim Preserve TypeList(13) as String
-
- TypeList(5) = "writer8"
- TypeList(6) = "writerglobal8"
- TypeList(7) =
"writer_StarOffice_XML_Writer"
- TypeList(8) =
"writer_globaldocument_StarOffice_XML_Writer_GlobalDocument"
- TypeList(9) = "writer_StarWriter_30"
- TypeList(10) = "writer_StarWriter_40"
- TypeList(11) =
"writer_globaldocument_StarWriter_40GlobalDocument"
- TypeList(12) = "writer_StarWriter_50"
- TypeList(13) =
"writer_globaldocument_StarWriter_50GlobalDocument"
+ ReDim Preserve TypeList(5) as String
+
+ TypeList(2) = "writer8"
+ TypeList(3) = "writerglobal8"
+ TypeList(4) =
"writer_StarOffice_XML_Writer"
+ TypeList(5) =
"writer_globaldocument_StarOffice_XML_Writer_GlobalDocument"
End If
FilesList() = ReadDirectories(SourceDir, bRecursive,
True, False, TypeList())
TotDocCount = Ubound(FilesList(),1) + 1
@@ -387,34 +379,26 @@ Sub CallFilePicker()
oTypes() = oMasterKey.Types
oUIKey =
GetRegistryKeyContent("org.openoffice.Office.UI/FilterClassification/LocalFilters")
If DialogModel.chkTextDocuments.State = 1 Then
- Dim FilterNames(11,1) as String
- FilterNames(6,0) =
oTypes.GetByName("writer_StarOffice_XML_Writer").UIName
- FilterNames(6,1) = "*.sxw"
- FilterNames(7,0) =
oTypes.GetByName("writer_StarOffice_XML_Writer_Template").UIName
- FilterNames(7,1) = "*.stw"
- FilterNames(8,0) =
oUIKey.Classes.GetByName("sw3to5").DisplayName
- FilterNames(8,1) = "*.sdw"
- FilterNames(9,0) =
oUIKey.Classes.GetByName("sw3to5templ").DisplayName
- Filternames(9,1) = "*.vor"
- FilterNames(10,0) =
oTypes.GetByName("writer8").UIName
- FilterNames(10,1) = "*.odt"
- FilterNames(11,0) =
oTypes.GetByName("writer8_template").UIName
- FilterNames(11,1) = "*.ott"
+ Dim FilterNames(7,1) as String
+ FilterNames(4,0) =
oTypes.GetByName("writer_StarOffice_XML_Writer").UIName
+ FilterNames(4,1) = "*.sxw"
+ FilterNames(5,0) =
oTypes.GetByName("writer_StarOffice_XML_Writer_Template").UIName
+ FilterNames(5,1) = "*.stw"
+ FilterNames(6,0) =
oTypes.GetByName("writer8").UIName
+ FilterNames(6,1) = "*.odt"
+ FilterNames(7,0) =
oTypes.GetByName("writer8_template").UIName
+ FilterNames(7,1) = "*.ott"
Else
- ReDim FilterNames(5,1) as String
+ ReDim FilterNames(3,1) as St
[Libreoffice-commits] core.git: wizards/source
wizards/source/euro/AutoPilotRun.xba | 60 ---
1 file changed, 22 insertions(+), 38 deletions(-)
New commits:
commit e625d00439f725b01f3818859e95e431e6173d57
Author: Eike Rathke
Date: Fri Jan 3 00:34:06 2014 +0100
die binfilter die die die
Euro Converter tried to obtain filters for names of binary filters that
don't exist anymore and can't be resolved hence the TypeDetection
GetByName() bailed out with an exception when calling the file picker
(e.g. when attempting to select a document), stopping in Basic
environment and effectively rendering the wizard useless.
Change-Id: Ifdef6f59abdc16bedd0f54ec317dc44af8f1e628
diff --git a/wizards/source/euro/AutoPilotRun.xba
b/wizards/source/euro/AutoPilotRun.xba
index 47d7959..fe2bed7 100644
--- a/wizards/source/euro/AutoPilotRun.xba
+++ b/wizards/source/euro/AutoPilotRun.xba
@@ -28,7 +28,7 @@ Public Source as String
Public SubstFile as String
Public SubstDir as String
Public NoArgs()
-Public TypeList(14) as String
+Public TypeList(6) as String
Public GoOn as Boolean
Public DoUnprotect as Integer
Public Password as String
@@ -74,21 +74,13 @@ Dim bDisposable as Boolean
TargetStemDir = TargetDir
TypeList(0) = "calc8"
TypeList(1) = "calc_StarOffice_XML_Calc"
- TypeList(2) = "calc_StarCalc_30"
- TypeList(3) = "calc_StarCalc_40"
- TypeList(4) = "calc_StarCalc_50"
If DialogModel.chkTextDocuments.State = 1 Then
- ReDim Preserve TypeList(13) as String
-
- TypeList(5) = "writer8"
- TypeList(6) = "writerglobal8"
- TypeList(7) =
"writer_StarOffice_XML_Writer"
- TypeList(8) =
"writer_globaldocument_StarOffice_XML_Writer_GlobalDocument"
- TypeList(9) = "writer_StarWriter_30"
- TypeList(10) = "writer_StarWriter_40"
- TypeList(11) =
"writer_globaldocument_StarWriter_40GlobalDocument"
- TypeList(12) = "writer_StarWriter_50"
- TypeList(13) =
"writer_globaldocument_StarWriter_50GlobalDocument"
+ ReDim Preserve TypeList(5) as String
+
+ TypeList(2) = "writer8"
+ TypeList(3) = "writerglobal8"
+ TypeList(4) =
"writer_StarOffice_XML_Writer"
+ TypeList(5) =
"writer_globaldocument_StarOffice_XML_Writer_GlobalDocument"
End If
FilesList() = ReadDirectories(SourceDir, bRecursive,
True, False, TypeList())
TotDocCount = Ubound(FilesList(),1) + 1
@@ -387,34 +379,26 @@ Sub CallFilePicker()
oTypes() = oMasterKey.Types
oUIKey =
GetRegistryKeyContent("org.openoffice.Office.UI/FilterClassification/LocalFilters")
If DialogModel.chkTextDocuments.State = 1 Then
- Dim FilterNames(11,1) as String
- FilterNames(6,0) =
oTypes.GetByName("writer_StarOffice_XML_Writer").UIName
- FilterNames(6,1) = "*.sxw"
- FilterNames(7,0) =
oTypes.GetByName("writer_StarOffice_XML_Writer_Template").UIName
- FilterNames(7,1) = "*.stw"
- FilterNames(8,0) =
oUIKey.Classes.GetByName("sw3to5").DisplayName
- FilterNames(8,1) = "*.sdw"
- FilterNames(9,0) =
oUIKey.Classes.GetByName("sw3to5templ").DisplayName
- Filternames(9,1) = "*.vor"
- FilterNames(10,0) =
oTypes.GetByName("writer8").UIName
- FilterNames(10,1) = "*.odt"
- FilterNames(11,0) =
oTypes.GetByName("writer8_template").UIName
- FilterNames(11,1) = "*.ott"
+ Dim FilterNames(7,1) as String
+ FilterNames(4,0) =
oTypes.GetByName("writer_StarOffice_XML_Writer").UIName
+ FilterNames(4,1) = "*.sxw"
+ FilterNames(5,0) =
oTypes.GetByName("writer_StarOffice_XML_Writer_Template").UIName
+ FilterNames(5,1) = "*.stw"
+ FilterNames(6,0) =
oTypes.GetByName("writer8").UIName
+ FilterNames(6,1) = "*.odt"
+ FilterNames(7,0) =
oTypes.GetByName("writer8_template").UIName
+ FilterNames(7,1) = "*.ott"
Else
- ReDim FilterNames(5,1) as String
+ ReDim FilterNames(3,1) as String
End If
- FilterNames(0,0) =
oTypes.Ge
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - svtools/source
svtools/source/contnr/imivctl1.cxx | 13 +++--
1 file changed, 3 insertions(+), 10 deletions(-)
New commits:
commit bfb51322f2bee76d7e70588050c38655a432aef0
Author: Stephan Bergmann
Date: Wed Oct 9 12:06:41 2013 +0200
Make CalcFocusRect look right
...at least for its (only, it appears) uses at the left of the "Insert -
Hyperlink" dialog and at the left of a Database window. As aBmpRect and
aTextRect never extend aBoundRect (and aTextRect always leaving a gap left
and
right towards aBoundRect, it appears, with the text abbreviated with an
ellipsis
if it would be too wide), there should be no need to eventually adjust "the
focus rectangle [to] not touch the text," and for calculating the top of the
focus rect aBoundRect can be used just as well as aBmpRect. (Though for
calculating the bottom, aBoundRect apparently stretches "too far" compareed
to
aTextRect; whatever... The offsets look somewhat "magic" anyway, but
appear to
produce the desired visual results.)
Change-Id: Ic324561294fb6172c0d02a697fc261717e01c87c
Reviewed-on: https://gerrit.libreoffice.org/6165
Reviewed-by: Eike Rathke
Tested-by: Eike Rathke
(cherry picked from commit 143bb92761f54cb7b8e41e5ac83bd274d4f7079b)
Signed-off-by: Eike Rathke
diff --git a/svtools/source/contnr/imivctl1.cxx
b/svtools/source/contnr/imivctl1.cxx
index 01f733d..b0ea082 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -2703,18 +2703,11 @@ const Size& SvxIconChoiceCtrl_Impl::GetItemSize(
SvxIconChoiceCtrlEntry*,
Rectangle SvxIconChoiceCtrl_Impl::CalcFocusRect( SvxIconChoiceCtrlEntry*
pEntry )
{
-Rectangle aBmpRect( CalcBmpRect( pEntry ) );
Rectangle aTextRect( CalcTextRect( pEntry ) );
Rectangle aBoundRect( GetEntryBoundRect( pEntry ) );
-Rectangle aFocusRect( aBoundRect.Left(), aBmpRect.Top() - 1,
- aBoundRect.Right() - 4, aTextRect.Bottom() + 1 );
-// the focus rectangle should not touch the text
-if( aFocusRect.Left() > ::std::numeric_limits::min() &&
aFocusRect.Left() - 1 >= pEntry->aRect.Left() )
-aFocusRect.Left()--;
-if( aFocusRect.Right() < ::std::numeric_limits::max() &&
aFocusRect.Right() + 1 <= pEntry->aRect.Right() )
-aFocusRect.Right()++;
-
-return aFocusRect;
+return Rectangle(
+aBoundRect.Left(), aBoundRect.Top() - 1, aBoundRect.Right() - 1,
+aTextRect.Bottom() + 1);
}
// the hot spot is the inner 50 % of the rectangle
___
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/sbasic/shared/01050300.xhp | 23 --- 2 files changed, 12 insertions(+), 17 deletions(-) New commits: commit 1190ebd3f79bd8ef7f69200d7e22c7ab77fdc4cf Author: Caolán McNamara Date: Thu Jan 2 21:30:49 2014 + update help ids for basic manage breakpoints dialog Change-Id: I823df9129adf5da840017612245ad62d74814413 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index fe07c45..e126a28 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -5444,26 +5444,20 @@ UID_RPT_VIEWSWINDOW,64454, UID_SEARCH_RECORDSTATUS,38203, UID_SQLERROR_BUTTONMORE,38844, WID_SIMPLE_REF,25728,.uno:SimpleReferenz -basctl_CheckBox_RID_BASICIDE_BREAKPOINTDLG_RID_CHKB_ACTIVE,1318355975, basctl_CheckBox_RID_DLG_LIBS_RID_CB_REF,1317700643, basctl_CheckBox_RID_DLG_LIBS_RID_CB_REPL,1317700644, -basctl_ComboBox_RID_BASICIDE_BREAKPOINTDLG_RID_CB_BRKPOINTS,1318359042, basctl_Edit_RID_MACROCHOOSER_RID_ED_MACRONAME,1317865477, basctl_Edit_RID_MACROOPTIONS_RID_ED_HELPNAME,1317947404, basctl_FloatingWindow_RID_BASICIDE_OBJCAT,1855062016, basctl_ListBox_RID_DLG_MANAGE_LANGUAGE_LB_LANGUAGE,1343589890, basctl_ListBox_RID_DLG_SETDEF_LANGUAGE_LB_DEF_LANGUAGE,1343622658, basctl_ListBox_RID_TP_LIBS_RID_LB_BASICS,780799500, -basctl_ModalDialog_RID_BASICIDE_BREAKPOINTDLG,1318354944, basctl_ModalDialog_RID_DLG_LIBS,1317699584, basctl_ModalDialog_RID_MACROCHOOSER,1317863424, basctl_ModalDialog_RID_MACROOPTIONS,1317945344, basctl_MultiLineEdit_RID_MACROCHOOSER_RID_ML_DESCRIPTION,1317866000, basctl_MultiLineEdit_RID_MACROOPTIONS_RID_ME_DESCR,1317947911, -basctl_NumericField_RID_BASICIDE_BREAKPOINTDLG_RID_FLD_PASS,1318361098, basctl_NumericField_RID_MACROOPTIONS_RID_NF_HELPID,1317951498, -basctl_PushButton_RID_BASICIDE_BREAKPOINTDLG_RID_PB_DEL,1318359558, -basctl_PushButton_RID_BASICIDE_BREAKPOINTDLG_RID_PB_NEW,1318359557, basctl_PushButton_RID_DLG_MANAGE_LANGUAGE_PB_ADD_LANG,1343590915, basctl_PushButton_RID_DLG_MANAGE_LANGUAGE_PB_DEL_LANG,1343590916, basctl_PushButton_RID_DLG_MANAGE_LANGUAGE_PB_MAKE_DEFAULT,1343590917, diff --git a/source/text/sbasic/shared/01050300.xhp b/source/text/sbasic/shared/01050300.xhp index 22e342c..c3b185b 100644 --- a/source/text/sbasic/shared/01050300.xhp +++ b/source/text/sbasic/shared/01050300.xhp @@ -34,24 +34,25 @@ + Manage Breakpoints -Specifies the options for breakpoints. +Specifies the options for breakpoints. - + Breakpoints -Enter the line number for a new breakpoint, then click New. - +Enter the line number for a new breakpoint, then click New. + Active -Activates or deactivates the current breakpoint. - +Activates or deactivates the current breakpoint. + Pass Count -Specify the number of loops to perform before the breakpoint takes effect. - +Specify the number of loops to perform before the breakpoint takes effect. + New -Creates a breakpoint on the line number specified. - +Creates a breakpoint on the line number specified. + Delete -Deletes the selected breakpoint. +Deletes the selected breakpoint. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basctl/AllLangResTarget_basctl.mk basctl/source basctl/uiconfig basctl/UIConfig_basicide.mk
basctl/AllLangResTarget_basctl.mk|1
basctl/UIConfig_basicide.mk |1
basctl/source/basicide/brkdlg.cxx| 120 ++--
basctl/source/basicide/brkdlg.hrc| 38
basctl/source/basicide/brkdlg.hxx| 16 -
basctl/source/basicide/brkdlg.src| 96 --
basctl/uiconfig/basicide/ui/managebreakpoints.ui | 214 +++
7 files changed, 280 insertions(+), 206 deletions(-)
New commits:
commit f9aab8ff0e26df747bf50b337ffbcc7ab6559cc2
Author: Caolán McNamara
Date: Thu Jan 2 16:42:32 2014 +
Convert break point dialog to .ui format
Change-Id: I750133b673e135399ab9c04953550bea1db3a9e8
diff --git a/basctl/AllLangResTarget_basctl.mk
b/basctl/AllLangResTarget_basctl.mk
index 23cc08e..d20fc6e 100644
--- a/basctl/AllLangResTarget_basctl.mk
+++ b/basctl/AllLangResTarget_basctl.mk
@@ -41,7 +41,6 @@ $(eval $(call gb_SrsTarget_set_include,basctl/res,\
$(eval $(call gb_SrsTarget_add_files,basctl/res,\
basctl/source/basicide/basicprint.src \
basctl/source/basicide/basidesh.src \
- basctl/source/basicide/brkdlg.src \
basctl/source/basicide/macrodlg.src \
basctl/source/basicide/moduldlg.src \
basctl/source/basicide/objdlg.src \
diff --git a/basctl/UIConfig_basicide.mk b/basctl/UIConfig_basicide.mk
index 9701469..0a0263d 100644
--- a/basctl/UIConfig_basicide.mk
+++ b/basctl/UIConfig_basicide.mk
@@ -32,6 +32,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/BasicIDE,\
basctl/uiconfig/basicide/ui/basicmacrodialog \
basctl/uiconfig/basicide/ui/gotolinedialog \
basctl/uiconfig/basicide/ui/exportdialog \
+ basctl/uiconfig/basicide/ui/managebreakpoints \
basctl/uiconfig/basicide/ui/newlibdialog \
basctl/uiconfig/basicide/ui/organizedialog \
))
diff --git a/basctl/source/basicide/brkdlg.cxx
b/basctl/source/basicide/brkdlg.cxx
index f8dfe9f..f41616f 100644
--- a/basctl/source/basicide/brkdlg.cxx
+++ b/basctl/source/basicide/brkdlg.cxx
@@ -21,7 +21,6 @@
#define _SVX_NOIDERESIDS
#include "breakpoint.hxx"
#include "brkdlg.hxx"
-#include "brkdlg.hrc"
#include "basidesh.hxx"
#include "basidesh.hrc"
#include "iderdll.hxx"
@@ -64,47 +63,46 @@ bool lcl_ParseText(OUString const &rText, size_t& rLineNr )
} // namespace
-BreakPointDialog::BreakPointDialog( Window* pParent, BreakPointList&
rBrkPntList ) :
-ModalDialog( pParent, IDEResId( RID_BASICIDE_BREAKPOINTDLG ) ),
-aComboBox( this, IDEResId( RID_CB_BRKPOINTS ) ),
-aOKButton( this, IDEResId( RID_PB_OK ) ),
-aCancelButton( this, IDEResId( RID_PB_CANCEL ) ),
-aNewButton( this, IDEResId( RID_PB_NEW ) ),
-aDelButton( this, IDEResId( RID_PB_DEL ) ),
-aCheckBox( this, IDEResId( RID_CHKB_ACTIVE ) ),
-aBrkText( this, IDEResId( RID_FT_BRKPOINTS ) ),
-aPassText( this, IDEResId( RID_FT_PASS ) ),
-aNumericField( this, IDEResId( RID_FLD_PASS ) ),
-m_rOriginalBreakPointList(rBrkPntList),
-m_aModifiedBreakPointList(rBrkPntList)
+BreakPointDialog::BreakPointDialog( Window* pParent, BreakPointList&
rBrkPntList )
+: ModalDialog(pParent, "ManageBreakpointsDialog",
+"modules/BasicIDE/ui/managebreakpoints.ui")
+, m_rOriginalBreakPointList(rBrkPntList)
+, m_aModifiedBreakPointList(rBrkPntList)
{
-FreeResource();
-
-aComboBox.SetUpdateMode(false);
+get(m_pComboBox, "entries");
+m_pComboBox->set_height_request(m_pComboBox->GetTextHeight() * 12);
+m_pComboBox->set_width_request(m_pComboBox->approximate_char_width() * 32);
+get(m_pOKButton, "ok");
+get(m_pNewButton, "new");
+get(m_pDelButton, "delete");
+get(m_pCheckBox, "active");
+get(m_pNumericField, "pass-nospin");
+
+m_pComboBox->SetUpdateMode(false);
for ( size_t i = 0, n = m_aModifiedBreakPointList.size(); i < n; ++i )
{
BreakPoint* pBrk = m_aModifiedBreakPointList.at( i );
OUString aEntryStr( "# " + OUString::number(pBrk->nLine) );
-aComboBox.InsertEntry( aEntryStr, COMBOBOX_APPEND );
+m_pComboBox->InsertEntry( aEntryStr, COMBOBOX_APPEND );
}
-aComboBox.SetUpdateMode(true);
+m_pComboBox->SetUpdateMode(true);
-aOKButton.SetClickHdl( LINK( this, BreakPointDialog, ButtonHdl ) );
-aNewButton.SetClickHdl( LINK( this, BreakPointDialog, ButtonHdl ) );
-aDelButton.SetClickHdl( LINK( this, BreakPointDialog, ButtonHdl ) );
+m_pOKButton->SetClickHdl( LINK( this, BreakPointDialog, ButtonHdl ) );
+m_pNewButton->SetClickHdl( LINK( this, BreakPointDialog, ButtonHdl ) );
+m_pDelButton->SetClickHdl( LINK( this, BreakPointDialog, ButtonHdl ) );
-aCheckBox.SetClickHdl( LINK( this, BreakPointDialog, CheckBoxHdl ) );
-aComboBox.SetSelectHdl( LINK( this, BreakPointDialog, ComboBoxHighlightHdl
) );
-aComboBox.SetModifyHdl( LINK(
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ab3e7ca757a89a4522ef6ede3891b873fbcb8458 Author: Caolán McNamara Date: Thu Jan 2 21:30:49 2014 + Updated core Project: help 1190ebd3f79bd8ef7f69200d7e22c7ab77fdc4cf diff --git a/helpcontent2 b/helpcontent2 index bf4c843..1190ebd 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit bf4c8437beedbf404e478e4a50a65bd9be6325a7 +Subproject commit 1190ebd3f79bd8ef7f69200d7e22c7ab77fdc4cf ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/kohei/calc-data-stream' - 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 'libreoffice-4-2' - 3 commits - i18npool/source sc/source
i18npool/source/localedata/data/ltg_LV.xml |9 -
i18npool/source/localedata/data/lv_LV.xml |9 -
sc/source/core/tool/interpr2.cxx | 10 --
3 files changed, 24 insertions(+), 4 deletions(-)
New commits:
commit 5e5e8f48ac184bb0dd96a74c5bbc2108fd5b44d8
Author: Eike Rathke
Date: Thu Jan 2 22:14:07 2014 +0100
added Latvian "LVL" to EUROCONVERT(), fdo#73239
Change-Id: I2041a4a8fa2387a217eac96d4424f8ee511a2e00
(cherry picked from commit cc1b6535e01db62688a7bee50852d33e4ee50761)
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index cdc2120..d13f1e6 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -2562,7 +2562,8 @@ static bool lclConvertMoney( const OUString& aSearchUnit,
double& rfRate, int& r
{ "MTL", 0.429300, 2 },
{ "CYP", 0.585274, 2 },
{ "SKK", 30.1260, 2 },
-{ "EEK", 15.6466, 2 }
+{ "EEK", 15.6466, 2 },
+{ "LVL", 0.702804, 2 }
};
const size_t nConversionCount = sizeof( aConvertTable ) / sizeof(
aConvertTable[0] );
commit aa17477a731496d6b003517e2a9b92c9aac924ac
Author: Eike Rathke
Date: Thu Jan 2 22:07:24 2014 +0100
added EUR as default currency to Latvia [*-LV] locale data, fdo#73239
Change-Id: Iee8da90c70589b8053c8c5b696afb4968072f47e
(cherry picked from commit c32996987354d045523beaa98b5d227d161f72fb)
diff --git a/i18npool/source/localedata/data/ltg_LV.xml
b/i18npool/source/localedata/data/ltg_LV.xml
index 12fe4b0..6765077 100644
--- a/i18npool/source/localedata/data/ltg_LV.xml
+++ b/i18npool/source/localedata/data/ltg_LV.xml
@@ -331,7 +331,14 @@
-
+
+ EUR
+ â¬
+ EUR
+ Euro
+ 2
+
+
LVL
Ls
LVL
diff --git a/i18npool/source/localedata/data/lv_LV.xml
b/i18npool/source/localedata/data/lv_LV.xml
index 456214d..68483e5 100644
--- a/i18npool/source/localedata/data/lv_LV.xml
+++ b/i18npool/source/localedata/data/lv_LV.xml
@@ -331,7 +331,14 @@
-
+
+ EUR
+ â¬
+ EUR
+ Euro
+ 2
+
+
LVL
Ls
LVL
commit 852cc9597cbe0c0529f9d3187ac935a05f7ed885
Author: Eike Rathke
Date: Thu Jan 2 21:53:36 2014 +0100
added Estonian "EEK" to EUROCONVERT(), fdo#73239
Change-Id: Ib4c82992e12758fcec6c667c57849935cd518972
(cherry picked from commit 127f863c727c07f1da40005fe638d97e89baaccf)
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index ab9183a..cdc2120 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -2532,7 +2532,11 @@ void ScInterpreter::ScHyperLink()
}
}
-bool lclConvertMoney( const OUString& aSearchUnit, double& rfRate, int& rnDec )
+/** Resources at the website of the European Commission:
+http://ec.europa.eu/economy_finance/euro/adoption/conversion/
+http://ec.europa.eu/economy_finance/euro/countries/
+ */
+static bool lclConvertMoney( const OUString& aSearchUnit, double& rfRate, int&
rnDec )
{
struct ConvertInfo
{
@@ -2557,7 +2561,8 @@ bool lclConvertMoney( const OUString& aSearchUnit,
double& rfRate, int& rnDec )
{ "SIT", 239.640, 2 },
{ "MTL", 0.429300, 2 },
{ "CYP", 0.585274, 2 },
-{ "SKK", 30.1260, 2 }
+{ "SKK", 30.1260, 2 },
+{ "EEK", 15.6466, 2 }
};
const size_t nConversionCount = sizeof( aConvertTable ) / sizeof(
aConvertTable[0] );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - i18npool/source sc/source
i18npool/source/localedata/data/ltg_LV.xml |9 -
i18npool/source/localedata/data/lv_LV.xml |9 -
sc/source/core/tool/interpr2.cxx | 10 --
3 files changed, 24 insertions(+), 4 deletions(-)
New commits:
commit cc1b6535e01db62688a7bee50852d33e4ee50761
Author: Eike Rathke
Date: Thu Jan 2 22:14:07 2014 +0100
added Latvian "LVL" to EUROCONVERT(), fdo#73239
Change-Id: I2041a4a8fa2387a217eac96d4424f8ee511a2e00
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index cdc2120..d13f1e6 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -2562,7 +2562,8 @@ static bool lclConvertMoney( const OUString& aSearchUnit,
double& rfRate, int& r
{ "MTL", 0.429300, 2 },
{ "CYP", 0.585274, 2 },
{ "SKK", 30.1260, 2 },
-{ "EEK", 15.6466, 2 }
+{ "EEK", 15.6466, 2 },
+{ "LVL", 0.702804, 2 }
};
const size_t nConversionCount = sizeof( aConvertTable ) / sizeof(
aConvertTable[0] );
commit c32996987354d045523beaa98b5d227d161f72fb
Author: Eike Rathke
Date: Thu Jan 2 22:07:24 2014 +0100
added EUR as default currency to Latvia [*-LV] locale data, fdo#73239
Change-Id: Iee8da90c70589b8053c8c5b696afb4968072f47e
diff --git a/i18npool/source/localedata/data/ltg_LV.xml
b/i18npool/source/localedata/data/ltg_LV.xml
index 12fe4b0..6765077 100644
--- a/i18npool/source/localedata/data/ltg_LV.xml
+++ b/i18npool/source/localedata/data/ltg_LV.xml
@@ -331,7 +331,14 @@
-
+
+ EUR
+ â¬
+ EUR
+ Euro
+ 2
+
+
LVL
Ls
LVL
diff --git a/i18npool/source/localedata/data/lv_LV.xml
b/i18npool/source/localedata/data/lv_LV.xml
index 456214d..68483e5 100644
--- a/i18npool/source/localedata/data/lv_LV.xml
+++ b/i18npool/source/localedata/data/lv_LV.xml
@@ -331,7 +331,14 @@
-
+
+ EUR
+ â¬
+ EUR
+ Euro
+ 2
+
+
LVL
Ls
LVL
commit 127f863c727c07f1da40005fe638d97e89baaccf
Author: Eike Rathke
Date: Thu Jan 2 21:53:36 2014 +0100
added Estonian "EEK" to EUROCONVERT(), fdo#73239
Change-Id: Ib4c82992e12758fcec6c667c57849935cd518972
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index ab9183a..cdc2120 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -2532,7 +2532,11 @@ void ScInterpreter::ScHyperLink()
}
}
-bool lclConvertMoney( const OUString& aSearchUnit, double& rfRate, int& rnDec )
+/** Resources at the website of the European Commission:
+http://ec.europa.eu/economy_finance/euro/adoption/conversion/
+http://ec.europa.eu/economy_finance/euro/countries/
+ */
+static bool lclConvertMoney( const OUString& aSearchUnit, double& rfRate, int&
rnDec )
{
struct ConvertInfo
{
@@ -2557,7 +2561,8 @@ bool lclConvertMoney( const OUString& aSearchUnit,
double& rfRate, int& rnDec )
{ "SIT", 239.640, 2 },
{ "MTL", 0.429300, 2 },
{ "CYP", 0.585274, 2 },
-{ "SKK", 30.1260, 2 }
+{ "SKK", 30.1260, 2 },
+{ "EEK", 15.6466, 2 }
};
const size_t nConversionCount = sizeof( aConvertTable ) / sizeof(
aConvertTable[0] );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapper.cxx |4
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 24 ---
writerfilter/source/dmapper/GraphicImport.cxx |3
writerfilter/source/doctok/resources.xmi | 148 --
4 files changed, 2 insertions(+), 177 deletions(-)
New commits:
commit 0fb94d6d41a1429d2c81a96a24fdc348060205e2
Author: Miklos Vajna
Date: Thu Jan 2 21:43:12 2014 +0100
writerfilter: drop unused rtf:{shape,shpname,dxaDel,dxaAdd} tokens
Change-Id: I829a3d11675aeea20094140efbc51ad2bcb86cc4
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 93f6e6d..320750e 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -746,10 +746,6 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
}
}
break;
-case NS_rtf::LN_dxaDel:
-//deleted tab
-case NS_rtf::LN_dxaAdd:
-//set tab
case NS_rtf::LN_TLC:
//tab leading characters - for decimal tabs
case NS_rtf::LN_JC:
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 0e166c8..55f7a8f 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -476,10 +476,10 @@ void DomainMapper_Impl::InitTabStopFromStyle( const
uno::Sequence< style::TabSto
void DomainMapper_Impl::ModifyCurrentTabStop( Id nId, sal_Int32 nValue)
{
-OSL_ENSURE(nId == NS_rtf::LN_dxaAdd || m_nCurrentTabStopIndex <
m_aCurrentTabStops.size(),
+OSL_ENSURE(m_nCurrentTabStopIndex < m_aCurrentTabStops.size(),
"tab stop creation error");
-if( nId != NS_rtf::LN_dxaAdd && m_nCurrentTabStopIndex >=
m_aCurrentTabStops.size())
+if( m_nCurrentTabStopIndex >= m_aCurrentTabStops.size())
return;
static const style::TabAlign aTabAlignFromWord[] =
{
@@ -501,26 +501,6 @@ void DomainMapper_Impl::ModifyCurrentTabStop( Id nId,
sal_Int32 nValue)
switch(nId)
{
-case NS_rtf::LN_dxaAdd: //set tab
-m_aCurrentTabStops.push_back(
-
DeletableTabStop(style::TabStop(ConversionHelper::convertTwipToMM100(nValue),
style::TabAlign_LEFT, ' ', ' ')));
-break;
-case NS_rtf::LN_dxaDel: //deleted tab
-{
-//mark the tab stop at the given position as deleted
-::std::vector::iterator aIt =
m_aCurrentTabStops.begin();
-::std::vector::iterator aEndIt =
m_aCurrentTabStops.end();
-sal_Int32 nConverted =
ConversionHelper::convertTwipToMM100(nValue);
-for( ; aIt != aEndIt; ++aIt)
-{
-if( aIt->Position == nConverted )
-{
-aIt->bDeleted = true;
-break;
-}
-}
-}
-break;
case NS_rtf::LN_TLC: //tab leading characters - for decimal tabs
// 0 - no leader, 1- dotted, 2 - hyphenated, 3 - single line, 4 -
heavy line, 5 - middle dot
if( nValue >= 0 && nValue <
sal::static_int_cast(sizeof(aTabFillCharWord) / sizeof
(sal_Unicode)))
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx
b/writerfilter/source/dmapper/GraphicImport.cxx
index 5d35976..39f1977e 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -463,7 +463,6 @@ void GraphicImport::lcl_attribute(Id nName, Value & val)
case NS_rtf::LN_BRCLEFT: //left border
case NS_rtf::LN_BRCBOTTOM: //bottom border
case NS_rtf::LN_BRCRIGHT: //right border
-case NS_rtf::LN_shape: //shape
case NS_rtf::LN_blip: //the binary graphic data in a shape
{
switch(nName)
@@ -631,8 +630,6 @@ void GraphicImport::lcl_attribute(Id nName, Value & val)
break; //ignored
case NS_rtf::LN_shpfComplex:
break;
-case NS_rtf::LN_shpname:
-break;
//BLIP store entry
case NS_rtf::LN_shpbtWin32:
diff --git a/writerfilter/source/doctok/resources.xmi
b/writerfilter/source/doctok/resources.xmi
index 8813862..b5655e7 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -23842,21 +23842,6 @@
-
-
-
-
-
rtf:shape
-
-
-
-
-
-
-
-
-
-
@@ -24457,53 +24442,6 @@
-
-
-
-
-
rtf:shpname
-
-
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - a3/895516f02a80151caaac8b92fb50aa5f7ee93b
a3/895516f02a80151caaac8b92fb50aa5f7ee93b |1 + 1 file changed, 1 insertion(+) New commits: commit ea1d25807d3427a36e12179c8482c7d1d68cf40c Author: Caolán McNamara Date: Thu Jan 2 20:45:30 2014 + Notes added by 'git notes add' diff --git a/a3/895516f02a80151caaac8b92fb50aa5f7ee93b b/a3/895516f02a80151caaac8b92fb50aa5f7ee93b new file mode 100644 index 000..da7b047 --- /dev/null +++ b/a3/895516f02a80151caaac8b92fb50aa5f7ee93b @@ -0,0 +1 @@ +merged as: 7f3ac23fad1f2a10c033b59ac2f14934b528b2ea ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl vcl/Library_vcl.mk vcl/source
include/vcl/metric.hxx | 18
vcl/Library_vcl.mk |1
vcl/source/gdi/impfont.cxx | 854 +
vcl/source/gdi/metric.cxx | 681 ---
4 files changed, 864 insertions(+), 690 deletions(-)
New commits:
commit 7f3ac23fad1f2a10c033b59ac2f14934b528b2ea
Author: Herbert Dürr
Date: Thu Jan 2 16:42:32 2014 +
Resolves: #i123895# split impfont.cxx source from metric.cxx
and move the helper function UpdateAttributesFromPSName() there to
make it available for all platforms, not only ATSUI-based ones.
(cherry picked from commit a3895516f02a80151caaac8b92fb50aa5f7ee93b)
Conflicts:
include/vcl/metric.hxx
vcl/aqua/source/gdi/salatsuifontutils.cxx
vcl/inc/impfont.hxx
vcl/source/gdi/metric.cxx
Change-Id: I6d5702d429673c83740cb72775014f8942e5f44d
diff --git a/include/vcl/metric.hxx b/include/vcl/metric.hxx
index 9b6efe6..b557c25 100644
--- a/include/vcl/metric.hxx
+++ b/include/vcl/metric.hxx
@@ -89,18 +89,18 @@ public:
FontCharMap();
~FontCharMap();
-sal_BoolIsDefaultMap() const;
-sal_BoolHasChar( sal_uInt32 ) const;
-int CountCharsInRange( sal_uInt32 cMin, sal_uInt32 cMax )
const;
-int GetCharCount() const;
+boolIsDefaultMap( void ) const;
+boolHasChar( sal_UCS4 ) const;
+int CountCharsInRange( sal_UCS4 cMin, sal_UCS4 cMax )
const;
+int GetCharCount( void ) const;
-sal_uInt32 GetFirstChar() const;
+sal_UCS4GetFirstChar() const;
-sal_uInt32 GetNextChar( sal_uInt32 ) const;
-sal_uInt32 GetPrevChar( sal_uInt32 ) const;
+sal_UCS4GetNextChar( sal_UCS4 ) const;
+sal_UCS4GetPrevChar( sal_UCS4 ) const;
-int GetIndexFromChar( sal_uInt32 ) const;
-sal_uInt32 GetCharFromIndex( int ) const;
+int GetIndexFromChar( sal_UCS4 ) const;
+sal_UCS4GetCharFromIndex( int ) const;
private:
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index e178412..a3f36ac 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -216,6 +216,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/gdi/imagerepository \
vcl/source/gdi/impanmvw \
vcl/source/gdi/impbmp \
+vcl/source/gdi/impfont \
vcl/source/gdi/impgraph \
vcl/source/gdi/impimage \
vcl/source/gdi/impimagetree \
diff --git a/vcl/source/gdi/impfont.cxx b/vcl/source/gdi/impfont.cxx
new file mode 100644
index 000..bfe99dc
--- /dev/null
+++ b/vcl/source/gdi/impfont.cxx
@@ -0,0 +1,854 @@
+/*
+ * 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/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#include
+#include
+#include
+
+#include
+#include
+
+// ===
+
+CmapResult::CmapResult( bool bSymbolic,
+const sal_UCS4* pRangeCodes, int nRangeCount,
+const int* pStartGlyphs, const sal_uInt16* pExtraGlyphIds )
+: mpRangeCodes( pRangeCodes)
+, mpStartGlyphs( pStartGlyphs)
+, mpGlyphIds( pExtraGlyphIds)
+, mnRangeCount( nRangeCount)
+, mbSymbolic( bSymbolic)
+, mbRecoded( false)
+{}
+
+// ===
+
+ImplFontCharMap::ImplFontCharMap( const CmapResult& rCR )
+: mpRangeCodes( rCR.mpRangeCodes )
+, mpStartGlyphs( rCR.mpStartGlyphs )
+, mpGlyphIds( rCR.mpGlyphIds )
+, mnRangeCount( rCR.mnRangeCount )
+, mnCharCount( 0 )
+, mnRefCount( 1 )
+{
+const sal_UCS4* pRangePtr = mpRangeCodes;
+for( int i = mnRangeCount; --i >= 0; pRangePtr += 2 )
+{
+sal_UCS4 cFirst = pRangePtr[0];
+sal_UCS4 cLast = pRangePtr[1];
+mnCharCount += cLast - cFirst;
+}
+}
+
+static ImplFontCharMap* pDefaultImplFontCharMap = NULL;
+static const sal_UCS4 aDefaultUnicodeRanges[] = {0x0020,0xD800, 0xE000,0xFFF0};
+static const sal_UCS4 aDefaultSymbolRanges[] = {0x0020,0x0100, 0xF020,0xF100};
+
+// -
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - linguistic/source
linguistic/source/lngopt.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b8303a3e58f0b8d50574126998228d7d71c94728
Author: Julien Nabet
Date: Wed Jan 1 21:39:13 2014 +0100
Resolves: fdo#72464 Character line break is set to 0 Options/.../Writing
Aids
Change-Id: I9f3d1c64fde064fc7ba9bdfcb9e35032a0c40255
Reviewed-on: https://gerrit.libreoffice.org/7253
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/linguistic/source/lngopt.hxx b/linguistic/source/lngopt.hxx
index c4bbc6c..c6d0bc6 100644
--- a/linguistic/source/lngopt.hxx
+++ b/linguistic/source/lngopt.hxx
@@ -149,7 +149,7 @@ public:
virtual void SAL_CALL setIsSpellCapitalization(sal_Bool p1) throw
(css::uno::RuntimeException)
{ setProperty(UPN_IS_SPELL_CAPITALIZATION, p1); }
virtual sal_Int16 SAL_CALL getHyphMinLeading() throw
(css::uno::RuntimeException)
-{ return getPropertyBool(UPN_HYPH_MIN_LEADING); }
+{ return getPropertyInt16(UPN_HYPH_MIN_LEADING); }
virtual void SAL_CALL setHyphMinLeading(sal_Int16 p1) throw
(css::uno::RuntimeException)
{ setProperty(UPN_HYPH_MIN_LEADING, p1); }
virtual sal_Int16 SAL_CALL getHyphMinTrailing() throw
(css::uno::RuntimeException)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - linguistic/source
linguistic/source/lngopt.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 465954396edf9c34d4f53b4b4afe9f3817f257e3
Author: Julien Nabet
Date: Wed Jan 1 21:39:13 2014 +0100
Resolves: fdo#72464 Character line break is set to 0 Options/.../Writing
Aids
Change-Id: I9f3d1c64fde064fc7ba9bdfcb9e35032a0c40255
Reviewed-on: https://gerrit.libreoffice.org/7252
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/linguistic/source/lngopt.hxx b/linguistic/source/lngopt.hxx
index 528b853..8b67f64 100644
--- a/linguistic/source/lngopt.hxx
+++ b/linguistic/source/lngopt.hxx
@@ -149,7 +149,7 @@ public:
virtual void SAL_CALL setIsSpellCapitalization(sal_Bool p1) throw
(css::uno::RuntimeException)
{ setProperty(UPN_IS_SPELL_CAPITALIZATION, p1); }
virtual sal_Int16 SAL_CALL getHyphMinLeading() throw
(css::uno::RuntimeException)
-{ return getPropertyBool(UPN_HYPH_MIN_LEADING); }
+{ return getPropertyInt16(UPN_HYPH_MIN_LEADING); }
virtual void SAL_CALL setHyphMinLeading(sal_Int16 p1) throw
(css::uno::RuntimeException)
{ setProperty(UPN_HYPH_MIN_LEADING, p1); }
virtual sal_Int16 SAL_CALL getHyphMinTrailing() throw
(css::uno::RuntimeException)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fb25a67efe43a8021e1ac4d5836adadd68958925 Author: Marcos Paulo de Souza Date: Thu Jan 2 08:32:22 2014 -0200 Updated core Project: dictionaries f724c400668f11b49c3566a20c0c3350249ff266 Update pt_BR dictionary Change-Id: I5aea0c6761a1d58921e95c2fb6a559c63feec5ea Reviewed-on: https://gerrit.libreoffice.org/7258 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/dictionaries b/dictionaries index 569915c..f724c40 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 569915c40dc4b3df1f75abe9e1202e0d66f03281 +Subproject commit f724c400668f11b49c3566a20c0c3350249ff266 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 01af057083321e00cd9a44e9b309099c3b55b276 Author: Niklas Johansson Date: Thu Jan 2 15:16:50 2014 +0100 Updated core Project: dictionaries 6968c12ba2839bff7e4d2d46c29938d337846bb4 Update Swedish spelling dictionary Updates the spelling dictionary to the most resent version. Improvements include: Blocked a lot of compound words that often occur as misspellings of other common words. Improved support for three-way compounds. Removed a lot of uncommon words. Change-Id: Idab76e00c9e8f304af674499f7ea8418ed958f5f Reviewed-on: https://gerrit.libreoffice.org/7260 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/dictionaries b/dictionaries index f724c40..6968c12 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit f724c400668f11b49c3566a20c0c3350249ff266 +Subproject commit 6968c12ba2839bff7e4d2d46c29938d337846bb4 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 51780] default to Firebird not HSQLDB in Base
https://bugs.freedesktop.org/show_bug.cgi?id=51780 Caolán McNamara changed: What|Removed |Added Depends on||72987 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 12/d51cf294b62453c140a2db2b32aceb9dfb6ea8
12/d51cf294b62453c140a2db2b32aceb9dfb6ea8 |1 + 1 file changed, 1 insertion(+) New commits: commit ca64338dc03afab8dec09c51288bea071dc20f4e Author: Caolán McNamara Date: Thu Jan 2 20:17:40 2014 + Notes added by 'git notes add' diff --git a/12/d51cf294b62453c140a2db2b32aceb9dfb6ea8 b/12/d51cf294b62453c140a2db2b32aceb9dfb6ea8 new file mode 100644 index 000..8ebbe55 --- /dev/null +++ b/12/d51cf294b62453c140a2db2b32aceb9dfb6ea8 @@ -0,0 +1 @@ +ignore: obsolete ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 73113, which changed state. Bug 73113 Summary: LOOKUP function results in #N/A https://bugs.freedesktop.org/show_bug.cgi?id=73113 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 'libreoffice-4-2' - sc/source
sc/source/core/data/dociter.cxx | 24 +---
1 file changed, 21 insertions(+), 3 deletions(-)
New commits:
commit 1d1301de3248b1e08a66a259457f59b5406a5034
Author: Eike Rathke
Date: Thu Jan 2 20:52:28 2014 +0100
resolved fdo#73113 not string cell does not mean no string at cell
Introduced with c008dc483f8c6840803983e7e351cec6fdd32070 the
ScQueryCellIterator::BinarySearch() evaluated all non-string cells as
not being string, ignoring edit cells and formula cell string results.
Change-Id: I43be46dc8db35d6d0677086c345379ed4627b355
(cherry picked from commit 6046207ea2ef67de1388b30a7e8e0da5dcf5e6bf)
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index 565565f..dab4a10 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -1547,8 +1547,24 @@ bool ScQueryCellIterator::BinarySearch()
continue; // while
}
+bool bHaveRefCell = false;
PositionType aPos = pCol->maCells.position(i);
-bool bStr = aPos.first->type == sc::element_type_string;
+bool bStr;
+switch (aPos.first->type)
+{
+case sc::element_type_formula:
+aCell = sc::toRefCell(aPos.first, aPos.second);
+bHaveRefCell = true;
+bStr = aCell.hasString();
+break;
+case sc::element_type_string:
+case sc::element_type_edittext:
+bStr = true;
+break;
+default:
+bStr = false;
+break;
+}
nRes = 0;
// compares are contentquery:1
@@ -1556,7 +1572,8 @@ bool ScQueryCellIterator::BinarySearch()
if (!bStr && !bByString)
{
double nCellVal;
-aCell = sc::toRefCell(aPos.first, aPos.second);
+if (!bHaveRefCell)
+aCell = sc::toRefCell(aPos.first, aPos.second);
switch (aCell.meType)
{
case CELLTYPE_VALUE :
@@ -1611,7 +1628,8 @@ bool ScQueryCellIterator::BinarySearch()
{
OUString aCellStr;
sal_uLong nFormat = pCol->GetNumberFormat(i);
-aCell = sc::toRefCell(aPos.first, aPos.second);
+if (!bHaveRefCell)
+aCell = sc::toRefCell(aPos.first, aPos.second);
ScCellFormat::GetInputString(aCell, nFormat, aCellStr, rFormatter,
pDoc);
nRes = pCollator->compareString(aCellStr,
rEntry.GetQueryItem().maString.getString());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/dociter.cxx | 24 +---
1 file changed, 21 insertions(+), 3 deletions(-)
New commits:
commit 6046207ea2ef67de1388b30a7e8e0da5dcf5e6bf
Author: Eike Rathke
Date: Thu Jan 2 20:52:28 2014 +0100
resolved fdo#73113 not string cell does not mean no string at cell
Introduced with c008dc483f8c6840803983e7e351cec6fdd32070 the
ScQueryCellIterator::BinarySearch() evaluated all non-string cells as
not being string, ignoring edit cells and formula cell string results.
Change-Id: I43be46dc8db35d6d0677086c345379ed4627b355
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index 565565f..dab4a10 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -1547,8 +1547,24 @@ bool ScQueryCellIterator::BinarySearch()
continue; // while
}
+bool bHaveRefCell = false;
PositionType aPos = pCol->maCells.position(i);
-bool bStr = aPos.first->type == sc::element_type_string;
+bool bStr;
+switch (aPos.first->type)
+{
+case sc::element_type_formula:
+aCell = sc::toRefCell(aPos.first, aPos.second);
+bHaveRefCell = true;
+bStr = aCell.hasString();
+break;
+case sc::element_type_string:
+case sc::element_type_edittext:
+bStr = true;
+break;
+default:
+bStr = false;
+break;
+}
nRes = 0;
// compares are contentquery:1
@@ -1556,7 +1572,8 @@ bool ScQueryCellIterator::BinarySearch()
if (!bStr && !bByString)
{
double nCellVal;
-aCell = sc::toRefCell(aPos.first, aPos.second);
+if (!bHaveRefCell)
+aCell = sc::toRefCell(aPos.first, aPos.second);
switch (aCell.meType)
{
case CELLTYPE_VALUE :
@@ -1611,7 +1628,8 @@ bool ScQueryCellIterator::BinarySearch()
{
OUString aCellStr;
sal_uLong nFormat = pCol->GetNumberFormat(i);
-aCell = sc::toRefCell(aPos.first, aPos.second);
+if (!bHaveRefCell)
+aCell = sc::toRefCell(aPos.first, aPos.second);
ScCellFormat::GetInputString(aCell, nFormat, aCellStr, rFormatter,
pDoc);
nRes = pCollator->compareString(aCellStr,
rEntry.GetQueryItem().maString.getString());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/kohei/calc-data-stream' - sc/source
sc/source/core/tool/scmatrix.cxx | 78 ++-
1 file changed, 60 insertions(+), 18 deletions(-)
New commits:
commit 3ec61ffcbe95a64a2fe72f21c1ee1cd531d09755
Author: Kohei Yoshida
Date: Thu Jan 2 14:43:04 2014 -0500
Speed up matrix element access by storing last access position.
This should speed up normal element access if the elements are accessed
in sequential order.
Change-Id: Ia5c688ed79aabbc1fdcfc4dd5bf4b25359a585d5
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index 1a5ebbb..ba6d578 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -191,6 +191,7 @@ _Comp CompareMatrixElemFunc<_Comp>::maComp;
class ScMatrixImpl
{
MatrixImplType maMat;
+mutable MatrixImplType::const_position_type maMatPos;
MatrixImplType maMatFlag;
ScInterpreter* pErrorInterpreter;
boolmbCloneIfConst; // Whether the matrix is cloned with a
CloneIfConst() call.
@@ -287,13 +288,22 @@ private:
};
ScMatrixImpl::ScMatrixImpl(SCSIZE nC, SCSIZE nR) :
-maMat(nR, nC), maMatFlag(nR, nC), pErrorInterpreter(NULL),
mbCloneIfConst(true) {}
+maMat(nR, nC), maMatFlag(nR, nC), pErrorInterpreter(NULL),
mbCloneIfConst(true)
+{
+maMatPos = maMat.end_position();
+}
ScMatrixImpl::ScMatrixImpl(SCSIZE nC, SCSIZE nR, double fInitVal) :
-maMat(nR, nC, fInitVal), maMatFlag(nR, nC), pErrorInterpreter(NULL),
mbCloneIfConst(true) {}
+maMat(nR, nC, fInitVal), maMatFlag(nR, nC), pErrorInterpreter(NULL),
mbCloneIfConst(true)
+{
+maMatPos = maMat.end_position();
+}
ScMatrixImpl::ScMatrixImpl( size_t nC, size_t nR, const std::vector&
rInitVals ) :
-maMat(nR, nC, rInitVals.begin(), rInitVals.end()), maMatFlag(nR, nC),
pErrorInterpreter(NULL), mbCloneIfConst(true) {}
+maMat(nR, nC, rInitVals.begin(), rInitVals.end()), maMatFlag(nR, nC),
pErrorInterpreter(NULL), mbCloneIfConst(true)
+{
+maMatPos = maMat.end_position();
+}
ScMatrixImpl::~ScMatrixImpl()
{
@@ -303,6 +313,7 @@ ScMatrixImpl::~ScMatrixImpl()
void ScMatrixImpl::Clear()
{
maMat.clear();
+maMatPos = maMat.end_position();
maMatFlag.clear();
}
@@ -319,12 +330,14 @@ bool ScMatrixImpl::IsImmutable() const
void ScMatrixImpl::Resize(SCSIZE nC, SCSIZE nR)
{
maMat.resize(nR, nC);
+maMatPos = maMat.end_position();
maMatFlag.resize(nR, nC);
}
void ScMatrixImpl::Resize(SCSIZE nC, SCSIZE nR, double fVal)
{
maMat.resize(nR, nC, fVal);
+maMatPos = maMat.end_position();
maMatFlag.resize(nR, nC);
}
@@ -390,7 +403,10 @@ void ScMatrixImpl::SetErrorAtInterpreter( sal_uInt16
nError ) const
void ScMatrixImpl::PutDouble(double fVal, SCSIZE nC, SCSIZE nR)
{
if (ValidColRow( nC, nR))
+{
maMat.set(nR, nC, fVal);
+maMatPos = maMat.end_position();
+}
else
{
OSL_FAIL("ScMatrixImpl::PutDouble: dimension error");
@@ -400,7 +416,10 @@ void ScMatrixImpl::PutDouble(double fVal, SCSIZE nC,
SCSIZE nR)
void ScMatrixImpl::PutDouble(const double* pArray, size_t nLen, SCSIZE nC,
SCSIZE nR)
{
if (ValidColRow( nC, nR))
+{
maMat.set(nR, nC, pArray, pArray + nLen);
+maMatPos = maMat.end_position();
+}
else
{
OSL_FAIL("ScMatrixImpl::PutDouble: dimension error");
@@ -417,7 +436,10 @@ void ScMatrixImpl::PutDouble( double fVal, SCSIZE nIndex)
void ScMatrixImpl::PutString(const svl::SharedString& rStr, SCSIZE nC, SCSIZE
nR)
{
if (ValidColRow( nC, nR))
+{
maMat.set(nR, nC, rStr);
+maMatPos = maMat.end_position();
+}
else
{
OSL_FAIL("ScMatrixImpl::PutString: dimension error");
@@ -427,7 +449,10 @@ void ScMatrixImpl::PutString(const svl::SharedString&
rStr, SCSIZE nC, SCSIZE nR
void ScMatrixImpl::PutString(const svl::SharedString* pArray, size_t nLen,
SCSIZE nC, SCSIZE nR)
{
if (ValidColRow( nC, nR))
+{
maMat.set(nR, nC, pArray, pArray + nLen);
+maMatPos = maMat.end_position();
+}
else
{
OSL_FAIL("ScMatrixImpl::PutString: dimension error");
@@ -446,6 +471,7 @@ void ScMatrixImpl::PutEmpty(SCSIZE nC, SCSIZE nR)
if (ValidColRow( nC, nR))
{
maMat.set_empty(nR, nC);
+maMatPos = maMat.end_position();
maMatFlag.set(nR, nC, false); // zero flag to indicate that this is
'empty', not 'empty path'.
}
else
@@ -459,6 +485,7 @@ void ScMatrixImpl::PutEmptyPath(SCSIZE nC, SCSIZE nR)
if (ValidColRow( nC, nR))
{
maMat.set_empty(nR, nC);
+maMatPos = maMat.end_position();
maMatFlag.set(nR, nC, true); // non-zero flag to indicate empty 'path'.
}
else
@@ -470,12 +497,16 @@ void ScMatrixImpl::PutEmptyPath(SCSIZE nC, SCSIZE nR)
void ScMatrixImpl::PutError( sal_uInt16 nErrorCode, SCSIZE nC, SCSIZE nR )
{
maMat.set(nR, nC, CreateDoubleError(nErrorCode));
+maMatPos = maMat.end_position();
}
Need help on Bug#52461
I am new to LibreOffice and this is my first attempt at solving a bug. I am working on bug https://bugs.freedesktop.org/show_bug.cgi?id=52461 I need to traverse through the *maEntries* vector, however the Count() function, which returns maEntries.size() is returning 0. Any help on how this might be happening and how to resolve this? -- Regards, Rachit Gupta ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - oox/source sw/qa
oox/source/export/drawingml.cxx| 18 +++-
oox/source/export/preset-definitions-to-shape-types.pl | 25 +
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |3 ++
3 files changed, 45 insertions(+), 1 deletion(-)
New commits:
commit 33227dbf270bec5b7aa079b9b5e2e7e036796e20
Author: Miklos Vajna
Date: Thu Jan 2 18:43:39 2014 +0100
fdo#73215 oox: don't assume single adjustment is adj during export
So far adjustment names were either taken from the document model, or in
case there the name was empty, either "adj" was used (in case of a
single adjustment) or "adj1", "adj2", etc.
The problem is that there is no consistency here, e.g. this behavior was
correct for "cube" (single adjustment is called "adj"), but not for
"bentConnector3", where the single argument is called "adj1".
Instead of trying to guess or build a long list manually, use the new
ooxDrawingMLGetAdjNames() to write the correct names.
Change-Id: I3d609975d89c7c79f4a70c7a739cab8e01f9667f
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index a338170..030beb5 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -96,6 +96,9 @@ using ::sax_fastparser::FSHelperPtr;
DBG(extern void dump_pset(Reference< XPropertySet > rXPropSet));
+// Defined in generated code.
+extern std::map< OString, std::vector > ooxDrawingMLGetAdjNames();
+
namespace oox {
namespace drawingml {
@@ -1408,6 +1411,12 @@ void DrawingML::WritePresetShape( const char* pShape )
void DrawingML::WritePresetShape( const char* pShape, MSO_SPT eShapeType,
sal_Bool bPredefinedHandlesUsed, sal_Int32 nAdjustmentsWhichNeedsToBeConverted,
const PropertyValue& rProp )
{
+static std::map< OString, std::vector > aAdjMap =
ooxDrawingMLGetAdjNames();
+// If there are predefined adj names for this shape type, look them up now.
+std::vector aAdjustments;
+if (aAdjMap.find(OString(pShape)) != aAdjMap.end())
+aAdjustments = aAdjMap[OString(pShape)];
+
mpFS->startElementNS( XML_a, XML_prstGeom,
XML_prst, pShape,
FSEND );
@@ -1425,10 +1434,17 @@ void DrawingML::WritePresetShape( const char* pShape,
MSO_SPT eShapeType, sal_Bo
sal_Int32 nValue, nLength = aAdjustmentSeq.getLength();
for( sal_Int32 i=0; i < nLength; i++ )
if( EscherPropertyContainer::GetAdjustmentValue( aAdjustmentSeq[ i
], i, nAdjustmentsWhichNeedsToBeConverted, nValue ) )
+{
+// If the document model doesn't have an adjustment name (e.g.
shape was created from VML), then take it from the predefined list.
+OString aAdjName;
+if (aAdjustmentSeq[i].Name.isEmpty() &&
static_cast(i) < aAdjustments.size())
+aAdjName = aAdjustments[i];
+
mpFS->singleElementNS( XML_a, XML_gd,
- XML_name, aAdjustmentSeq[ i
].Name.getLength() > 0 ? USS(aAdjustmentSeq[ i ].Name) : (nLength > 1 ?
OString( "adj" + OString::number( i + 1 ) ).getStr() : "adj"),
+ XML_name, aAdjustmentSeq[ i
].Name.getLength() > 0 ? USS(aAdjustmentSeq[ i ].Name) : aAdjName.getStr(),
XML_fmla, OString("val " +
OString::number( nValue )).getStr(),
FSEND );
+}
}
mpFS->endElementNS( XML_a, XML_avLst );
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 7e1b91d..1e20734 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2192,6 +2192,9 @@ DECLARE_OOXMLEXPORT_TEST(testFdo73215, "fdo73215.docx")
// 'rect' was 'pictureFrame', which isn't valid.
assertXPath(pXmlDoc,
"/w:document/w:body/w:p[2]/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:inline/a:graphic/a:graphicData/wpg:wgp/wps:wsp[1]/wps:spPr/a:prstGeom",
"prst", "rect");
+// 'adj1' was 'adj', which is not valid for bentConnector3.
+assertXPath(pXmlDoc,
"/w:document/w:body/w:p[2]/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:inline/a:graphic/a:graphicData/wpg:wgp/wps:wsp[9]/wps:spPr/a:prstGeom/a:avLst/a:gd",
+"name", "adj1");
}
DECLARE_OOXMLEXPORT_TEST(testTrackChangesDeletedParagraphMark,
"testTrackChangesDeletedParagraphMark.docx")
commit 65e25963e06c295ae8101f49da2774586d0110d5
Author: Miklos Vajna
Date: Thu Jan 2 18:27:11 2014 +0100
oox: extract adjustment names by type from spec XML
The naming of adjustments is not consistent for drawingML shapes, some
of them have the first parameter as "adj1", some of them have it as
"adj". We already have a script that generates some code based on these
XML files, make it generate a function that returns the naming for each
[Libreoffice-commits] core.git: bin/find-german-comments
bin/find-german-comments |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 05175da8b4c1331e74b9293e3dbce8426df6a7d0 Author: Philipp Riemer Date: Thu Jan 2 18:38:55 2014 +0100 fix error in bin/find-german-comments Change-Id: Ice848243654b1bc8923ba65fe87c61e8087c0d8a diff --git a/bin/find-german-comments b/bin/find-german-comments index 59e4c88..a8a3f2e 100755 --- a/bin/find-german-comments +++ b/bin/find-german-comments @@ -192,7 +192,7 @@ class Parser: elif not self.options.filenames_only: for linenum, s in self.get_comments(path): -if self.is_german(s) and self.options.line_numbers: +if self.is_german(s): print "%s:%s: %s" % (path, linenum, s) else: fnames = set([]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source
chart2/source/inc/PropertyHelper.hxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 0f13f675ed98b32cbd0a0976939334b44b97b439
Author: Kohei Yoshida
Date: Thu Jan 2 12:37:00 2014 -0500
It performs better to use unordered_map than std::map here.
Change-Id: I5b89ac2dfbe348f0bf0b07880ccddc734b6d14ab
diff --git a/chart2/source/inc/PropertyHelper.hxx
b/chart2/source/inc/PropertyHelper.hxx
index 78fb607..be066ca 100644
--- a/chart2/source/inc/PropertyHelper.hxx
+++ b/chart2/source/inc/PropertyHelper.hxx
@@ -28,13 +28,14 @@
#include
#include "charttoolsdllapi.hxx"
+#include
+
namespace chart
{
typedef int tPropertyValueMapKey;
-typedef ::std::map< tPropertyValueMapKey, ::com::sun::star::uno::Any >
-tPropertyValueMap;
+typedef boost::unordered_map
tPropertyValueMap;
namespace PropertyHelper
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/chart-opengl2' - chart2/source
chart2/source/inc/PropertyHelper.hxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 41b43da7316b36f2ca202e36045ffebaae92fced
Author: Kohei Yoshida
Date: Thu Jan 2 12:37:00 2014 -0500
It performs better to use unordered_map than std::map here.
Change-Id: I5b89ac2dfbe348f0bf0b07880ccddc734b6d14ab
diff --git a/chart2/source/inc/PropertyHelper.hxx
b/chart2/source/inc/PropertyHelper.hxx
index 78fb607..be066ca 100644
--- a/chart2/source/inc/PropertyHelper.hxx
+++ b/chart2/source/inc/PropertyHelper.hxx
@@ -28,13 +28,14 @@
#include
#include "charttoolsdllapi.hxx"
+#include
+
namespace chart
{
typedef int tPropertyValueMapKey;
-typedef ::std::map< tPropertyValueMapKey, ::com::sun::star::uno::Any >
-tPropertyValueMap;
+typedef boost::unordered_map
tPropertyValueMap;
namespace PropertyHelper
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - af/bfecb781a7113274e5538475137af59a9d29c1
af/bfecb781a7113274e5538475137af59a9d29c1 |1 + 1 file changed, 1 insertion(+) New commits: commit dca8e053a4e944b879e235b741c7a2283133cc6c Author: Caolán McNamara Date: Thu Jan 2 16:54:08 2014 + Notes added by 'git notes add' diff --git a/af/bfecb781a7113274e5538475137af59a9d29c1 b/af/bfecb781a7113274e5538475137af59a9d29c1 new file mode 100644 index 000..d7cb89f --- /dev/null +++ b/af/bfecb781a7113274e5538475137af59a9d29c1 @@ -0,0 +1 @@ +prefer: 74904ca6b083f16074e1c5b60729890fc972ad42 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 00/fc58089b2c5e7788f9f366312e7b56691e5f9a
00/fc58089b2c5e7788f9f366312e7b56691e5f9a |1 + 1 file changed, 1 insertion(+) New commits: commit 64b4d406287bcbaea513b419552ba8893fc9ab30 Author: Caolán McNamara Date: Thu Jan 2 16:21:56 2014 + Notes added by 'git notes add' diff --git a/00/fc58089b2c5e7788f9f366312e7b56691e5f9a b/00/fc58089b2c5e7788f9f366312e7b56691e5f9a new file mode 100644 index 000..8ebbe55 --- /dev/null +++ b/00/fc58089b2c5e7788f9f366312e7b56691e5f9a @@ -0,0 +1 @@ +ignore: obsolete ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 87/5f8fb79613875296139a6cbdbae265a92d7a32
87/5f8fb79613875296139a6cbdbae265a92d7a32 |1 + 1 file changed, 1 insertion(+) New commits: commit 20dc47eacc52546628f54239fcd3615200eb9778 Author: Caolán McNamara Date: Thu Jan 2 16:19:36 2014 + Notes added by 'git notes add' diff --git a/87/5f8fb79613875296139a6cbdbae265a92d7a32 b/87/5f8fb79613875296139a6cbdbae265a92d7a32 new file mode 100644 index 000..5d29075 --- /dev/null +++ b/87/5f8fb79613875296139a6cbdbae265a92d7a32 @@ -0,0 +1 @@ +merged as: f65568118fc1ac71c22a3084e0a1bdd315a91006 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 4e/347ce072f2d48ab5e96306632cd6b7b2f145b6
4e/347ce072f2d48ab5e96306632cd6b7b2f145b6 |1 + 1 file changed, 1 insertion(+) New commits: commit ea5d30b5ea5892b480863ce40358c2ccc8b0dded Author: Caolán McNamara Date: Thu Jan 2 16:21:17 2014 + Notes added by 'git notes add' diff --git a/4e/347ce072f2d48ab5e96306632cd6b7b2f145b6 b/4e/347ce072f2d48ab5e96306632cd6b7b2f145b6 new file mode 100644 index 000..8ebbe55 --- /dev/null +++ b/4e/347ce072f2d48ab5e96306632cd6b7b2f145b6 @@ -0,0 +1 @@ +ignore: obsolete ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - external/firebird sw/source
external/firebird/ExternalProject_firebird.mk |1 +
sw/source/core/unocore/unoidx.cxx | 19 +++
2 files changed, 20 insertions(+)
New commits:
commit 49e6016d4ecd531d279fb644d129c983e65dc3b8
Author: Caolán McNamara
Date: Thu Jan 2 16:05:42 2014 +
enable firebird --enable-debug
Change-Id: I329edd1356fd36ffd0afd3b4d1d7b0403430d6db
diff --git a/external/firebird/ExternalProject_firebird.mk
b/external/firebird/ExternalProject_firebird.mk
index 97db740..cb3e35d 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -50,6 +50,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
--without-editline \
--disable-superserver \
--with-system-icu --without-fbsample
--without-fbsample-db \
+ $(if $(filter TRUE,$(ENABLE_DEBUG)),--enable-debug) \
$(if $(filter
YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter IOS
ANDROID,$(OS)),--disable-shared,--disable-static) \
&& $(if $(filter WNT,$(OS)),\
commit f65568118fc1ac71c22a3084e0a1bdd315a91006
Author: Steve Yin
Date: Thu Jan 2 10:46:03 2014 +
Resolves: #i119568# The page number of the docx in the TOC is not correct
(cherry picked from commit 875f8fb79613875296139a6cbdbae265a92d7a32)
Conflicts:
sw/source/core/unocore/unoidx.cxx
Change-Id: Ie5c66c8226284413419a5b4c105e9529cf8cadf7
diff --git a/sw/source/core/unocore/unoidx.cxx
b/sw/source/core/unocore/unoidx.cxx
index 6dd8bb9..3ecbe75 100644
--- a/sw/source/core/unocore/unoidx.cxx
+++ b/sw/source/core/unocore/unoidx.cxx
@@ -55,6 +55,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -1230,6 +1231,20 @@ throw (beans::UnknownPropertyException,
lang::WrappedTargetException,
OSL_FAIL("SwXDocumentIndex::removeVetoableChangeListener(): not
implemented");
}
+void lcl_CalcLayout(SwDoc *pDoc)
+{
+SwViewShell *pViewShell = 0;
+SwEditShell* pEditShell = pDoc ? pDoc->GetEditShell(&pViewShell) : 0;
+if (pEditShell)
+{
+pEditShell->CalcLayout();
+}
+else if (pViewShell)
+{
+pViewShell->CalcLayout();
+}
+}
+
// XRefreshable
void SAL_CALL SwXDocumentIndex::refresh() throw (uno::RuntimeException)
{
@@ -1246,6 +1261,10 @@ void SAL_CALL SwXDocumentIndex::refresh() throw
(uno::RuntimeException)
static_cast< ::cppu::OWeakObject*>(this));
}
pTOXBase->Update();
+
+// the insertion of TOC will affect the document layout
+lcl_CalcLayout(m_pImpl->m_pDoc);
+
// page numbers
pTOXBase->UpdatePageNum();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Library_merged.mk
Library_merged.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 4261ccb307e38a96f52e2ed0dd8e7c372bc97556 Author: Bjoern Michaelsen Date: Thu Jan 2 17:07:05 2014 +0100 merged library needs to include eot Change-Id: I96a4b4037055f00e7fed9976ca57a897b4a07226 diff --git a/Library_merged.mk b/Library_merged.mk index 3490a8a..f2df397 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -48,6 +48,7 @@ $(eval $(call gb_Library_use_externals,merged,\ jpeg \ lcms2 \ $(call gb_Helper_optional,LIBATOMIC_OPS,libatomic_ops) \ + libeot \ liblangtag \ libxml2 \ libxslt \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - set_soenv.in solenv/inc stlport/systemstl sw/source
set_soenv.in | 38 +++--
solenv/inc/unx.mk|8 +
solenv/inc/unxmacc.mk| 263 +++
solenv/inc/unxmacci.mk | 37 +
solenv/inc/unxmaccx.mk | 37 +
stlport/systemstl/hash_map |2
stlport/systemstl/hash_set |2
stlport/systemstl/slist |2
sw/source/filter/ww8/ww8par.hxx | 67 -
sw/source/filter/ww8/ww8par3.cxx | 140 +---
10 files changed, 521 insertions(+), 75 deletions(-)
New commits:
commit 4e347ce072f2d48ab5e96306632cd6b7b2f145b6
Author: Herbert Dürr
Date: Thu Jan 2 15:45:55 2014 +
#i122301# add Makefiles for XCode>=4 on Mac
diff --git a/set_soenv.in b/set_soenv.in
index 1e797ad..1df1e80 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -753,29 +753,41 @@ elsif ( $platform =~ m/os2/ )
elsif ( $platform =~ m/darwin/ )
{ print "Setting Mac OS X/Darwin specific values... ";
$BIG_SVX= "TRUE";
- $COM= "GCC";
$COMPATH= '@COMPATH@';
- if ($platform =~ m/^i[3456]86/)
+ print "Darwin platform = " . $platform ." ";
+ if( $CC =~ "gcc" )
{
- print "Setting values for Mac OS X/Darwin on x86... ";
+ print "Setting values for MacOSX/Darwin for Xcode<=3";
+ $COM= "GCC";
$outfile= "MacOSXX86Env.Set";
$CPU= "I";
$CPUNAME= "INTEL";
$OUTPATH= "unxmacxi";
}
- elsif ($platform =~ m/^powerpc/)
+ elsif ($platform =~ m/^i[3456]86/)
{
- print "Setting values for Mac OS X/Darwin on PowerPC... ";
- $outfile= "MacOSXPPCEnv.Set";
- $CPU= "P";
- $CPUNAME= "POWERPC";
- $OUTPATH= "unxmacxp";
+ print "Setting values for MacOSX/Darwin on x86_32... ";
+ $COM= "CLANG";
+ $outfile= "MacOSXX32Env.Set";
+ $CPU= "I";
+ $CPUNAME= "INTEL";
+ $OUTPATH= "unxmacci";
}
- if (@GCCVER@ >= 30401) {
- $CVER = "C341";
- } else {
- $CVER = "C300";
+ elsif ($platform =~ m/^x86_64/)
+ {
+ print "Setting values for MacOSX/Darwin on x86_64... ";
+ $COM= "CLANG";
+ $outfile= "MacOSXX64Env.Set";
+ $CPU= "X";
+ $CPUNAME= "X86_64";
+ $OUTPATH= "unxmaccx";
+ }
+ else
+ {
+ print "\nset_soenv: Unknown MacOSX/Darwin platform: $platform\n";
+ exit 1;
}
+ $CVER = "DUMMY_CVER";
$GUI= "UNX";
$GVER = "VCL";
$INPATH = $OUTPATH.$PROEXT;
diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk
index b1f19b3..5854591 100644
--- a/solenv/inc/unx.mk
+++ b/solenv/inc/unx.mk
@@ -151,6 +151,14 @@
.INCLUDE : unxmacxi.mk
.ENDIF
+.IF "$(COM)$(OS)$(CPU)" == "CLANGMACOSXI"
+.INCLUDE : unxmacci.mk
+.ENDIF
+
+.IF "$(COM)$(OS)$(CPU)" == "CLANGMACOSXX"
+.INCLUDE : unxmaccx.mk
+.ENDIF
+
.IF "$(COM)$(OS)$(CPU)" == "GCCLINUXM"
.INCLUDE : unxlngmips.mk
.ENDIF
diff --git a/solenv/inc/unxmacc.mk b/solenv/inc/unxmacc.mk
new file mode 100644
index 000..8a24466
--- /dev/null
+++ b/solenv/inc/unxmacc.mk
@@ -0,0 +1,263 @@
+#**
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+#http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**
+
+
+
+##
+# Platform MAKEFILE for Mac OS X and Darwin on both PowerPC and Intel
+##
+
+# PROCESSOR_DEFINES and DLLPOSTFIX are defined in the particular platform file
+
+ASM=
+AFLAGS=
+LINKOUTPUT_FILTER=
+
+# Definitions that we may need on the compile line.
+# -D_PTHREADS and -D_REENTRANT are needed for STLport, and must be specified
when
+# compiling STLport sources too, either internally or externally.
+CDEFS+=-DGLIBC=2 -D_PTHREADS -D_RE
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 67/ddd5bd3a66f2b440c651d1d073131a59a57f77
67/ddd5bd3a66f2b440c651d1d073131a59a57f77 |1 + 1 file changed, 1 insertion(+) New commits: commit 737460f6dc43dd372f973f90c57205ec9e9ac7a7 Author: Caolán McNamara Date: Thu Jan 2 15:52:25 2014 + Notes added by 'git notes add' diff --git a/67/ddd5bd3a66f2b440c651d1d073131a59a57f77 b/67/ddd5bd3a66f2b440c651d1d073131a59a57f77 new file mode 100644 index 000..472d042 --- /dev/null +++ b/67/ddd5bd3a66f2b440c651d1d073131a59a57f77 @@ -0,0 +1 @@ +prefer: 5249a2022aa7152cba5bb6541eade43b9e77b755 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - e3/a84634fd6a033b838485346c274552d5bd8d8c
e3/a84634fd6a033b838485346c274552d5bd8d8c |1 + 1 file changed, 1 insertion(+) New commits: commit 96f5eb5b5015622038bf81fe89d7743f2df64ffd Author: Caolán McNamara Date: Thu Jan 2 15:50:50 2014 + Notes added by 'git notes add' diff --git a/e3/a84634fd6a033b838485346c274552d5bd8d8c b/e3/a84634fd6a033b838485346c274552d5bd8d8c new file mode 100644 index 000..ca0a5f3 --- /dev/null +++ b/e3/a84634fd6a033b838485346c274552d5bd8d8c @@ -0,0 +1 @@ +merged as: 0ade1e4e60be7f6a644b92a138a79552cd6f0c62 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0ade1e4e60be7f6a644b92a138a79552cd6f0c62 Author: Steve Yin Date: Thu Jan 2 10:17:34 2014 + Resolves: #i119577# "file name" field change to "file name without extension" (cherry picked from commit e3a84634fd6a033b838485346c274552d5bd8d8c) Conflicts: writerfilter/source/dmapper/DomainMapper_Impl.cxx Change-Id: I07e4a85aae7b5c5be398de471739c5e6d57d2ff2 diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index e10ba5b..0e166c8 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -3097,7 +3097,7 @@ void DomainMapper_Impl::CloseFieldCommand() if (xFieldProperties.is()) xFieldProperties->setPropertyValue( rPropNameSupplier.GetName(PROP_FILE_FORMAT), -uno::makeAny( nNumberingTypeIndex > 0 ? text::FilenameDisplayFormat::FULL : text::FilenameDisplayFormat::NAME )); +uno::makeAny( nNumberingTypeIndex > 0 ? text::FilenameDisplayFormat::FULL : text::FilenameDisplayFormat::NAME_AND_EXT )); } break; case FIELD_FILESIZE : break; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source sd/source svx/source sw/source vcl/source
cui/source/tabpages/align.cxx |2 +-
cui/source/tabpages/border.cxx |4 ++--
sd/source/ui/sidebar/LayoutMenu.cxx|2 +-
svx/source/stbctrls/modctrl.cxx|2 +-
svx/source/stbctrls/pszctrl.cxx|4 ++--
svx/source/stbctrls/selctrl.cxx|2 +-
svx/source/stbctrls/xmlsecctrl.cxx |2 +-
svx/source/stbctrls/zoomsliderctrl.cxx |2 +-
sw/source/ui/utlui/viewlayoutctrl.cxx |2 +-
vcl/source/window/toolbox2.cxx |2 +-
10 files changed, 12 insertions(+), 12 deletions(-)
New commits:
commit ab56275f4622ade0286a580a5945600567c6b415
Author: Keith Curtis
Date: Thu Jan 2 16:36:51 2014 +0100
hidpi: Really use BMP_SCALE_FAST when scaling the images.
It is not a problem of performance, but of the look - the images get too
blurry in the case of icons; and the blurry look is worse than than the
artifacts of the fast scaling.
Revert "hidpi: Use the default scaling algorithm."
This reverts commit e07097cce36f1220f5574a80dc22eeabb3005261.
Change-Id: I8af2827758e02ec3c8b7dade1559c45bd9f0ef35
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index 2418ff5..5ba830a 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -329,7 +329,7 @@ void AlignmentTabPage::InitVsRefEgde()
{
OUString rImageName = aImageList.GetImageName(i);
BitmapEx b = aImageList.GetImage(rImageName).GetBitmapEx();
-b.Scale(GetDPIScaleFactor(), GetDPIScaleFactor());
+b.Scale(GetDPIScaleFactor(), GetDPIScaleFactor(), BMP_SCALE_FAST);
aImageList.ReplaceImage(rImageName, Image(b));
}
}
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 31bb802..0073a9e 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -134,7 +134,7 @@ SvxBorderTabPage::SvxBorderTabPage(Window* pParent, const
SfxItemSet& rCoreAttrs
{
OUString rImageName = aBorderImgLst.GetImageName(i);
BitmapEx b = aBorderImgLst.GetImage(rImageName).GetBitmapEx();
-b.Scale(GetDPIScaleFactor(), GetDPIScaleFactor());
+b.Scale(GetDPIScaleFactor(), GetDPIScaleFactor(), BMP_SCALE_FAST);
aBorderImgLst.ReplaceImage(rImageName, Image(b));
}
@@ -142,7 +142,7 @@ SvxBorderTabPage::SvxBorderTabPage(Window* pParent, const
SfxItemSet& rCoreAttrs
{
OUString rImageName = aShadowImgLst.GetImageName(i);
BitmapEx b = aShadowImgLst.GetImage(rImageName).GetBitmapEx();
-b.Scale(GetDPIScaleFactor(), GetDPIScaleFactor());
+b.Scale(GetDPIScaleFactor(), GetDPIScaleFactor(), BMP_SCALE_FAST);
aShadowImgLst.ReplaceImage(rImageName, Image(b));
}
}
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx
b/sd/source/ui/sidebar/LayoutMenu.cxx
index 55a9157..5abb05c 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -651,7 +651,7 @@ void LayoutMenu::Fill (void)
BitmapEx aBmp(SdResId(pInfo->mnBmpResId));
if (GetDPIScaleFactor() > 1)
-aBmp.Scale(GetDPIScaleFactor(), GetDPIScaleFactor());
+aBmp.Scale(GetDPIScaleFactor(), GetDPIScaleFactor(),
BMP_SCALE_FAST);
if (bRightToLeft && (WritingMode_TB_RL != pInfo->meWritingMode))
aBmp.Mirror (BMP_MIRROR_HORZ);
diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx
index 5689079..db94f49 100644
--- a/svx/source/stbctrls/modctrl.cxx
+++ b/svx/source/stbctrls/modctrl.cxx
@@ -78,7 +78,7 @@ SvxModifyControl::SvxModifyControl( sal_uInt16 _nSlotId,
sal_uInt16 _nId, Status
for (int i = 0; i < mpImpl->MODIFICATION_STATE_SIZE; i++)
{
BitmapEx b = mpImpl->maImages[i].GetBitmapEx();
-b.Scale(rStb.GetDPIScaleFactor(), rStb.GetDPIScaleFactor());
+b.Scale(rStb.GetDPIScaleFactor(), rStb.GetDPIScaleFactor(),
BMP_SCALE_FAST);
mpImpl->maImages[i] = Image(b);
}
}
diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx
index bc2caa0..733b8e7 100644
--- a/svx/source/stbctrls/pszctrl.cxx
+++ b/svx/source/stbctrls/pszctrl.cxx
@@ -180,11 +180,11 @@ SvxPosSizeStatusBarControl::SvxPosSizeStatusBarControl(
sal_uInt16 _nSlotId,
if ( rStb.GetDPIScaleFactor() > 1)
{
BitmapEx b = pImp->aPosImage.GetBitmapEx();
-b.Scale(rStb.GetDPIScaleFactor(), rStb.GetDPIScaleFactor());
+b.Scale(rStb.GetDPIScaleFactor(), rStb.GetDPIScaleFactor(),
BMP_SCALE_FAST);
pImp->aPosImage = Image(b);
b = pImp->aSizeImage.GetBitmapEx();
-b.Scale(rStb.GetDPIScaleFactor(), rStb.GetDPIScaleFactor());
+b.Scale(rStb.GetDPIScaleFactor(), rStb.GetDPIScaleFactor(),
BMP_SCALE_FAST);
pImp->aSizeImage = Image(b);
}
diff --gi
[Libreoffice-commits] core.git: Branch 'feature/chart-opengl2' - chart2/source
chart2/source/view/main/OpenGLRender.cxx | 53 +--
1 file changed, 36 insertions(+), 17 deletions(-)
New commits:
commit 805d2a4cde2ff16c396b6dbe4712c4760a081cdb
Author: Michael Meeks
Date: Thu Jan 2 15:41:52 2014 +
get better fragment / shader error logging.
Change-Id: I49c344b9a94cd4d60bb2dc0667d88387b5474b6b
diff --git a/chart2/source/view/main/OpenGLRender.cxx
b/chart2/source/view/main/OpenGLRender.cxx
index 2090e03..7d4717e 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -283,11 +283,18 @@ GLint OpenGLRender::LoadShaders(const char
*vertexShader,const char *fragmentSha
// Check Vertex Shader
glGetShaderiv(VertexShaderID, GL_COMPILE_STATUS, &Result);
-glGetShaderiv(VertexShaderID, GL_INFO_LOG_LENGTH, &InfoLogLength);
-if ( InfoLogLength > 0 ){
-std::vector VertexShaderErrorMessage(InfoLogLength+1);
-glGetShaderInfoLog(VertexShaderID, InfoLogLength, NULL,
&VertexShaderErrorMessage[0]);
-cout << "vertex shader compile fail : " << VertexShaderErrorMessage[0]
<< endl;
+if ( !Result )
+{
+glGetShaderiv(VertexShaderID, GL_INFO_LOG_LENGTH, &InfoLogLength);
+if ( InfoLogLength > 0 )
+{
+std::vector VertexShaderErrorMessage(InfoLogLength+1);
+glGetShaderInfoLog(VertexShaderID, InfoLogLength, NULL,
&VertexShaderErrorMessage[0]);
+VertexShaderErrorMessage.push_back('\0');
+cout << "vertex shader compile fail : " <<
&VertexShaderErrorMessage[0] << endl;
+}
+else
+cout << "vertex shader compile failed without error log" << endl;
}
@@ -299,15 +306,20 @@ GLint OpenGLRender::LoadShaders(const char
*vertexShader,const char *fragmentSha
// Check Fragment Shader
glGetShaderiv(FragmentShaderID, GL_COMPILE_STATUS, &Result);
-glGetShaderiv(FragmentShaderID, GL_INFO_LOG_LENGTH, &InfoLogLength);
-if ( InfoLogLength > 0 ){
-std::vector FragmentShaderErrorMessage(InfoLogLength+1);
-glGetShaderInfoLog(FragmentShaderID, InfoLogLength, NULL,
&FragmentShaderErrorMessage[0]);
-cout << "fragment shader compile fail : " <<
FragmentShaderErrorMessage[0] << endl;
+if ( !Result )
+{
+glGetShaderiv(FragmentShaderID, GL_INFO_LOG_LENGTH, &InfoLogLength);
+if ( InfoLogLength > 0 )
+{
+std::vector FragmentShaderErrorMessage(InfoLogLength+1);
+glGetShaderInfoLog(FragmentShaderID, InfoLogLength, NULL,
&FragmentShaderErrorMessage[0]);
+FragmentShaderErrorMessage.push_back('\0');
+cout << "fragment shader compile fail : " <<
&FragmentShaderErrorMessage[0] << endl;
+}
+else
+cout << "fragment shader compile failed without error log" << endl;
}
-
-
// Link the program
GLint ProgramID = glCreateProgram();
glAttachShader(ProgramID, VertexShaderID);
@@ -316,11 +328,18 @@ GLint OpenGLRender::LoadShaders(const char
*vertexShader,const char *fragmentSha
// Check the program
glGetProgramiv(ProgramID, GL_LINK_STATUS, &Result);
-glGetProgramiv(ProgramID, GL_INFO_LOG_LENGTH, &InfoLogLength);
-if ( InfoLogLength > 0 ){
-std::vector ProgramErrorMessage(InfoLogLength+1);
-glGetProgramInfoLog(ProgramID, InfoLogLength, NULL,
&ProgramErrorMessage[0]);
-cout << "Shader Program fail : " << ProgramErrorMessage[0] << endl;
+if ( !Result )
+{
+glGetProgramiv(ProgramID, GL_INFO_LOG_LENGTH, &InfoLogLength);
+if ( InfoLogLength > 0 )
+{
+std::vector ProgramErrorMessage(InfoLogLength+1);
+glGetProgramInfoLog(ProgramID, InfoLogLength, NULL,
&ProgramErrorMessage[0]);
+ProgramErrorMessage.push_back('\0');
+cout << "Shader Program fail : " << &ProgramErrorMessage[0] <<
endl;
+}
+else
+cout << "shader program link failed without error log" << endl;
}
glDeleteShader(VertexShaderID);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source sw/qa
filter/source/msfilter/util.cxx |1 -
sw/qa/extras/ooxmlexport/data/fdo73215.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx| 11 +++
3 files changed, 11 insertions(+), 1 deletion(-)
New commits:
commit 096ea63090b137ac52cb75bf4b53dcef31962d44
Author: Miklos Vajna
Date: Thu Jan 2 15:44:11 2014 +0100
fdo#73215 filter: don't try to handle pictureFrame in
GetOOXMLPresetGeometry()
"pictureFrame" is not a valid drawingML shape type, VML export used to
write just "rect", by removing an explicit entry for
ESCHER_ShpInst_PictureFrame we now do the same.
Change-Id: I57683b7f5f80bfef8c3b6fb9ae9f33e4599a7eb2
diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx
index bf5648d..efe8cd1 100644
--- a/filter/source/msfilter/util.cxx
+++ b/filter/source/msfilter/util.cxx
@@ -772,7 +772,6 @@ static const CustomShapeTypeTranslationTable
pCustomShapeTypeTranslationTable[]
{ "bang", "irregularSeal2" },
{ "lightning", "lightningBolt" },
{ "heart", "heart" },
-{ "mso-spt75", "pictureFrame" },
{ "quad-arrow", "quadArrow" },
{ "left-arrow-callout", "leftArrowCallout" },
{ "right-arrow-callout", "rightArrowCallout" },
diff --git a/sw/qa/extras/ooxmlexport/data/fdo73215.docx
b/sw/qa/extras/ooxmlexport/data/fdo73215.docx
new file mode 100644
index 000..9b2c05b
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo73215.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 54042d4..7e1b91d 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -136,6 +136,7 @@ xmlNodeSetPtr Test::getXPathNode(xmlDocPtr pXmlDoc, const
OString& rXPath)
xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("v"),
BAD_CAST("urn:schemas-microsoft-com:vml"));
xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("mc"),
BAD_CAST("http://schemas.openxmlformats.org/markup-compatibility/2006";));
xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("wps"),
BAD_CAST("http://schemas.microsoft.com/office/word/2010/wordprocessingShape";));
+xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("wpg"),
BAD_CAST("http://schemas.microsoft.com/office/word/2010/wordprocessingGroup";));
xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("wp"),
BAD_CAST("http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing";));
xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("a"),
BAD_CAST("http://schemas.openxmlformats.org/drawingml/2006/main";));
xmlXPathObjectPtr pXmlXpathObj =
xmlXPathEvalExpression(BAD_CAST(rXPath.getStr()), pXmlXpathCtx);
@@ -2183,6 +2184,16 @@ DECLARE_OOXMLEXPORT_TEST(testBezier, "bezier.odt")
CPPUNIT_ASSERT_EQUAL(sal_Int32(3), xDraws->getCount());
}
+DECLARE_OOXMLEXPORT_TEST(testFdo73215, "fdo73215.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+if (!pXmlDoc)
+return;
+// 'rect' was 'pictureFrame', which isn't valid.
+assertXPath(pXmlDoc,
"/w:document/w:body/w:p[2]/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:inline/a:graphic/a:graphicData/wpg:wgp/wps:wsp[1]/wps:spPr/a:prstGeom",
+"prst", "rect");
+}
+
DECLARE_OOXMLEXPORT_TEST(testTrackChangesDeletedParagraphMark,
"testTrackChangesDeletedParagraphMark.docx")
{
xmlDocPtr pXmlDoc = parseExport("word/document.xml");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sysui/desktop
sysui/desktop/menus/math.desktop |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit dad7fe7227fb80a32d3c2c777584dc9d74b9e929
Author: Tomáš Chvátal
Date: Thu Jan 2 16:16:55 2014 +0100
Fix math categories to make SUSE rpm check happy
Change-Id: I6c6973be0eacd323838b137f2c1e27ed1d9fdbd3
diff --git a/sysui/desktop/menus/math.desktop b/sysui/desktop/menus/math.desktop
index 4822166..57b1734 100755
--- a/sysui/desktop/menus/math.desktop
+++ b/sysui/desktop/menus/math.desktop
@@ -21,7 +21,7 @@ Terminal=false
NoDisplay=false
Icon=math
Type=Application
-Categories=Office;Education;Science;Math;X-Red-Hat-Base;X-MandrivaLinux-Office-Other;
+Categories=Office;Spreadsheet;Education;Science;Math;X-Red-Hat-Base;X-MandrivaLinux-Office-Other;
Exec=${UNIXBASISROOTNAME} --math %%FILE%%
MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math;application/vnd.oasis.opendocument.formula-template;text/mathml;application/mathml+xml;
Name=%PRODUCTNAME Math
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/chart-opengl2' - chart2/source
chart2/source/view/main/AbstractShapeFactory.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit fa1e5bf5473d7b98e6dfba1d52a248ef8eab06f9
Author: Michael Meeks
Date: Thu Jan 2 15:09:01 2014 +
Disable OpenGL for headless mode (so unit tests pass on Linux).
Change-Id: Ie4e1a59ce68932084d4635cd0f8d11cbffd6a3a2
diff --git a/chart2/source/view/main/AbstractShapeFactory.cxx
b/chart2/source/view/main/AbstractShapeFactory.cxx
index d6d6b2e..3369597 100644
--- a/chart2/source/view/main/AbstractShapeFactory.cxx
+++ b/chart2/source/view/main/AbstractShapeFactory.cxx
@@ -33,6 +33,7 @@
#include
#include
#include
+#include
#include
#include
@@ -78,7 +79,7 @@ AbstractShapeFactory*
AbstractShapeFactory::getOrCreateShapeFactory(uno::Referen
if(pShapeFactory)
return pShapeFactory;
-if(getenv("CHART_DUMMY_FACTORY"))
+if(getenv("CHART_DUMMY_FACTORY") && !Application::IsHeadlessModeEnabled())
{
osl::Module* pModule = getOpenGLModule();
if(pModule)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: OpenDocument text (Flat XML) .fodt
Thank you, but not solve, the lines continue large. But, this is not a bug, is just a good feature. As I said before, break lines in smaller columns will improve the versioning results when you work in a collaborative way. On 01/02/2014 10:50 AM, Eike Rathke wrote: > Unchecking the "Size optimization for ODF format" option under > Tools->Options->Load/Save->General should do that. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: android/sdremote
android/sdremote/res/layout/action_bar_computer_creation.xml |
4 -
android/sdremote/res/layout/activity_requirements.xml |
6 -
android/sdremote/res/layout/fragment_slides_pager.xml |
2
android/sdremote/src/org/libreoffice/impressremote/view/CapsTextView.java |
34 --
4 files changed, 6 insertions(+), 40 deletions(-)
New commits:
commit 4f8a7cc2f38a9748f566c9255ce94cb5e6a284fa
Author: Christian Lohmaier
Date: Mon Dec 2 22:56:42 2013 +0100
get rid of custom all-caps ui widget
as there is a corresponding property available since Api Level 14 that
is already used in the corresponding stlye definition.
Not a problem if older versions of android ignore that and don't show
the string in caps.
Change-Id: Ia9d5e32242bfc83370524011d11854f2c08348ba
diff --git a/android/sdremote/res/layout/action_bar_computer_creation.xml
b/android/sdremote/res/layout/action_bar_computer_creation.xml
index 2e31abb..1a0dcd3 100644
--- a/android/sdremote/res/layout/action_bar_computer_creation.xml
+++ b/android/sdremote/res/layout/action_bar_computer_creation.xml
@@ -28,7 +28,7 @@
android:layout_width="0dp"
android:layout_height="match_parent">
-
-
-
@@ -38,7 +38,7 @@
style="@style/SectionItem"
android:text="@string/requirements_libreoffice_general_enabled"/>
-
@@ -54,7 +54,7 @@
style="@style/SectionItem"
android:text="@string/requirements_network_ports"/>
-
diff --git a/android/sdremote/res/layout/fragment_slides_pager.xml
b/android/sdremote/res/layout/fragment_slides_pager.xml
index 97c5c72..3a9ebb6 100644
--- a/android/sdremote/res/layout/fragment_slides_pager.xml
+++ b/android/sdremote/res/layout/fragment_slides_pager.xml
@@ -39,7 +39,7 @@
android:layout_width="match_parent"
android:layout_height="0dp">
-
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/view/CapsTextView.java
b/android/sdremote/src/org/libreoffice/impressremote/view/CapsTextView.java
deleted file mode 100644
index 84b632f..000
--- a/android/sdremote/src/org/libreoffice/impressremote/view/CapsTextView.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- Mode: Java; 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/.
- */
-package org.libreoffice.impressremote.view;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.widget.TextView;
-
-public class CapsTextView extends TextView {
-public CapsTextView(Context aContext) {
-super(aContext);
-}
-
-public CapsTextView(Context aContext, AttributeSet aAttributeSet) {
-super(aContext, aAttributeSet);
-}
-
-public CapsTextView(Context aContext, AttributeSet aAttributeSet, int
aDefinedStyle) {
-super(aContext, aAttributeSet, aDefinedStyle);
-}
-
-@Override
-public void setText(CharSequence aText, BufferType aBufferType) {
-super.setText(aText.toString().toUpperCase(), aBufferType);
-}
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/sdremote
android/sdremote/res/layout-land/fragment_slides_pager.xml | 65 +++-- 1 file changed, 57 insertions(+), 8 deletions(-) New commits: commit 0d0b4a911c2ded7cc2cd64664a1994d0824482db Author: Christian Lohmaier Date: Mon Dec 2 00:48:08 2013 +0100 sdremote: show notes also in landscape orientation since why should portrait and landscape behave differently? Change-Id: I06ca350bc14ca0f9163d58927636d70a9630f3f9 diff --git a/android/sdremote/res/layout-land/fragment_slides_pager.xml b/android/sdremote/res/layout-land/fragment_slides_pager.xml index ea70c82..22f6000 100644 --- a/android/sdremote/res/layout-land/fragment_slides_pager.xml +++ b/android/sdremote/res/layout-land/fragment_slides_pager.xml @@ -16,11 +16,60 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -http://schemas.android.com/apk/res/android"; -android:id="@+id/pager_slides" -android:layout_gravity="center" -android:paddingTop="@dimen/padding_slides_pager" -android:paddingBottom="@dimen/padding_slides_pager" -android:layout_width="wrap_content" -android:layout_height="wrap_content"/> \ No newline at end of file +http://schemas.android.com/apk/res/android"; + android:orientation="horizontal" + android:gravity="center" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + + + + + + + + + + + + + + + + + + + + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/experimental ios/CustomTarget_MobileLibreOffice_app.mk ios/CustomTarget_TiledLibreOffice_app.mk ios/Executable_LibreOffice.mk solenv/bin
android/experimental/DocumentLoader/Makefile |3 --
android/experimental/LibreOffice4Android/Makefile |4 +--
ios/CustomTarget_MobileLibreOffice_app.mk |1
ios/CustomTarget_TiledLibreOffice_app.mk |1
ios/Executable_LibreOffice.mk |1
solenv/bin/native-code.py | 29 +-
6 files changed, 5 insertions(+), 34 deletions(-)
New commits:
commit 4be366de5833c284f21393e99fb7b11199f4b0ff
Author: Matúš Kukan
Date: Thu Jan 2 13:26:31 2014 +0100
native code generator: Do not use single_component_map anymore.
Put cui and spl into extended_code and ignore the rest.
Also change DocumentLoader and LibreOffice4Android to use only
extended_core and writer as all the ios apps do, without knowing what is
really needed there.
Change-Id: Ic6a256ea47cc96132c0e7658d6ef2838b295ca71
diff --git a/android/experimental/DocumentLoader/Makefile
b/android/experimental/DocumentLoader/Makefile
index 092292d..74c497a 100644
--- a/android/experimental/DocumentLoader/Makefile
+++ b/android/experimental/DocumentLoader/Makefile
@@ -13,8 +13,7 @@ include $(BOOTSTRAPDIR)/Makefile.shared
native-code.cxx: $(SRCDIR)/solenv/bin/native-code.py
$< \
- -g extended_core -g base_core -g calc_core -g draw_core -g math
-g writer \
- -s protocolhandler -s sb \
+ -g extended_core -g writer \
> $@
copy-stuff:
diff --git a/android/experimental/LibreOffice4Android/Makefile
b/android/experimental/LibreOffice4Android/Makefile
index 4eadb65..33a7e55 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/android/experimental/LibreOffice4Android/Makefile
@@ -13,8 +13,8 @@ BOOTSTRAPDIR=../../Bootstrap
include $(BOOTSTRAPDIR)/Makefile.shared
native-code.cxx: $(SRCDIR)/solenv/bin/native-code.py
- $< -g extended_core -g base_core -g calc_core -g draw_core -g math -g
writer \
- -s dlgprov -s protocolhandler -s scriptframe -s sb -s
stringresource -s vbaswobj -s vbaevents \
+ $< \
+ -g extended_core -g writer \
> $@
copy-stuff:
diff --git a/ios/CustomTarget_MobileLibreOffice_app.mk
b/ios/CustomTarget_MobileLibreOffice_app.mk
index cb25385..ec59df0 100644
--- a/ios/CustomTarget_MobileLibreOffice_app.mk
+++ b/ios/CustomTarget_MobileLibreOffice_app.mk
@@ -35,7 +35,6 @@ $(call gb_CustomTarget_get_target,ios/MobileLibreOffice):
$(call gb_CustomTarget
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),APP,2)
$(SRCDIR)/solenv/bin/native-code.py \
-g extended_core -g writer \
- -s cui -s spl \
> $(SRCDIR)/ios/shared/ios_sharedlo/cxx/native-code.mm
$(call MobileLibreOfficeXcodeBuild, clean build)
diff --git a/ios/CustomTarget_TiledLibreOffice_app.mk
b/ios/CustomTarget_TiledLibreOffice_app.mk
index 5097f0d..95e7fbd 100644
--- a/ios/CustomTarget_TiledLibreOffice_app.mk
+++ b/ios/CustomTarget_TiledLibreOffice_app.mk
@@ -30,7 +30,6 @@ $(call gb_CustomTarget_get_target,ios/TiledLibreOffice):
$(call gb_CustomTarget_
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),APP,2)
$(SRCDIR)/solenv/bin/native-code.py \
-g extended_core -g writer \
- -s cui -s spl \
>
$(SRCDIR)/ios/experimental/TiledLibreOffice/TiledLibreOffice/native-code.mm
$(call TiledLibreOfficeXcodeBuild, clean build)
diff --git a/ios/Executable_LibreOffice.mk b/ios/Executable_LibreOffice.mk
index f35b9cb..ccf69c7 100644
--- a/ios/Executable_LibreOffice.mk
+++ b/ios/Executable_LibreOffice.mk
@@ -29,7 +29,6 @@ $(call
gb_CustomTarget_get_workdir,ios/LibreOffice)/native-code.cxx :
mkdir -p `dirname $@`
$(SRCDIR)/solenv/bin/native-code.py \
-g extended_core -g writer \
- -s cui -s spl \
> $@
$(eval $(call gb_Executable_add_objcxxobjects,LibreOffice,\
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 065772e..ba8ebc2 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -64,10 +64,12 @@ extended_core_factory_list = core_factory_list + [
("libanimcorelo.a", "animcore_component_getFactory"),
("libavmedialo.a", "avmedia_component_getFactory"),
("libchartcorelo.a", "chartcore_component_getFactory"),
+("libcuilo.a", "cui_component_getFactory"),
("libfilterconfiglo.a", "filterconfig1_component_getFactory"),
("libfrmlo.a", "frm_component_getFactory"),
("libfwklo.a", "fwk_component_getFactory"),
("libfwmlo.a", "fwm_component_getFactory"),
+("libspllo.a", "spl_component_getFactory"),
("libsvxcorelo.a", "svxcore_component_getFactory"),
("libtextfdlo.a", "textfd_component_getFactory"),
("libtklo.a", "tk_component_getFactory"),
@@ -138,26 +140,9 @@ core_constructor_list = [
"com_sun_star_drawing_EnhancedCus
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 6d/fbd90ac73473c73b0d87e253f16c78d09d3608
6d/fbd90ac73473c73b0d87e253f16c78d09d3608 |1 + 1 file changed, 1 insertion(+) New commits: commit 5eee9bb71cbec16e902b1275e1d29733e67472a6 Author: Caolán McNamara Date: Thu Jan 2 13:24:30 2014 + Notes added by 'git notes add' diff --git a/6d/fbd90ac73473c73b0d87e253f16c78d09d3608 b/6d/fbd90ac73473c73b0d87e253f16c78d09d3608 new file mode 100644 index 000..c84152b --- /dev/null +++ b/6d/fbd90ac73473c73b0d87e253f16c78d09d3608 @@ -0,0 +1 @@ +prefer: f8ff39976f1b72e84ffdff40e41c63d9edcfd332 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basctl/source include/vcl vcl/source
basctl/source/basicide/moduldl2.cxx | 32 +++-
include/vcl/layout.hxx |7 +--
vcl/source/window/layout.cxx| 19 ++-
3 files changed, 38 insertions(+), 20 deletions(-)
New commits:
commit 257d1f4ff3094a42952663d620d7c49e3e7c747f
Author: Caolán McNamara
Date: Wed Jan 1 20:22:00 2014 +
allow simple MessageDialogs to be created from just message strings
Change-Id: I9f8324d1c61bd55ccc78e67699ebdfa946e48af6
diff --git a/basctl/source/basicide/moduldl2.cxx
b/basctl/source/basicide/moduldl2.cxx
index 1f8fc70..9a4c1a1 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include
+#include
#include
#include
@@ -291,7 +291,7 @@ sal_Bool CheckBox::EditingEntry( SvTreeListEntry* pEntry,
Selection& )
OUString aLibName = GetEntryText( pEntry, 0 );
if ( aLibName.equalsIgnoreAsciiCase( "Standard" ) )
{
-ErrorBox( this, WB_OK | WB_DEF_OK,
IDE_RESSTR(RID_STR_CANNOTCHANGENAMESTDLIB) ).Execute();
+MessageDialog(this,
IDE_RESSTR(RID_STR_CANNOTCHANGENAMESTDLIB)).Execute();
return false;
}
@@ -301,7 +301,7 @@ sal_Bool CheckBox::EditingEntry( SvTreeListEntry* pEntry,
Selection& )
if ( ( xModLibContainer.is() && xModLibContainer->hasByName( aLibName ) &&
xModLibContainer->isLibraryReadOnly( aLibName ) &&
!xModLibContainer->isLibraryLink( aLibName ) ) ||
( xDlgLibContainer.is() && xDlgLibContainer->hasByName( aLibName ) &&
xDlgLibContainer->isLibraryReadOnly( aLibName ) &&
!xDlgLibContainer->isLibraryLink( aLibName ) ) )
{
-ErrorBox( this, WB_OK | WB_DEF_OK, IDE_RESSTR(RID_STR_LIBISREADONLY)
).Execute();
+MessageDialog(this, IDE_RESSTR(RID_STR_LIBISREADONLY)).Execute();
return false;
}
@@ -353,7 +353,7 @@ sal_Bool CheckBox::EditedEntry( SvTreeListEntry* pEntry,
const OUString& rNewNam
}
catch (const container::ElementExistException& )
{
-ErrorBox( this, WB_OK | WB_DEF_OK,
IDE_RESSTR(RID_STR_SBXNAMEALLREADYUSED) ).Execute();
+MessageDialog(this,
IDE_RESSTR(RID_STR_SBXNAMEALLREADYUSED)).Execute();
return false;
}
catch (const container::NoSuchElementException& )
@@ -366,9 +366,9 @@ sal_Bool CheckBox::EditedEntry( SvTreeListEntry* pEntry,
const OUString& rNewNam
if ( !bValid )
{
if ( rNewName.getLength() > 30 )
-ErrorBox( this, WB_OK | WB_DEF_OK,
IDE_RESSTR(RID_STR_LIBNAMETOLONG) ).Execute();
+MessageDialog(this, IDE_RESSTR(RID_STR_LIBNAMETOLONG)).Execute();
else
-ErrorBox( this, WB_OK | WB_DEF_OK, IDE_RESSTR(RID_STR_BADSBXNAME)
).Execute();
+MessageDialog(this, IDE_RESSTR(RID_STR_BADSBXNAME)).Execute();
}
return bValid;
@@ -384,7 +384,7 @@ IMPL_LINK_NOARG(NewObjectDialog, OkButtonHandler)
EndDialog(1);
else
{
-ErrorBox( this, WB_OK | WB_DEF_OK, IDE_RESSTR(RID_STR_BADSBXNAME)
).Execute();
+MessageDialog(this, IDE_RESSTR(RID_STR_BADSBXNAME)).Execute();
m_pEdit->GrabFocus();
}
return 0;
@@ -860,7 +860,7 @@ void LibPage::InsertLib()
}
if ( !pLibDlg )
-InfoBox( this, IDE_RESSTR(RID_STR_NOLIBINSTORAGE) ).Execute();
+MessageDialog(this, IDE_RESSTR(RID_STR_NOLIBINSTORAGE),
VCL_MESSAGE_INFO).Execute();
else
{
bool bChanges = false;
@@ -897,7 +897,7 @@ void LibPage::InsertLib()
// check, if the library is the Standard
library
if ( aLibName == "Standard" )
{
-ErrorBox( this, WB_OK | WB_DEF_OK,
IDE_RESSTR(RID_STR_REPLACESTDLIB) ).Execute();
+MessageDialog(this,
IDE_RESSTR(RID_STR_REPLACESTDLIB)).Execute();
continue;
}
@@ -909,7 +909,7 @@ void LibPage::InsertLib()
aErrStr = aErrStr.replaceAll("XX",
aLibName);
aErrStr += "\n";
aErrStr +=
IDE_RESSTR(RID_STR_LIBISREADONLY);
-ErrorBox( this, WB_OK | WB_DEF_OK,
aErrStr ).Execute();
+MessageDialog(this, aErrStr).Execute();
continue;
}
@@ -926,7 +926,7 @@ void LibPage::InsertLib()
aErrStr = aErrStr.replaceAll("XX",
aLibName);
aErrStr += "\n" ;
aErrStr +=
IDE_RESSTR(RID_STR_
Re: OpenDocument text (Flat XML) .fodt
Hi John, On Friday, 2013-12-27 13:00:51 -0200, John Robson wrote: > I would like to suggest just to break lines more often. Some lines has > more than 5000 columns!!! Unchecking the "Size optimization for ODF format" option under Tools->Options->Load/Save->General should do that. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgp9wfhJzL0nt.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
About pt_BR dictionary update
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hi people, I send an update of the pt_BR dictionary to gerrit, and it needs to be back ported to version 4.2. Thanks since now! -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.22 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBAgAGBQJSxV7FAAoJEIqCNZtY966qlGUH/2GHMdAwYpZZ52BpGYXk1OVV RTLlLjHpk48ffBnaTHRWuwHCrHw+Kg7XTLnCu0WpfIitSvIJ9Uwwhlx9C13Q6lBU eQTFc2ql5ZdhYIYRgJWRlu+KBgIrcuS+mOVKIfOjjT+G8j+Vx4geWJe4SxCB+7nq uHFoCBDNWR/BoORvcnrOPzOuB5tAd5pf5oNEBE+9uZVqfJ0unvyU3HtMpIwuW8Xc as/clFyYCwGSw/wq3dRnD0Anfy9V4/RZbKaKrVhDbmzZeD5Nia0jKN/kxNu02p7s RiSxAU+QRerosVzW+DplNUdm9psPgw9GBHfnuAxgW1ThQjcLQwkVZvnpyBWgqIw= =HH77 -END PGP SIGNATURE- ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: LibreOffice most popular spam posts
Hi, On Sunday, 2013-12-22 14:35:28 +0100, Kevin André wrote: > He seems to post pseudo helpful text, combined with links to spam > posts to remove. Of course his objective is not to get those removed, > but to get them higher in search results by posting links to them. The reason might actually be the opposite.. http://gcc.gnu.org/ml/gcc/2013-12/msg00231.html | Some background on the below: Google has recently changed its | algorithms, and the presence of obvious spam mails pointing to a site | now *lower* that site's Google rank. So the same "search engine | optimization" people who created the spams for pay in the first place | are now frantically trying to get the spams removed, to keep their | clients from suing them. I think gcc is best served by just leaving the | spams in the archive, as permanent punishment for the people who paid to | wreck the Internet for their own gain. LOL Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgph6FX53L7mn.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - oox/source sw/source writerfilter/source
oox/source/xls/worksheethelper.cxx| 20
sw/source/core/unocore/unoidx.cxx | 20
writerfilter/source/dmapper/DomainMapper_Impl.cxx |2 +-
3 files changed, 21 insertions(+), 21 deletions(-)
New commits:
commit 67ddd5bd3a66f2b440c651d1d073131a59a57f77
Author: Oliver-Rainer Wittmann
Date: Thu Jan 2 11:19:29 2014 +
123910: removing duplicate code
diff --git a/oox/source/xls/worksheethelper.cxx
b/oox/source/xls/worksheethelper.cxx
index 0f84cad..8174341 100644
--- a/oox/source/xls/worksheethelper.cxx
+++ b/oox/source/xls/worksheethelper.cxx
@@ -1093,26 +1093,6 @@ void WorksheetGlobals::finalizeValidationRanges() const
{
}
-try
-{
-sal_Int32 nIndex = 0;
-OUString aToken = aIt->msRef.getToken( 0, ' ', nIndex );
-
-Reference xSheet = getSheetFromDoc(
getCurrentSheetIndex() );
-Reference xDBCellRange;
-Reference xCell;
-xDBCellRange = xSheet->getCellRangeByName( aToken );
-
-xCell = xDBCellRange->getCellByPosition( 0, 0 );
-Reference xCellAddressable( xCell,
UNO_QUERY_THROW );
-CellAddress aFirstCell = xCellAddressable->getCellAddress();
-Reference xCondition( xValidation,
UNO_QUERY_THROW );
-xCondition->setSourcePosition( aFirstCell );
-}
-catch( Exception& )
-{
-}
-
// convert validation type to API enum
ValidationType eType = ValidationType_ANY;
switch( aIt->mnType )
commit 875f8fb79613875296139a6cbdbae265a92d7a32
Author: Steve Yin
Date: Thu Jan 2 10:46:03 2014 +
Bug 119568 - [From Symphony] The page number of the TOC is not correct if
open the .docx via AOO
diff --git a/sw/source/core/unocore/unoidx.cxx
b/sw/source/core/unocore/unoidx.cxx
index eb4c251..be0572b 100644
--- a/sw/source/core/unocore/unoidx.cxx
+++ b/sw/source/core/unocore/unoidx.cxx
@@ -67,6 +67,7 @@
#include
#include
#include
+#include
using namespace ::com::sun::star;
@@ -583,6 +584,21 @@ throw (uno::RuntimeException)
/*-- 14.12.98 09:35:05---
---*/
+void lcl_CalcLayout(SwDoc *pDoc)
+{
+ViewShell *pViewShell = 0;
+SwEditShell* pEditShell = pDoc ? pDoc->GetEditShell(&pViewShell) : 0;
+if (pEditShell)
+{
+pEditShell->CalcLayout();
+}
+else if (pViewShell)
+{
+pViewShell->CalcLayout();
+}
+
+}
+
void SAL_CALL SwXDocumentIndex::update() throw (uno::RuntimeException)
{
vos::OGuard aGuard(Application::GetSolarMutex());
@@ -595,6 +611,10 @@ void SAL_CALL SwXDocumentIndex::update() throw
(uno::RuntimeException)
throw uno::RuntimeException();
}
pTOXBase->Update();
+
+// the insertion of TOC will affect the document layout
+lcl_CalcLayout(m_pImpl->m_pDoc);
+
// page numbers
pTOXBase->UpdatePageNum();
}
commit e3a84634fd6a033b838485346c274552d5bd8d8c
Author: Steve Yin
Date: Thu Jan 2 10:17:34 2014 +
Bug 119577 - [From Symphony] The "file name" field change to "file name
without extension" in AOO 3.4
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index a0380f9..eab3b0b 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -3078,7 +3078,7 @@ void DomainMapper_Impl::CloseFieldCommand()
sal_Int32 nNumberingTypeIndex =
pContext->GetCommand().indexOf(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\\p")));
xFieldProperties->setPropertyValue(
rPropNameSupplier.GetName(PROP_FILE_FORMAT),
-uno::makeAny( nNumberingTypeIndex > 0 ?
text::FilenameDisplayFormat::FULL : text::FilenameDisplayFormat::NAME ));
+uno::makeAny( nNumberingTypeIndex > 0 ?
text::FilenameDisplayFormat::FULL : text::FilenameDisplayFormat::NAME_AND_EXT
));
}
break;
case FIELD_FILESIZE : break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - 3 commits - sax/source sc/source vcl/aqua
sax/source/fastparser/fastparser.cxx | 22 +---
sc/source/filter/inc/formulabuffer.hxx| 40 +--
sc/source/filter/oox/formulabuffer.cxx| 51 +++---
sc/source/filter/oox/workbookfragment.cxx |6 ++-
vcl/aqua/source/app/salinst.cxx |1
5 files changed, 65 insertions(+), 55 deletions(-)
New commits:
commit ac2067d2df089b8fbf1a7f887680f856ca1f
Author: Michael Meeks
Date: Wed Jan 1 14:06:05 2014 +
oox: fix crash with threaded xlsx loading by pre-allocating sheet storage.
Change-Id: I12c8afe6467bf3ae755faf8c6d01c6aa37d5be27
diff --git a/sc/source/filter/inc/formulabuffer.hxx
b/sc/source/filter/inc/formulabuffer.hxx
index 2411466..6be0a25 100644
--- a/sc/source/filter/inc/formulabuffer.hxx
+++ b/sc/source/filter/inc/formulabuffer.hxx
@@ -91,21 +91,21 @@ public:
};
private:
-typedef ::std::map< SCTAB, std::vector > FormulaDataMap;
-typedef ::std::map< SCTAB, std::vector >
ArrayFormulaDataMap;
+// Vectors indexed by SCTAB - cf. SetSheetCount
+typedef ::std::vector< std::vector > FormulaDataArray;
+typedef ::std::vector< std::vector >
ArrayFormulaDataArray;
// sheet -> list of shared formula descriptions
-typedef ::std::map< SCTAB, std::vector >
SheetToSharedFormulaid;
+typedef ::std::vector< std::vector >
SheetToSharedFormulaid;
// sheet -> stuff needed to create shared formulae
-typedef ::std::map< SCTAB, std::vector >
SheetToFormulaEntryMap;
-
-typedef ::std::map< SCTAB, std::vector > FormulaValueMap;
+typedef ::std::vector< std::vector >
SheetToFormulaEntryArray;
+typedef ::std::vector< std::vector > FormulaValueArray;
osl::Mutex maMtxData;
-FormulaDataMap maCellFormulas;
-ArrayFormulaDataMap maCellArrayFormulas;
-SheetToFormulaEntryMap maSharedFormulas;
-SheetToSharedFormulaid maSharedFormulaIds;
-FormulaValueMap maCellFormulaValues;
+FormulaDataArray maCellFormulas;
+ArrayFormulaDataArraymaCellArrayFormulas;
+SheetToFormulaEntryArray maSharedFormulas;
+SheetToSharedFormulaid maSharedFormulaIds;
+FormulaValueArraymaCellFormulaValues;
SheetItem getSheetItem( SCTAB nTab );
@@ -118,14 +118,20 @@ public:
const ::com::sun::star::table::CellAddress& rAddress, sal_Int32
nSharedId,
const OUString& rCellValue, sal_Int32 nValueType );
-voidsetCellFormulaValue( const
::com::sun::star::table::CellAddress& rAddress, double fValue );
-voidsetCellArrayFormula( const
::com::sun::star::table::CellRangeAddress& rRangeAddress, const
::com::sun::star::table::CellAddress& rTokenAddress, const OUString& );
-void createSharedFormulaMapEntry(
-const com::sun::star::table::CellAddress& rAddress,
-const com::sun::star::table::CellRangeAddress& rRange,
-sal_Int32 nSharedId, const OUString& rTokens );
+voidsetCellFormulaValue( const ::css::table::CellAddress&
rAddress,
+ double fValue );
+voidsetCellArrayFormula( const
::css::table::CellRangeAddress& rRangeAddress,
+ const ::css::table::CellAddress&
rTokenAddress,
+ const OUString& );
+voidcreateSharedFormulaMapEntry( const
::css::table::CellAddress& rAddress,
+ const
::css::table::CellRangeAddress& rRange,
+ sal_Int32 nSharedId,
const OUString& rTokens );
+
+/// ensure sizes of vectors matches the number of sheets
+void SetSheetCount( SCTAB nSheets );
};
+
}}
#endif
diff --git a/sc/source/filter/oox/formulabuffer.cxx
b/sc/source/filter/oox/formulabuffer.cxx
index cb427f2..9f4404b 100644
--- a/sc/source/filter/oox/formulabuffer.cxx
+++ b/sc/source/filter/oox/formulabuffer.cxx
@@ -335,6 +335,15 @@ FormulaBuffer::FormulaBuffer( const WorkbookHelper&
rHelper ) : WorkbookHelper(
{
}
+void FormulaBuffer::SetSheetCount( SCTAB nSheets )
+{
+maCellFormulas.resize( nSheets );
+maCellArrayFormulas.resize( nSheets );
+maSharedFormulas.resize( nSheets );
+maSharedFormulaIds.resize( nSheets );
+maCellFormulaValues.resize( nSheets );
+}
+
void FormulaBuffer::finalizeImport()
{
ISegmentProgressBarRef xFormulaBar = getProgressBar().createSegment(
getProgressBar().getFreeLength() );
@@ -401,35 +410,24 @@ FormulaBuffer::SheetItem FormulaBuffer::getSheetItem(
SCTAB nTab )
osl::MutexGuard aGuard(&maMtxData);
SheetItem aItem;
-{
-FormulaDataMap::iterator it = maCellFormulas.find(nTab);
-if (it != maCellFormulas.end())
-aItem.mpCellFormulas = &it->second;
-}
-
-{
-ArrayFormulaDataMap::iterator it = maCellArrayFormulas.find(nTab);
-if (it != maCe
[Bug 70357] Sort and clean Wiki pages!
https://bugs.freedesktop.org/show_bug.cgi?id=70357 --- Comment #11 from Florian Effenberger --- Can you let me know the exact error message, so I can check which anti-spam module might be the culprit? -- 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/chart-opengl2' - chart2/source
chart2/source/controller/dialogs/tp_RangeChooser.cxx |3 +++
chart2/source/model/main/ChartModel.cxx |1 +
chart2/source/view/main/OpenGLRender.cxx |2 +-
chart2/source/view/main/OpenGLRender.hxx |2 +-
4 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit ee20f4f4a4029fc82fde969e1c3102a4c61ca7db
Author: Markus Mohrhard
Date: Thu Jan 2 14:27:56 2014 +0100
fix the time based rendering
I managed to screw it up already. I really need some sleep.
Change-Id: Ie1f13496cd36a6f48b2b094ac302f293d5fd5383
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx
b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
index 39467e7..0105f5d 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
@@ -157,6 +157,9 @@ RangeChooserTabPage::RangeChooserTabPage( Window* pParent
m_aRB_Rows.SetToggleHdl( LINK( this, RangeChooserTabPage,
ControlChangedHdl ) );
m_aCB_FirstRowAsLabel.SetToggleHdl( LINK( this, RangeChooserTabPage,
ControlChangedHdl ) );
m_aCB_FirstColumnAsLabel.SetToggleHdl( LINK( this, RangeChooserTabPage,
ControlChangedHdl ) );
+m_aCB_TimeBased.SetToggleHdl( LINK( this, RangeChooserTabPage,
ControlChangedHdl ) );
+m_aEd_TimeStart.SetModifyHdl( LINK( this, RangeChooserTabPage,
ControlChangedHdl ) );
+m_aEd_TimeEnd.SetModifyHdl( LINK( this, RangeChooserTabPage,
ControlChangedHdl ) );
}
RangeChooserTabPage::~RangeChooserTabPage()
diff --git a/chart2/source/model/main/ChartModel.cxx
b/chart2/source/model/main/ChartModel.cxx
index 2625668..0fab4a6 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -1401,6 +1401,7 @@ void ChartModel::setTimeBasedRange(sal_Int32 nStart,
sal_Int32 nEnd)
bSet = false;
mnStart = nStart;
mnEnd = nEnd;
+mbTimeBased = true;
}
} // namespace chart
diff --git a/chart2/source/view/main/OpenGLRender.cxx
b/chart2/source/view/main/OpenGLRender.cxx
index 3072c02..2090e03 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -1315,7 +1315,7 @@ int OpenGLRender::RenderRectangleShape()
return 0;
}
-int OpenGLRender::CreateTextTexture(::rtl::OUString textValue, long color,
::rtl::OUString font, awt::Point aPos, awt::Size aSize, long rotation)
+int OpenGLRender::CreateTextTexture(::rtl::OUString textValue, sal_uInt32
color, ::rtl::OUString font, awt::Point aPos, awt::Size aSize, long rotation)
{
VirtualDevice aDevice;
Font aFont(font, Size(0, 100));
diff --git a/chart2/source/view/main/OpenGLRender.hxx
b/chart2/source/view/main/OpenGLRender.hxx
index 1c02a9b..9040836 100644
--- a/chart2/source/view/main/OpenGLRender.hxx
+++ b/chart2/source/view/main/OpenGLRender.hxx
@@ -176,7 +176,7 @@ public:
int RenderRectangleShape();
int RectangleShapePoint(float x, float y, float directionX, float
directionY);
-int CreateTextTexture(::rtl::OUString textValue, long color,
::rtl::OUString font, awt::Point aPos, awt::Size aSize, long rotation);
+int CreateTextTexture(::rtl::OUString textValue, sal_uInt32 color,
::rtl::OUString font, awt::Point aPos, awt::Size aSize, long rotation);
int RenderTextShape();
private:
GLint LoadShaders(const char *vertexShader,const char *fragmentShader);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/opencl/op_financial.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit f6cb7ff0f635e03aff7c24e2083d71ecd1bbaf0d
Author: Tor Lillqvist
Date: Thu Jan 2 13:02:50 2014 +0200
WaE: statement aligned as ... [loplugin]
Change-Id: I8119041ae6c93af858d972e627e50e04bb7f60c8
diff --git a/sc/source/core/opencl/op_financial.cxx
b/sc/source/core/opencl/op_financial.cxx
index 2bd250e..4ead16c 100644
--- a/sc/source/core/opencl/op_financial.cxx
+++ b/sc/source/core/opencl/op_financial.cxx
@@ -3665,7 +3665,7 @@ void OpCouppcd::GenSlidingWindowFunction(
for (unsigned i = 0; i < vSubArguments.size(); i++)
{
if (i)
- ss << ",";
+ ss << ",";
vSubArguments[i]->GenSlidingWindowDecl(ss);
}
ss << ") {\n";
@@ -3762,7 +3762,7 @@ vSubArguments)
for (unsigned i = 0; i < vSubArguments.size(); i++)
{
if (i)
- ss << ",";
+ ss << ",";
vSubArguments[i]->GenSlidingWindowDecl(ss);
}
ss << ") {\n";
@@ -3872,7 +3872,7 @@ void OpCoupdaysnc::GenSlidingWindowFunction(
for (unsigned i = 0; i < vSubArguments.size(); i++)
{
if (i)
- ss << ",";
+ ss << ",";
vSubArguments[i]->GenSlidingWindowDecl(ss);
}
ss << ") {\n";
@@ -3968,7 +3968,7 @@ void
OpCoupnum::GenSlidingWindowFunction(std::stringstream &ss,
for (unsigned i = 0; i < vSubArguments.size(); i++)
{
if (i)
- ss << ",";
+ ss << ",";
vSubArguments[i]->GenSlidingWindowDecl(ss);
}
ss << ") {\n";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - oox/source sw/qa
oox/source/export/shapes.cxx | 66 +++
sw/qa/extras/ooxmlexport/data/bezier.odt |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |8 +++
3 files changed, 50 insertions(+), 24 deletions(-)
New commits:
commit 3a45a4e80257d8737df4dda0b2d85f602196a70d
Author: Miklos Vajna
Date: Thu Jan 2 11:58:57 2014 +0100
oox: fix export of TextShapes in DOCX
This was the last shape type that unconditionally wrote XML_sp for the
shape element, which is invalid for DOCX.
Change-Id: I3a6f8e6fd8ebbe663dce9ed4453396c3ec91c38a
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 59af378..67cf3dc 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -905,14 +905,20 @@ ShapeExport& ShapeExport::WriteTextShape( Reference<
XShape > xShape )
{
FSHelperPtr pFS = GetFS();
-pFS->startElementNS( mnXmlNamespace, XML_sp, FSEND );
+pFS->startElementNS( mnXmlNamespace, (GetDocumentType() != DOCUMENT_DOCX ?
XML_sp : XML_wsp), FSEND );
// non visual shape properties
-pFS->startElementNS( mnXmlNamespace, XML_nvSpPr, FSEND );
-WriteNonVisualDrawingProperties( xShape, IDS( TextShape ) );
+if (GetDocumentType() != DOCUMENT_DOCX)
+{
+pFS->startElementNS( mnXmlNamespace, XML_nvSpPr, FSEND );
+WriteNonVisualDrawingProperties( xShape, IDS( TextShape ) );
+}
pFS->singleElementNS( mnXmlNamespace, XML_cNvSpPr, XML_txBox, "1", FSEND );
-WriteNonVisualProperties( xShape );
-pFS->endElementNS( mnXmlNamespace, XML_nvSpPr );
+if (GetDocumentType() != DOCUMENT_DOCX)
+{
+WriteNonVisualProperties( xShape );
+pFS->endElementNS( mnXmlNamespace, XML_nvSpPr );
+}
// visual shape properties
pFS->startElementNS( mnXmlNamespace, XML_spPr, FSEND );
@@ -923,7 +929,7 @@ ShapeExport& ShapeExport::WriteTextShape( Reference< XShape
> xShape )
WriteTextBox( xShape, mnXmlNamespace );
-pFS->endElementNS( mnXmlNamespace, XML_sp );
+pFS->endElementNS( mnXmlNamespace, (GetDocumentType() != DOCUMENT_DOCX ?
XML_sp : XML_wsp) );
return *this;
}
diff --git a/sw/qa/extras/ooxmlexport/data/bezier.odt
b/sw/qa/extras/ooxmlexport/data/bezier.odt
new file mode 100644
index 000..c73ed3e
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/bezier.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 187cf4f..54042d4 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2175,6 +2175,14 @@ DECLARE_OOXMLEXPORT_TEST(testRelorientation,
"relorientation.docx")
CPPUNIT_ASSERT_EQUAL(OUString("com.sun.star.drawing.GroupShape"),
xShapeDescriptor->getShapeType());
}
+DECLARE_OOXMLEXPORT_TEST(testBezier, "bezier.odt")
+{
+uno::Reference xDrawPageSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Reference
xDraws(xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY);
+// Check that no shape got lost: a bezier, a line and a text shape.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(3), xDraws->getCount());
+}
+
DECLARE_OOXMLEXPORT_TEST(testTrackChangesDeletedParagraphMark,
"testTrackChangesDeletedParagraphMark.docx")
{
xmlDocPtr pXmlDoc = parseExport("word/document.xml");
commit affcea4185ffa95385cfb74ca68fa31361d6784b
Author: Miklos Vajna
Date: Thu Jan 2 11:56:39 2014 +0100
oox: fix export of LineShapes in DOCX
Change-Id: I7b6f4616d450d2cffa58217db2ef250f5b8d9cba
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index a26da94..59af378 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -615,7 +615,7 @@ ShapeExport& ShapeExport::WriteLineShape( Reference< XShape
> xShape )
FSHelperPtr pFS = GetFS();
-pFS->startElementNS( mnXmlNamespace, XML_sp, FSEND );
+pFS->startElementNS( mnXmlNamespace, (GetDocumentType() != DOCUMENT_DOCX ?
XML_sp : XML_wsp), FSEND );
PolyPolygon aPolyPolygon = EscherPropertyContainer::GetPolyPolygon( xShape
);
if( aPolyPolygon.Count() == 1 && aPolyPolygon[ 0 ].GetSize() == 2)
@@ -627,14 +627,20 @@ ShapeExport& ShapeExport::WriteLineShape( Reference<
XShape > xShape )
}
// non visual shape properties
-pFS->startElementNS( mnXmlNamespace, XML_nvSpPr, FSEND );
-pFS->singleElementNS( mnXmlNamespace, XML_cNvPr,
- XML_id, I32S( GetNewShapeID( xShape ) ),
- XML_name, IDS( Line ),
- FSEND );
+if (GetDocumentType() != DOCUMENT_DOCX)
+{
+pFS->startElementNS( mnXmlNamespace, XML_nvSpPr, FSEND );
+pFS->singleElementNS( mnXmlNamespace, XML_cNvPr,
+ XML_id, I32S( GetNewShapeID( xShape ) ),
+ XML_name, IDS( Line ),
+ FSEND );
+}
pFS->singleElementNS( mnXmlNamespace, XML_cNvSpPr, FSEND );
-
[Bug 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Bug 54157 depends on bug 39007, which changed state. Bug 39007 Summary: Persistent "Restore Windows" dialog won't disappear, disables key functionality https://bugs.freedesktop.org/show_bug.cgi?id=39007 What|Removed |Added Status|REOPENED|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: sc/source
sc/source/filter/inc/formulabuffer.hxx| 40 +--
sc/source/filter/oox/formulabuffer.cxx| 51 +++---
sc/source/filter/oox/workbookfragment.cxx |6 ++-
3 files changed, 55 insertions(+), 42 deletions(-)
New commits:
commit d17a83fa549f828f29e6939b16ba8b568a75f95e
Author: Michael Meeks
Date: Wed Jan 1 14:06:05 2014 +
oox: fix crash with threaded xlsx loading by pre-allocating sheet storage.
Change-Id: I12c8afe6467bf3ae755faf8c6d01c6aa37d5be27
diff --git a/sc/source/filter/inc/formulabuffer.hxx
b/sc/source/filter/inc/formulabuffer.hxx
index 2411466..6be0a25 100644
--- a/sc/source/filter/inc/formulabuffer.hxx
+++ b/sc/source/filter/inc/formulabuffer.hxx
@@ -91,21 +91,21 @@ public:
};
private:
-typedef ::std::map< SCTAB, std::vector > FormulaDataMap;
-typedef ::std::map< SCTAB, std::vector >
ArrayFormulaDataMap;
+// Vectors indexed by SCTAB - cf. SetSheetCount
+typedef ::std::vector< std::vector > FormulaDataArray;
+typedef ::std::vector< std::vector >
ArrayFormulaDataArray;
// sheet -> list of shared formula descriptions
-typedef ::std::map< SCTAB, std::vector >
SheetToSharedFormulaid;
+typedef ::std::vector< std::vector >
SheetToSharedFormulaid;
// sheet -> stuff needed to create shared formulae
-typedef ::std::map< SCTAB, std::vector >
SheetToFormulaEntryMap;
-
-typedef ::std::map< SCTAB, std::vector > FormulaValueMap;
+typedef ::std::vector< std::vector >
SheetToFormulaEntryArray;
+typedef ::std::vector< std::vector > FormulaValueArray;
osl::Mutex maMtxData;
-FormulaDataMap maCellFormulas;
-ArrayFormulaDataMap maCellArrayFormulas;
-SheetToFormulaEntryMap maSharedFormulas;
-SheetToSharedFormulaid maSharedFormulaIds;
-FormulaValueMap maCellFormulaValues;
+FormulaDataArray maCellFormulas;
+ArrayFormulaDataArraymaCellArrayFormulas;
+SheetToFormulaEntryArray maSharedFormulas;
+SheetToSharedFormulaid maSharedFormulaIds;
+FormulaValueArraymaCellFormulaValues;
SheetItem getSheetItem( SCTAB nTab );
@@ -118,14 +118,20 @@ public:
const ::com::sun::star::table::CellAddress& rAddress, sal_Int32
nSharedId,
const OUString& rCellValue, sal_Int32 nValueType );
-voidsetCellFormulaValue( const
::com::sun::star::table::CellAddress& rAddress, double fValue );
-voidsetCellArrayFormula( const
::com::sun::star::table::CellRangeAddress& rRangeAddress, const
::com::sun::star::table::CellAddress& rTokenAddress, const OUString& );
-void createSharedFormulaMapEntry(
-const com::sun::star::table::CellAddress& rAddress,
-const com::sun::star::table::CellRangeAddress& rRange,
-sal_Int32 nSharedId, const OUString& rTokens );
+voidsetCellFormulaValue( const ::css::table::CellAddress&
rAddress,
+ double fValue );
+voidsetCellArrayFormula( const
::css::table::CellRangeAddress& rRangeAddress,
+ const ::css::table::CellAddress&
rTokenAddress,
+ const OUString& );
+voidcreateSharedFormulaMapEntry( const
::css::table::CellAddress& rAddress,
+ const
::css::table::CellRangeAddress& rRange,
+ sal_Int32 nSharedId,
const OUString& rTokens );
+
+/// ensure sizes of vectors matches the number of sheets
+void SetSheetCount( SCTAB nSheets );
};
+
}}
#endif
diff --git a/sc/source/filter/oox/formulabuffer.cxx
b/sc/source/filter/oox/formulabuffer.cxx
index cb427f2..9f4404b 100644
--- a/sc/source/filter/oox/formulabuffer.cxx
+++ b/sc/source/filter/oox/formulabuffer.cxx
@@ -335,6 +335,15 @@ FormulaBuffer::FormulaBuffer( const WorkbookHelper&
rHelper ) : WorkbookHelper(
{
}
+void FormulaBuffer::SetSheetCount( SCTAB nSheets )
+{
+maCellFormulas.resize( nSheets );
+maCellArrayFormulas.resize( nSheets );
+maSharedFormulas.resize( nSheets );
+maSharedFormulaIds.resize( nSheets );
+maCellFormulaValues.resize( nSheets );
+}
+
void FormulaBuffer::finalizeImport()
{
ISegmentProgressBarRef xFormulaBar = getProgressBar().createSegment(
getProgressBar().getFreeLength() );
@@ -401,35 +410,24 @@ FormulaBuffer::SheetItem FormulaBuffer::getSheetItem(
SCTAB nTab )
osl::MutexGuard aGuard(&maMtxData);
SheetItem aItem;
-{
-FormulaDataMap::iterator it = maCellFormulas.find(nTab);
-if (it != maCellFormulas.end())
-aItem.mpCellFormulas = &it->second;
-}
-
-{
-ArrayFormulaDataMap::iterator it = maCellArrayFormulas.find(nTab);
-if (it != maCellArrayFormulas.end())
-aItem.mpArrayFormulas = &it->second;
-}
+if( (size_t) nTab >= maCell
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/aqua
vcl/aqua/source/app/salinst.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 4c6646b2b5accd492958318f34f3b8059717c8e6
Author: Michael Meeks
Date: Tue Dec 31 10:07:20 2013 +
fdo#39007: blind fix for renamed OS X restore-state file
Remove also a potential restorecount.txt file (as reported in the bug) in
addition to a potential restorecount.plist.
Change-Id: I96fb688e9dda804f240cad8f2109c5880b544302
Reviewed-on: https://gerrit.libreoffice.org/7239
Reviewed-by: Tor Lillqvist
Tested-by: Tor Lillqvist
Signed-off-by: Tor Lillqvist
diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx
index 790b987..6ac7094 100644
--- a/vcl/aqua/source/app/salinst.cxx
+++ b/vcl/aqua/source/app/salinst.cxx
@@ -198,6 +198,7 @@ static void initNSApp()
sal_Bool ImplSVMainHook( int * pnInit )
{
unlink([[NSString stringWithFormat:@"%@/Library/Saved Application
State/%s.savedState/restorecount.plist", NSHomeDirectory(),
MACOSX_BUNDLE_IDENTIFIER] UTF8String]);
+unlink([[NSString stringWithFormat:@"%@/Library/Saved Application
State/%s.savedState/restorecount.txt", NSHomeDirectory(),
MACOSX_BUNDLE_IDENTIFIER] UTF8String]);
gpnInit = pnInit;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/chart-opengl2' - 3 commits - chart2/source
chart2/source/view/inc/DummyXShape.hxx |2
chart2/source/view/main/DummyXShape.cxx | 27
chart2/source/view/main/OpenGLRender.cxx | 192 ++-
chart2/source/view/main/OpenGLRender.hxx | 23 +++
4 files changed, 241 insertions(+), 3 deletions(-)
New commits:
commit 15c34523ac500613c4d846080e078db2f5bb7360
Author: Markus Mohrhard
Date: Thu Jan 2 13:47:26 2014 +0100
integrate text rendering into DummyXShape
Change-Id: Iedbec882a95963d565b960e51478ad62e1b73c0f
diff --git a/chart2/source/view/inc/DummyXShape.hxx
b/chart2/source/view/inc/DummyXShape.hxx
index 01cfe28..0676cb9 100644
--- a/chart2/source/view/inc/DummyXShape.hxx
+++ b/chart2/source/view/inc/DummyXShape.hxx
@@ -377,6 +377,8 @@ public:
DummyText(const OUString& rText, const tNameSequence& rNames,
const tAnySequence& rValues, const uno::Any& rTrans );
+virtual void render() SAL_OVERRIDE;
+
private:
OUString maText;
uno::Any maTrans;
diff --git a/chart2/source/view/main/DummyXShape.cxx
b/chart2/source/view/main/DummyXShape.cxx
index bce7db8..b372834 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -536,6 +536,29 @@ DummyText::DummyText(const OUString& rText, const
tNameSequence& rNames,
setProperties(rNames, rValues, maProperties);
}
+void DummyText::render()
+{
+debugProperties(maProperties);
+
+//get text color, the output value always be white, so we use black color
to text
+std::map< OUString, uno::Any >::const_iterator itr =
maProperties.find("CharColor");
+sal_Int32 nColor = 0;
+if(itr != maProperties.end())
+{
+uno::Any co = itr->second;
+nColor = co.get();
+}
+
+//get font, assuming that every font has a set font name
+uno::Any font = maProperties.find("CharFontName")->second;
+OUString aFontName = font.get();
+
+sal_Int32 nRot = 0;
+DummyChart* pChart = getRootShape();
+pChart->m_GLRender.CreateTextTexture(maText, nColor, aFontName,
maPosition, maSize, nRot);
+pChart->m_GLRender.RenderTextShape();
+}
+
DummyGroup3D::DummyGroup3D(const OUString& rName)
{
setName(rName);
diff --git a/chart2/source/view/main/OpenGLRender.cxx
b/chart2/source/view/main/OpenGLRender.cxx
index b72a346..3072c02 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -1315,81 +1315,6 @@ int OpenGLRender::RenderRectangleShape()
return 0;
}
-
-int OpenGLRender::ProcessText(uno::Reference< drawing::XShape > &xShape)
-{
-uno::Reference< beans::XPropertySet > xProp( xShape, uno::UNO_QUERY );
-awt::Point aPos( xShape->getPosition() );
-awt::Size aSize( xShape->getSize());
-//use device to create text bitmap
-#if 0
-com::sun::star::uno::Sequence
Sequenceproperty = xProp->getPropertySetInfo()->getProperties();
-com::sun::star::beans::Property* Propertyarr = Sequenceproperty.getArray();
-int count = Sequenceproperty.getLength();
-printf("Property length:%d\n",count);
-for(int i=0;igetPropertyValue(Propertyarr[i].Name);
-if(strtypename.equals(OUString(L"string")))
-{
-::rtl::OUString * strvalue = (::rtl::OUString *)value.getValue();
- wprintf(L",Value:%s \n", strvalue->getStr());
-}
-else if(strtypename.equals(OUString(L"short")))
-{
-short * shortvalue = (short*)value.getValue();
-printf(",Value:%d \n",*shortvalue);
-}
-else if(strtypename.equals(OUString(L"long")))
-{
-long * longvalue = (long*)value.getValue();
-printf(",Value:%d \n",*longvalue);
-}
-else if(strtypename.equals(OUString(L"boolean")))
-{
-short * bvalue = (short*)value.getValue();
-if(*bvalue==0)
-printf(",Value:false \n");
-else
-printf(",Value:true \n");
-}
-else
-{
-printf(",Value:object \n");
-}
-}
-printf("\n");
-#endif
-//get the string
-uno::Reference< text::XTextRange > xTextRange( xShape, uno::UNO_QUERY );
-
-::rtl::OUString textValue = xTextRange->getString();
-wprintf(L"Text value:%s \n", textValue.getStr());
-//get text color, the output value always be white, so we use black color
to text
-uno::Any co = xProp->getPropertyValue(UNO_NAME_EDIT_CHAR_COLOR);
-long *colorvalue = (long*)co.getValue();
-
-//get font
-uno::Any font = xProp->getPropertyValue(UNO_NAME_EDIT_CHAR_FONTNAME);
-::rtl::OUString *fontValue = (::rtl::OUString *)font.getValue();
-wprintf(L"Text font:%s \n", fontValue->getStr());
-uno::Any rotation =
xProp->getPropertyValue(UNO_NAME_MISC_OBJ_ROTATEANGLE);
-long *rot = (long*)rotation.getValue();
-cout << "*rot = " << (*rot) << endl;
-//using the string and the color to create the text texture
-cout << "color va
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - vcl/unx
vcl/unx/gtk/window/gtkframe.cxx |9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 6dfbd90ac73473c73b0d87e253f16c78d09d3608
Author: Tsutomu Uchino
Date: Mon Dec 30 13:13:35 2013 +
#i122950# fix duplicated input when input method convert a character on gtk
environment
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index ef0ce94..d5cb527 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -3553,6 +3553,11 @@ void GtkSalFrame::IMHandler::signalIMCommit(
GtkIMContext* CONTEXT_ARG, gchar* p
{
GTK_YIELD_GRAB();
+bool bWasPreedit =
+(pThis->m_aInputEvent.mpTextAttr != 0) ||
+pThis->m_bPreeditJustChanged;
+pThis->m_bPreeditJustChanged = false;
+
pThis->m_aInputEvent.mnTime = 0;
pThis->m_aInputEvent.mpTextAttr = 0;
pThis->m_aInputEvent.maText = String( pText,
RTL_TEXTENCODING_UTF8 );
@@ -3576,9 +3581,7 @@ void GtkSalFrame::IMHandler::signalIMCommit(
GtkIMContext* CONTEXT_ARG, gchar* p
* or because there never was a preedit.
*/
bool bSingleCommit = false;
-bool bWasPreedit =
-(pThis->m_aInputEvent.mpTextAttr != 0) ||
-pThis->m_bPreeditJustChanged;
+
if( ! bWasPreedit
&& pThis->m_aInputEvent.maText.Len() == 1
&& ! pThis->m_aPrevKeyPresses.empty()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/chart-opengl2' - sc/inc
sc/inc/chart2uno.hxx |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 3d679c9353215e9b91bc519ddad8b531d5c793c7 Author: Markus Mohrhard Date: Thu Jan 2 13:04:48 2014 +0100 fix windows build Change-Id: I2696011d6565a0fd71c3f44f54fd1d37ee03 diff --git a/sc/inc/chart2uno.hxx b/sc/inc/chart2uno.hxx index 820b6626..728855a 100644 --- a/sc/inc/chart2uno.hxx +++ b/sc/inc/chart2uno.hxx @@ -272,10 +272,10 @@ public: SAL_CALL getTextualData( ) throw (::com::sun::star::uno::RuntimeException); // XTimeBased -virtual sal_Bool switchToNext(sal_Bool bWrap) throw (::com::sun::star::uno::RuntimeException); -virtual sal_Bool setToPointInTime(sal_Int32 nPoint) throw (::com::sun::star::uno::RuntimeException); +virtual sal_Bool SAL_CALL switchToNext(sal_Bool bWrap) throw (::com::sun::star::uno::RuntimeException); +virtual sal_Bool SAL_CALL setToPointInTime(sal_Int32 nPoint) throw (::com::sun::star::uno::RuntimeException); -virtual void setRange(sal_Int32 nStart, sal_Int32 nEnd) throw (::com::sun::star::uno::RuntimeException); +virtual void SAL_CALL setRange(sal_Int32 nStart, sal_Int32 nEnd) throw (::com::sun::star::uno::RuntimeException); // XPropertySet virtual ::com::sun::star::uno::Reference< ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Bug 6 depends on bug 56960, which changed state. Bug 56960 Summary: FILEOPEN particular .xlsx shows cell border lines with wrong FORMATTING (too thick) https://bugs.freedesktop.org/show_bug.cgi?id=56960 What|Removed |Added Status|REOPENED|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
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Bug 6 depends on bug 56960, which changed state. Bug 56960 Summary: FILEOPEN particular .xlsx shows cell border lines with wrong FORMATTING (too thick) https://bugs.freedesktop.org/show_bug.cgi?id=56960 What|Removed |Added Status|VERIFIED|REOPENED 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: sw/qa
sw/qa/extras/ooxmlexport/data/testTrackChangesInsertedParagraphMark.docx
|binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |
8
2 files changed, 8 insertions(+)
New commits:
commit 1b66c17b7fa7b0c6d74d03777e24db236bb86282
Author: Adam Co
Date: Tue Dec 31 15:50:13 2013 +0200
Add unit-test for 'track changes - inserted paragraph mark' preservation
This is a unit-test added to complement the patch that added support
for the preservation of 'Track Changes - Inserted Paragraph Mark' from
a DOCX file.
Change-Id: I21e67b3ed8c98e8aba2c633dc6a549786ae44322
Reviewed-on: https://gerrit.libreoffice.org/7241
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
diff --git
a/sw/qa/extras/ooxmlexport/data/testTrackChangesInsertedParagraphMark.docx
b/sw/qa/extras/ooxmlexport/data/testTrackChangesInsertedParagraphMark.docx
new file mode 100644
index 000..33b4516
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/testTrackChangesInsertedParagraphMark.docx
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 77491ea..187cf4f 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2183,6 +2183,14 @@
DECLARE_OOXMLEXPORT_TEST(testTrackChangesDeletedParagraphMark, "testTrackChanges
assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:pPr/w:rPr/w:del");
}
+DECLARE_OOXMLEXPORT_TEST(testTrackChangesInsertedParagraphMark,
"testTrackChangesInsertedParagraphMark.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+if (!pXmlDoc)
+return;
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:pPr/w:rPr/w:ins");
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/ooxmlexport/data/testTrackChangesDeletedParagraphMark.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx| 10
+-
2 files changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 53745911a7055cab0ddcfc4ac221ecfaccb04902
Author: Adam Co
Date: Tue Dec 31 15:39:32 2013 +0200
Add unit-test for 'track changes - deleted paragraph mark' preservation
This is a unit-test added to complement the patch that added support
for the preservation of 'Track Changes - Deleted Paragraph Mark' from
a DOCX file.
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
https://gerrit.libreoffice.org/7240
Change-Id: I161bcd90ec891fad60dfd5b7c77edddfd90b7fa8
diff --git
a/sw/qa/extras/ooxmlexport/data/testTrackChangesDeletedParagraphMark.docx
b/sw/qa/extras/ooxmlexport/data/testTrackChangesDeletedParagraphMark.docx
new file mode 100644
index 000..5d85f32
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/testTrackChangesDeletedParagraphMark.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 15ca09e..77491ea 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2148,7 +2148,7 @@ DECLARE_OOXMLEXPORT_TEST(testFdo71785, "fdo71785.docx")
DECLARE_OOXMLEXPORT_TEST(testCrashWhileSave, "testCrashWhileSave.docx")
{
-xmlDocPtr pXmlDoc = parseExport("word/footer1.xml");
+xmlDocPtr pXmlDoc = parseExport("word/footer1.xml");
if (!pXmlDoc)
return;
CPPUNIT_ASSERT(getXPath(pXmlDoc,
"/w:ftr/w:tbl/w:tr/w:tc[1]/w:p[1]/w:pPr/w:pStyle", "val").match("Normal"));
@@ -2175,6 +2175,14 @@ DECLARE_OOXMLEXPORT_TEST(testRelorientation,
"relorientation.docx")
CPPUNIT_ASSERT_EQUAL(OUString("com.sun.star.drawing.GroupShape"),
xShapeDescriptor->getShapeType());
}
+DECLARE_OOXMLEXPORT_TEST(testTrackChangesDeletedParagraphMark,
"testTrackChangesDeletedParagraphMark.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+if (!pXmlDoc)
+return;
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:pPr/w:rPr/w:del");
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - oox/source
oox/source/drawingml/textbodycontext.cxx |1 -
oox/source/drawingml/textcharacterproperties.cxx |2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 950de3b92fbab4eee931973bb95170e205b16a4b
Author: Muthu Subramanian
Date: Thu Jan 2 14:03:22 2014 +0530
Fix compilation problems.
diff --git a/oox/source/drawingml/textbodycontext.cxx
b/oox/source/drawingml/textbodycontext.cxx
index a8b3d64..7bc29a0 100644
--- a/oox/source/drawingml/textbodycontext.cxx
+++ b/oox/source/drawingml/textbodycontext.cxx
@@ -54,7 +54,6 @@ TextParagraphContext::TextParagraphContext( ContextHandler&
rParent, TextParagra
: ContextHandler( rParent )
, mrParagraph( rPara )
{
-mbEnableTrimSpace = false;
}
//
diff --git a/oox/source/drawingml/textcharacterproperties.cxx
b/oox/source/drawingml/textcharacterproperties.cxx
index c531bc1..bc23204 100644
--- a/oox/source/drawingml/textcharacterproperties.cxx
+++ b/oox/source/drawingml/textcharacterproperties.cxx
@@ -21,7 +21,7 @@
#include
#include
#include
-#include
+#include
#include "oox/helper/helper.hxx"
#include "oox/helper/propertyset.hxx"
#include "oox/core/xmlfilterbase.hxx"
___
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/filter/ww8/docxsdrexport.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit 96dcea05d2aedceeb27f9506b4178c664be5f80b Author: Nikhil Walvekar Date: Fri Dec 27 13:49:14 2013 +0530 fdo#73046 DOCX For anchor tag relativeHeight attribute should be always present. Change-Id: Ib54651878b6343e2ab8bb11a13c11289dd0f72f6 Reviewed-on: https://gerrit.libreoffice.org/7208 Reviewed-by: Miklos Vajna Tested-by: Miklos Vajna diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx index a714e55..15a7b0e 100644 --- a/sw/source/filter/ww8/docxsdrexport.cxx +++ b/sw/source/filter/ww8/docxsdrexport.cxx @@ -93,6 +93,9 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrmFmt* pFrmFmt, const Size& rS attrList->add(XML_allowOverlap, "1"); // TODO if (const SdrObject* pObj = pFrmFmt->FindRealSdrObject()) attrList->add(XML_relativeHeight, OString::number(pObj->GetOrdNum())); +else +// relativeHeight is mandatory attribute, if value is not present, we must write default value +attrList->add(XML_relativeHeight, "0"); sax_fastparser::XFastAttributeListRef xAttrList(attrList); m_pImpl->m_pSerializer->startElementNS(XML_wp, XML_anchor, xAttrList); m_pImpl->m_pSerializer->singleElementNS(XML_wp, XML_simplePos, XML_x, "0", XML_y, "0", FSEND); // required, unused ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
