[Libreoffice-commits] core.git: 3 commits - connectivity/inc connectivity/source include/tools include/vcl sc/source sd/source sfx2/inc sfx2/source vcl/source
Caolán McNamara
caolanm at redhat.com
Mon Jan 13 05:55:19 PST 2014
connectivity/inc/pch/precompiled_file.hxx | 1
connectivity/source/drivers/calc/CDatabaseMetaData.cxx | 1
connectivity/source/drivers/dbase/DDatabaseMetaData.cxx | 1
connectivity/source/drivers/dbase/DIndexIter.cxx | 1
connectivity/source/drivers/file/FDatabaseMetaData.cxx | 1
connectivity/source/inc/file/FStatement.hxx | 1
include/tools/stream.hxx | 10 -------
include/vcl/edit.hxx | 1
include/vcl/pdfwriter.hxx | 1
sc/source/ui/src/condformatdlg.src | 18 ++++++-------
sd/source/ui/accessibility/AccessiblePresentationShape.cxx | 1
sfx2/inc/pch/precompiled_sfx.hxx | 1
sfx2/source/bastyp/sfxhtml.cxx | 1
vcl/source/edit/textdoc.cxx | 1
14 files changed, 10 insertions(+), 30 deletions(-)
New commits:
commit 6d2ffbaeced98769912f2b4769fc23093b3d8d7f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 13 13:34:16 2014 +0000
Related: rhbz#1047871 conditional formatting doesn't fit on screen
Change-Id: I886030c056fe802279f9e16c6f85736b0c4587c6
diff --git a/sc/source/ui/src/condformatdlg.src b/sc/source/ui/src/condformatdlg.src
index 0594c5b..4d476a0 100644
--- a/sc/source/ui/src/condformatdlg.src
+++ b/sc/source/ui/src/condformatdlg.src
@@ -14,32 +14,32 @@ ModalDialog RID_SCDLG_CONDFORMAT
HelpID = "sc:ModalDialog:RID_SCDLG_CONDFORMAT";
OutputSize = TRUE;
Hide = TRUE;
- Size = MAP_APPFONT ( 300, 300 );
+ Size = MAP_APPFONT ( 300, 265 );
Text [ en-US ] = "Conditional Formatting for";
Moveable = TRUE;
Closeable = TRUE;
OkButton BTN_OK
{
- Pos = MAP_APPFONT ( 190, 280 );
+ Pos = MAP_APPFONT ( 190, 245 );
Size = MAP_APPFONT ( 50, 14 );
TabStop = TRUE;
};
CancelButton BTN_CANCEL
{
- Pos = MAP_APPFONT ( 245, 280 );
+ Pos = MAP_APPFONT ( 245, 245 );
Size = MAP_APPFONT ( 50, 14 );
TabStop = TRUE;
};
PushButton BTN_ADD
{
- Pos = MAP_APPFONT( 5, 245 );
+ Pos = MAP_APPFONT( 5, 210 );
Size = MAP_APPFONT( 50, 14 );
Text [ en-US ] = "Add";
TabStop = TRUE;
};
PushButton BTN_REMOVE
{
- Pos = MAP_APPFONT( 60, 245 );
+ Pos = MAP_APPFONT( 60, 210 );
Size = MAP_APPFONT( 50, 14 );
Text [ en-US ] = "Remove";
TabStop = TRUE;
@@ -47,26 +47,26 @@ ModalDialog RID_SCDLG_CONDFORMAT
Control CTRL_LIST
{
Pos = MAP_APPFONT( 5, 20 );
- Size = MAP_APPFONT( 290, 220 );
+ Size = MAP_APPFONT( 290, 185 );
DialogControl = TRUE;
Border = TRUE;
};
FixedText FT_RANGE
{
- Pos = MAP_APPFONT( 5, 262 );
+ Pos = MAP_APPFONT( 5, 227 );
Size = MAP_APPFONT( 50, 16 );
Text [ en-US ] = "Range:";
};
Edit ED_RANGE
{
- Pos = MAP_APPFONT( 60, 262 );
+ Pos = MAP_APPFONT( 60, 227 );
Size = MAP_APPFONT( 182, 14 );
Border = TRUE;
TabStop = TRUE;
};
ImageButton RB_RANGE
{
- Pos = MAP_APPFONT( 245, 262 );
+ Pos = MAP_APPFONT( 245, 227 );
Size = MAP_APPFONT( 14, 14 );
Border = TRUE;
TabStop = TRUE;
commit 09dc5813591343fde6959db9f7986d37ae3fbd31
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 13 12:24:44 2014 +0000
drop unnecessary tools/string.hxx includes
Change-Id: I2439ed19b554381f80e882aacbac05167622df92
diff --git a/connectivity/inc/pch/precompiled_file.hxx b/connectivity/inc/pch/precompiled_file.hxx
index 09c80b7..051f704 100644
--- a/connectivity/inc/pch/precompiled_file.hxx
+++ b/connectivity/inc/pch/precompiled_file.hxx
@@ -63,7 +63,6 @@
#include <tools/date.hxx>
#include <tools/datetime.hxx>
#include <tools/debug.hxx>
-#include <tools/string.hxx>
#include <tools/time.hxx>
#include <tools/urlobj.hxx>
#include <ucbhelper/content.hxx>
diff --git a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
index 97fe37f..00a6d1d 100644
--- a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
@@ -35,7 +35,6 @@
#include "FDatabaseMetaDataResultSet.hxx"
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <comphelper/types.hxx>
-#include <tools/string.hxx>
using namespace connectivity::calc;
using namespace connectivity::file;
diff --git a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
index 2419b86..13c25f5 100644
--- a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
@@ -32,7 +32,6 @@
#include <comphelper/extract.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/types.hxx>
-#include <tools/string.hxx>
#include <ucbhelper/content.hxx>
using namespace ::comphelper;
diff --git a/connectivity/source/drivers/dbase/DIndexIter.cxx b/connectivity/source/drivers/dbase/DIndexIter.cxx
index 6fd9812..2a5892a 100644
--- a/connectivity/source/drivers/dbase/DIndexIter.cxx
+++ b/connectivity/source/drivers/dbase/DIndexIter.cxx
@@ -19,7 +19,6 @@
#include "dbase/DIndexIter.hxx"
#include <com/sun/star/sdb/SQLFilterOperator.hpp>
-#include <tools/string.hxx>
using namespace ::com::sun::star::sdb;
using namespace connectivity;
diff --git a/connectivity/source/drivers/file/FDatabaseMetaData.cxx b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
index c233c59..058d508 100644
--- a/connectivity/source/drivers/file/FDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
@@ -27,7 +27,6 @@
#include <com/sun/star/ucb/UniversalContentBroker.hpp>
#include <com/sun/star/ucb/SortedDynamicResultSetFactory.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <tools/string.hxx>
#include <tools/urlobj.hxx>
#include "file/FDriver.hxx"
#include "file/FTable.hxx"
diff --git a/connectivity/source/inc/file/FStatement.hxx b/connectivity/source/inc/file/FStatement.hxx
index 4977591..bab206a 100644
--- a/connectivity/source/inc/file/FStatement.hxx
+++ b/connectivity/source/inc/file/FStatement.hxx
@@ -39,7 +39,6 @@
#include <comphelper/propertycontainer.hxx>
#include "file/fanalyzer.hxx"
#include <comphelper/broadcasthelper.hxx>
-#include <tools/string.hxx>
#include "TSortIndex.hxx"
namespace connectivity
diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx
index 87db7c1..cbab39c 100644
--- a/include/vcl/edit.hxx
+++ b/include/vcl/edit.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_VCL_EDIT_HXX
#include <tools/solar.h>
-#include <tools/string.hxx>
#include <vcl/dllapi.h>
#include <vcl/timer.hxx>
#include <vcl/ctrl.hxx>
diff --git a/include/vcl/pdfwriter.hxx b/include/vcl/pdfwriter.hxx
index 9971ebd..1f63d37 100644
--- a/include/vcl/pdfwriter.hxx
+++ b/include/vcl/pdfwriter.hxx
@@ -22,7 +22,6 @@
#include <sal/types.h>
#include <tools/gen.hxx>
-#include <tools/string.hxx>
#include <tools/color.hxx>
#include <vcl/dllapi.h>
diff --git a/sd/source/ui/accessibility/AccessiblePresentationShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationShape.cxx
index c4ff853..7d6771e 100644
--- a/sd/source/ui/accessibility/AccessiblePresentationShape.cxx
+++ b/sd/source/ui/accessibility/AccessiblePresentationShape.cxx
@@ -23,7 +23,6 @@
#include "accessibility.hrc"
#include "sdresid.hxx"
-#include <tools/string.hxx>
#include <svx/DescriptionGenerator.hxx>
#include <rtl/ustring.h>
diff --git a/sfx2/inc/pch/precompiled_sfx.hxx b/sfx2/inc/pch/precompiled_sfx.hxx
index e11f7a5..13139d9 100644
--- a/sfx2/inc/pch/precompiled_sfx.hxx
+++ b/sfx2/inc/pch/precompiled_sfx.hxx
@@ -744,7 +744,6 @@
#include <tools/rtti.hxx>
#include <tools/shl.hxx>
#include <tools/stream.hxx>
-#include <tools/string.hxx>
#include <tools/svborder.hxx>
#include <tools/tenccvt.hxx>
#include <tools/time.hxx>
diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx
index 8c903b8..c0c05b0 100644
--- a/sfx2/source/bastyp/sfxhtml.cxx
+++ b/sfx2/source/bastyp/sfxhtml.cxx
@@ -18,7 +18,6 @@
*/
-#include <tools/string.hxx>
#include <tools/urlobj.hxx>
#include <sfx2/objsh.hxx>
diff --git a/vcl/source/edit/textdoc.cxx b/vcl/source/edit/textdoc.cxx
index afe30a8..c2a4b74 100644
--- a/vcl/source/edit/textdoc.cxx
+++ b/vcl/source/edit/textdoc.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <tools/string.hxx>
#include <textdoc.hxx>
#include <stdlib.h>
commit e13b06b129bb8b7860f7f5b2870d337e90512c12
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 13 12:23:26 2014 +0000
ReadUniStringLine never called without explicit length
Change-Id: I1811cf798a9e4b9d2704cccb59213034d2dc2626
diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx
index 1316bc1..320e10b 100644
--- a/include/tools/stream.hxx
+++ b/include/tools/stream.hxx
@@ -436,16 +436,8 @@ public:
@param nMaxCodepointsToRead
Maximum of codepoints (UCS-2 or UTF-16 pairs, not bytes) to
read, if line is longer it will be truncated.
-
- @note NOTE that the default is one character less than STRING_MAXLEN to
- prevent problems after conversion to String that may be lurking in
- various places doing something like
- @code
- for (sal_uInt16 i=0; i < aString.Len(); ++i)
- @endcode
- causing endless loops ...
*/
- bool ReadUniStringLine( OUString& rStr, sal_Int32 nMaxCodepointsToRead = 0xFFFE );
+ bool ReadUniStringLine(OUString& rStr, sal_Int32 nMaxCodepointsToRead);
/** Read a 32bit length prefixed sequence of utf-16 if
eSrcCharSet==RTL_TEXTENCODING_UNICODE, otherwise read a 16bit length
prefixed sequence of bytes and convert from eSrcCharSet */
More information about the Libreoffice-commits
mailing list