[Libreoffice-commits] .: sc/source
sc/source/ui/namedlg/namedefdlg.cxx |2 -
sc/source/ui/src/namedefdlg.src | 54 ++--
sc/source/ui/src/namedlg.src| 48
3 files changed, 52 insertions(+), 52 deletions(-)
New commits:
commit 0b6486772c52d7112e76555fca6525ad2eec2bae
Author: Stefan Knorr (astron) heinzless...@gmail.com
Date: Sat Jan 28 19:52:04 2012 +0100
Make named range dialog more consistent, localizable (II)
diff --git a/sc/source/ui/namedlg/namedefdlg.cxx
b/sc/source/ui/namedlg/namedefdlg.cxx
index 1fad2a6..4b98947 100644
--- a/sc/source/ui/namedlg/namedefdlg.cxx
+++ b/sc/source/ui/namedlg/namedefdlg.cxx
@@ -346,7 +346,7 @@ void ScNameDefDlg::MorePushed()
Size nSize = GetSizePixel();
//depending on the state of the button, move all elements below up/down
-long nPixel = 75;
+long nPixel = 65;
if (!maBtnMore.GetState())
{
nPixel *= -1;
diff --git a/sc/source/ui/src/namedefdlg.src b/sc/source/ui/src/namedefdlg.src
index 42538dd..65de9e5 100644
--- a/sc/source/ui/src/namedefdlg.src
+++ b/sc/source/ui/src/namedefdlg.src
@@ -34,117 +34,117 @@ ModelessDialog RID_SCDLG_NAMES_DEFINE
HelpId = CMD_FID_ADD_NAME ;
Hide = TRUE ;
SVLook = TRUE ;
-Size = MAP_APPFONT ( 200 , 120 ) ;
+Size = MAP_APPFONT ( 200 , 116 ) ;
Text [ en-US ] = Define Name ;
Moveable = TRUE ;
Closeable = TRUE;
PushButton BTN_ADD
{
-Pos = MAP_APPFONT( 90, 100 );
+Pos = MAP_APPFONT( 90, 96 );
Size = MAP_APPFONT( 50, 15 );
TabStop = TRUE;
Text [en-US] = Add;
};
PushButton BTN_CANCEL
{
-Pos = MAP_APPFONT( 145, 100 );
+Pos = MAP_APPFONT( 145, 96 );
Size = MAP_APPFONT ( 50, 15 );
TabStop = TRUE;
Text [en-US] = Cancel;
};
CheckBox BTN_MORE
{
-Pos = MAP_APPFONT( 5, 82 );
+Pos = MAP_APPFONT( 5, 81 );
Size = MAP_APPFONT( 80, 15 );
Text [en-US] = Range Options;
};
FixedText FT_INFO
{
Pos = MAP_APPFONT( 5, 5 );
-Size = MAP_APPFONT( 180, 15 );
+Size = MAP_APPFONT( 190, 15 );
};
FixedText FT_NAME
{
-Pos = MAP_APPFONT( 5, 25 );
-Size = MAP_APPFONT( 30, 15 );
+Pos = MAP_APPFONT( 5, 27 );
+Size = MAP_APPFONT( 40, 13 );
Text [en-US] = Name;
};
FixedText FT_RANGE
{
Pos = MAP_APPFONT( 5, 45 );
-Size = MAP_APPFONT( 30, 15 );
+Size = MAP_APPFONT( 40, 13 );
Text [en-US] = Range;
};
FixedText FT_SCOPE
{
-Pos = MAP_APPFONT( 5, 65 );
-Size = MAP_APPFONT( 30, 15 );
+Pos = MAP_APPFONT( 5, 63 );
+Size = MAP_APPFONT( 40, 13 );
Text [en-US] = Scope;
};
Edit ED_NAME
{
Border = TRUE;
-Pos = MAP_APPFONT( 40, 25 );
-Size = MAP_APPFONT( 155, 15 );
+Pos = MAP_APPFONT( 50, 25 );
+Size = MAP_APPFONT( 145, 13 );
TabStop = TRUE;
};
Edit ED_RANGE
{
Border = TRUE;
-Pos = MAP_APPFONT( 40, 45 );
-Size = MAP_APPFONT( 140, 15 );
+Pos = MAP_APPFONT( 50, 43 );
+Size = MAP_APPFONT( 130, 13 );
TabStop = TRUE;
};
ImageButton RB_RANGE
{
-Pos = MAP_APPFONT ( 180 , 45 ) ;
-Size = MAP_APPFONT ( 15 , 15 ) ;
+Pos = MAP_APPFONT ( 180 , 43 ) ;
+Size = MAP_APPFONT ( 15 , 13 ) ;
TabStop = TRUE ;
QuickHelpText [ en-US ] = Shrink ;
};
CheckBox BTN_PRINTAREA
{
HelpID = sc:CheckBox:RID_SCDLG_NAMES:BTN_PRINTAREA;
-Pos = MAP_APPFONT ( 5 , 100 ) ;
-Size = MAP_APPFONT ( 80 , 15 ) ;
+Pos = MAP_APPFONT ( 5 , 94 ) ;
+Size = MAP_APPFONT ( 80 , 10 ) ;
Text [ en-US ] = ~Print range ;
TabStop = TRUE ;
};
CheckBox BTN_CRITERIA
{
HelpID = sc:CheckBox:RID_SCDLG_NAMES:BTN_CRITERIA;
-Pos = MAP_APPFONT ( 5 , 120 ) ;
-Size = MAP_APPFONT ( 60 , 15 ) ;
+Pos = MAP_APPFONT ( 5 , 107 ) ;
+Size = MAP_APPFONT ( 60 , 10 ) ;
Text [ en-US ] = ~Filter ;
TabStop = TRUE ;
};
CheckBox BTN_ROWHEADER
{
HelpID = sc:CheckBox:RID_SCDLG_NAMES:BTN_ROWHEADER;
-Pos = MAP_APPFONT ( 110, 120 ) ;
-Size = MAP_APPFONT ( 82 , 15 ) ;
+Pos = MAP_APPFONT ( 110, 107 ) ;
+Size = MAP_APPFONT ( 82 , 10 ) ;
Text [ en-US ] = Repeat ~row ;
TabStop = TRUE ;
};
CheckBox BTN_COLHEADER
{
HelpID = sc:CheckBox:RID_SCDLG_NAMES:BTN_COLHEADER;
-Pos = MAP_APPFONT ( 110 , 100 ) ;
-Size = MAP_APPFONT ( 82 , 15 ) ;
+Pos = MAP_APPFONT ( 110 , 94 ) ;
+Size = MAP_APPFONT ( 82 , 10 ) ;
Text [ en-US ] = Repeat ~column ;
TabStop = TRUE ;
};
ListBox LB_SCOPE
{
Border = TRUE;
-Pos =
[Libreoffice-commits] .: sc/source
sc/source/ui/src/globstr.src |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e70541dc4627d63f294837f3eefc1cc25398b703
Author: Albert Thuswaldner albert.thuswald...@gmail.com
Date: Mon Jan 30 09:59:40 2012 +0100
Updated error message for Invalid sheet name
diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src
index a5a1e6a..18e924b 100644
--- a/sc/source/ui/src/globstr.src
+++ b/sc/source/ui/src/globstr.src
@@ -687,7 +687,7 @@ Resource RID_GLOBSTR
};
String STR_INVALIDTABNAME
{
-Text [ en-US ] = Invalid sheet name. ;
+Text [ en-US ] = Invalid sheet name.\nThe sheet name must not be a
duplicate of an existing name \nand may not contain the characters [ ] * ? /
\\ ;
};
String STR_SCENARIO
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: writerperfect/source
writerperfect/source/filter/OdgGenerator.cxx | 14 ++
1 file changed, 14 insertions(+)
New commits:
commit dc6953f932ffbddd5168f039e58075789b91b98b
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Mon Jan 30 11:31:32 2012 +0100
Initial support for quadratic beziers
diff --git a/writerperfect/source/filter/OdgGenerator.cxx
b/writerperfect/source/filter/OdgGenerator.cxx
index 79722e8..6d58aa4 100644
--- a/writerperfect/source/filter/OdgGenerator.cxx
+++ b/writerperfect/source/filter/OdgGenerator.cxx
@@ -858,6 +858,13 @@ void OdgGeneratorPrivate::_drawPath(const
WPXPropertyListVector path)
qx = (qx path[k][svg:x2]-getDouble()) ?
path[k][svg:x2]-getDouble() : qx;
qy = (qy path[k][svg:y2]-getDouble()) ?
path[k][svg:y2]-getDouble() : qy;
}
+if(path[k][libwpg:path-action]-getStr() == Q)
+{
+px = (px path[k][svg:x1]-getDouble()) ?
path[k][svg:x1]-getDouble() : px;
+py = (py path[k][svg:y1]-getDouble()) ?
path[k][svg:y1]-getDouble() : py;
+qx = (qx path[k][svg:x1]-getDouble()) ?
path[k][svg:x1]-getDouble() : qx;
+qy = (qy path[k][svg:y1]-getDouble()) ?
path[k][svg:y1]-getDouble() : qy;
+}
if(path[k][libwpg:path-action]-getStr() == A)
{
double xmin, xmax, ymin, ymax;
@@ -924,6 +931,13 @@ void OdgGeneratorPrivate::_drawPath(const
WPXPropertyListVector path)
(unsigned)((path[i][svg:y]-getDouble()-py)*2540));
sValue.append(sElement);
}
+else if (path[i][libwpg:path-action]-getStr() == Q)
+{
+sElement.sprintf(Q%i %i %i %i,
(unsigned)((path[i][svg:x1]-getDouble()-px)*2540),
+
(unsigned)((path[i][svg:y1]-getDouble()-py)*2540),
(unsigned)((path[i][svg:x]-getDouble()-px)*2540),
+
(unsigned)((path[i][svg:y]-getDouble()-py)*2540));
+sValue.append(sElement);
+}
else if (path[i][libwpg:path-action]-getStr() == A)
{
sElement.sprintf(A%i %i %i %i %i %i %i,
(unsigned)((path[i][svg:rx]-getDouble())*2540),
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - desktop/source
desktop/source/migration/migration.cxx | 62 +
1 file changed, 40 insertions(+), 22 deletions(-)
New commits:
commit 305d20133c1418405418a6c698b48eb8114ade5b
Author: Petr Mladek pmla...@suse.cz
Date: Fri Jan 27 18:07:03 2012 +0100
allow to migrate the shared registrymodifications.xcu
LO-3.3 and older wrote configuration into many files under
user/registry/data. LO-3.4 spped up startup by moving these
files into a single /user/registrymodifications.xcu.
officecfg/registry/data/org/openoffice/Setup.xcu defines what registry
nodes are migrated and what are excluded.
Finally, the old migration code detected the name of the .xcu file
by the first entry in IncludedNodes. This fix allows to search
the data in the single registrymodifications.xcu when available.
diff --git a/desktop/source/migration/migration.cxx
b/desktop/source/migration/migration.cxx
index 7520eb8..d7f9765 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -773,33 +773,51 @@ void MigrationImpl::copyConfig() {
}
}
}
+
+// check if the shared registrymodifications.xcu file exists
+bool bRegistryModificationsXcuExists = false;
+rtl::OUString regFilePath(m_aInfo.userdata);
+regFilePath +=
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(/user/registrymodifications.xcu));
+File regFile(regFilePath);
+::osl::FileBase::RC nError = regFile.open(osl_File_OpenFlag_Read);
+if ( nError == ::osl::FileBase::E_None ) {
+bRegistryModificationsXcuExists = true;
+regFile.close();
+}
+
for (Components::const_iterator i(comps.begin()); i != comps.end(); ++i) {
if (!i-second.includedPaths.empty()) {
-rtl::OUStringBuffer buf(m_aInfo.userdata);
-buf.appendAscii(RTL_CONSTASCII_STRINGPARAM(/user/registry/data));
-sal_Int32 n = 0;
-do {
-rtl::OUString seg(i-first.getToken(0, '.', n));
-rtl::OUString enc(
-rtl::Uri::encode(
-seg, rtl_UriCharClassPchar, rtl_UriEncodeStrict,
-RTL_TEXTENCODING_UTF8));
-if (enc.getLength() == 0 seg.getLength() != 0) {
-OSL_TRACE(
-(configuration migration component %s ignored (cannot
- be encoded as file path)),
-rtl::OUStringToOString(
-i-first, RTL_TEXTENCODING_UTF8).getStr());
-goto next;
-}
-buf.append(sal_Unicode('/'));
-buf.append(enc);
-} while (n = 0);
-buf.appendAscii(RTL_CONSTASCII_STRINGPARAM(.xcu));
+if (!bRegistryModificationsXcuExists) {
+// shared registrymodifications.xcu does not exists
+// the configuration is split in many registry files
+// determine the file names from the first element in included
paths
+rtl::OUStringBuffer buf(m_aInfo.userdata);
+
buf.appendAscii(RTL_CONSTASCII_STRINGPARAM(/user/registry/data));
+sal_Int32 n = 0;
+do {
+rtl::OUString seg(i-first.getToken(0, '.', n));
+rtl::OUString enc(
+rtl::Uri::encode(
+seg, rtl_UriCharClassPchar, rtl_UriEncodeStrict,
+RTL_TEXTENCODING_UTF8));
+if (enc.getLength() == 0 seg.getLength() != 0) {
+OSL_TRACE(
+(configuration migration component %s ignored
(cannot
+ be encoded as file path)),
+rtl::OUStringToOString(
+i-first, RTL_TEXTENCODING_UTF8).getStr());
+goto next;
+}
+buf.append(sal_Unicode('/'));
+buf.append(enc);
+} while (n = 0);
+buf.appendAscii(RTL_CONSTASCII_STRINGPARAM(.xcu));
+regFilePath = buf.toString();
+}
configuration::Update::get(
comphelper::getProcessComponentContext())-
insertModificationXcuFile(
-buf.makeStringAndClear(),
setToSeq(i-second.includedPaths),
+regFilePath, setToSeq(i-second.includedPaths),
setToSeq(i-second.excludedPaths));
} else {
OSL_TRACE(
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - officecfg/registry
officecfg/registry/data/org/openoffice/Setup.xcu |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fcc91f9df71c2b5f06e5cd0729f4cc0fed6b1ded Author: Andras Timar ati...@suse.com Date: Fri Jan 27 19:25:32 2012 +0100 use the correct application icon of Writer/Web under Windows diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu b/officecfg/registry/data/org/openoffice/Setup.xcu index 237e824..4163b1b 100644 --- a/officecfg/registry/data/org/openoffice/Setup.xcu +++ b/officecfg/registry/data/org/openoffice/Setup.xcu @@ -454,7 +454,7 @@ value /value /prop prop oor:name=ooSetupFactoryIcon -value 1/value +value 11/value /prop prop oor:name=ooSetupFactoryTemplateFile value /value ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5-0' - sc/source
sc/source/core/data/column3.cxx | 29 ++---
1 file changed, 22 insertions(+), 7 deletions(-)
New commits:
commit 2d930ae25bb1ca90d0c186e7f34407bf1adfa54d
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Thu Jan 26 15:47:52 2012 -0500
fdo#44143: Keep cells with broadcasters alive during deletion.
Or else it would partially break formula reference chain.
(cherry picked from commit 41e92ab2b7a8fcb7f5738f656bdac47bc0847f29)
Signed-off-by: Eike Rathke er...@redhat.com
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index fbeb951..5d96af1 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -35,6 +35,7 @@
#include sfx2/objsh.hxx
#include svl/zforlist.hxx
#include svl/zformat.hxx
+#include svl/broadcast.hxx
#include scitems.hxx
#include column.hxx
@@ -465,14 +466,25 @@ void ScColumn::DeleteRange( SCSIZE nStartIndex, SCSIZE
nEndIndex, sal_uInt16 nDe
if (bDelete)
{
// try to create a replacement note cell, if note or
broadcaster exists
-ScNoteCell* pNoteCell = 0;
-if (eCellType != CELLTYPE_NOTE)
+ScNoteCell* pNoteCell = NULL;
+SvtBroadcaster* pBC = pOldCell-GetBroadcaster();
+bool bKeepBC = pBC pBC-HasListeners();
+if (eCellType == CELLTYPE_NOTE)
+{
+if (bKeepBC)
+{
+// We need to keep this note cell to keep the
broadcaster.
+pNoteCell = static_castScNoteCell*(pOldCell);
+if (bDeleteNote)
+pOldCell-DeleteNote();
+}
+}
+else
{
// do not rescue note if it has to be deleted according to
passed flags
ScPostIt* pNote = bDeleteNote ? 0 :
pOldCell-ReleaseNote();
// #i99844# do not release broadcaster from old cell, it
still has to notify deleted content
-SvtBroadcaster* pBC = pOldCell-GetBroadcaster();
-if( pNote || pBC )
+if (pNote || bKeepBC)
pNoteCell = new ScNoteCell( pNote, pBC );
}
@@ -498,9 +510,12 @@ void ScColumn::DeleteRange( SCSIZE nStartIndex, SCSIZE
nEndIndex, sal_uInt16 nDe
aHint.GetAddress().SetRow( nOldRow );
aHint.SetCell( pOldCell );
pDocument-Broadcast( aHint );
-// #i99844# after broadcasting, old cell has to forget the
broadcaster (owned by pNoteCell)
-pOldCell-ReleaseBroadcaster();
-pOldCell-Delete();
+if (pNoteCell != pOldCell)
+{
+// #i99844# after broadcasting, old cell has to forget
the broadcaster (owned by pNoteCell)
+pOldCell-ReleaseBroadcaster();
+pOldCell-Delete();
+}
}
}
else
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - cui/source svtools/inc svtools/source
cui/source/tabpages/border.src |2 +-
svtools/inc/svtools/ctrlbox.hxx|4
svtools/source/control/ctrlbox.cxx |2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 2f23703cf6b2f1e5b28b5d5153e3f247ff3aa223
Author: Michael Stahl mst...@redhat.com
Date: Fri Jan 27 23:44:26 2012 +0100
SvxBorderTabPage: the minimal border width is 1 twip
Signed-off-by: Noel Power noel.po...@novell.com
diff --git a/cui/source/tabpages/border.src b/cui/source/tabpages/border.src
index 8496f18..45b412d 100644
--- a/cui/source/tabpages/border.src
+++ b/cui/source/tabpages/border.src
@@ -116,7 +116,7 @@ TabPage RID_SVXPAGE_BORDER
First = 25 ;
Last = 900 ;
Maximum = 900 ;
-Minimum = 25 ;
+Minimum = 5 ;
DecimalDigits = 2 ;
Unit = FUNIT_POINT ;
};
commit 4362a5d2cebfcb0146fd61ba82147d2195485338
Author: Michael Stahl mst...@redhat.com
Date: Fri Jan 27 23:45:53 2012 +0100
svtools: LineListBox: fix handling of none style
This was erroneously mapped to SOLID, thus effectively preventing the
removal of borders via the list box.
Signed-off-by: Noel Power noel.po...@novell.com
diff --git a/svtools/inc/svtools/ctrlbox.hxx b/svtools/inc/svtools/ctrlbox.hxx
index 3ab9e31..1174beb 100644
--- a/svtools/inc/svtools/ctrlbox.hxx
+++ b/svtools/inc/svtools/ctrlbox.hxx
@@ -48,9 +48,13 @@ typedef ::std::vector ImplColorListData* ImpColorList;
typedef ::std::vector ImpLineListData* ImpLineList;
typedef ::std::vector ImplFontNameListData* ImplFontList;
+// FIXME: STYLE_* duplicate values from editeng::SvxBorderStyle,
+// which in turn duplicates values from com::sun::star::table::BorderLineStyle:
+// this needs cleaning up on master
#define STYLE_SOLID( ( sal_uInt16 ) 0 )
#define STYLE_DOTTED ( ( sal_uInt16 ) 1 )
#define STYLE_DASHED ( ( sal_uInt16 ) 2 )
+#define STYLE_NONE ( ( sal_uInt16 ) -1)
#define CHANGE_LINE1 ( ( sal_uInt16 ) 1 )
#define CHANGE_LINE2 ( ( sal_uInt16 ) 2 )
diff --git a/svtools/source/control/ctrlbox.cxx
b/svtools/source/control/ctrlbox.cxx
index cf7df79..6d8db08 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -879,7 +879,7 @@ long LineListBox::GetEntryDistance( sal_uInt16 nPos ) const
sal_uInt16 LineListBox::GetEntryStyle( sal_uInt16 nPos ) const
{
ImpLineListData* pData = (nPos pLineList-size()) ? (*pLineList)[ nPos ]
: NULL;
-return ( pData ) ? pData-GetStyle() : STYLE_SOLID;
+return ( pData ) ? pData-GetStyle() : STYLE_NONE;
}
// ---
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - cui/source
cui/source/tabpages/border.src |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 27e607c744bd8cbb26b8a6bdf42384eb4f77888c Author: Michael Stahl mst...@redhat.com Date: Fri Jan 27 23:44:26 2012 +0100 SvxBorderTabPage: the minimal border width is 1 twip Signed-off-by: Noel Power noel.po...@novell.com diff --git a/cui/source/tabpages/border.src b/cui/source/tabpages/border.src index 10599d5..d1372c3 100644 --- a/cui/source/tabpages/border.src +++ b/cui/source/tabpages/border.src @@ -116,7 +116,7 @@ TabPage RID_SVXPAGE_BORDER First = 25 ; Last = 900 ; Maximum = 900 ; -Minimum = 25 ; +Minimum = 5 ; DecimalDigits = 2 ; Unit = FUNIT_POINT ; }; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - editeng/qa editeng/source
editeng/qa/items/borderline_test.cxx |2 +-
editeng/source/items/borderline.cxx | 21 ++---
2 files changed, 19 insertions(+), 4 deletions(-)
New commits:
commit ed41167d5ffae11efdd9cb43b2d88a8147e6d13f
Author: Michael Stahl mst...@redhat.com
Date: Wed Jan 25 22:43:39 2012 +0100
fdo#38542: SvxBorderLine::GuessLinesWidths:
Importing style:border-line-width=0.002cm 0.088cm 0.141cm (which older
OOo/LO apparently could write) fails, because GuessLinesWidths can't find
a matching style (result: standard double border, 3 equal width parts).
Try to create a custom BorderWidthImpl of type DOUBLE instead, that
preserves the individual widths.
Signed-off-by: Cédric Bosdonnat cedric.bosdonnat@free.fr
Signed-off-by: Noel Power noel.po...@novell.com
diff --git a/editeng/qa/items/borderline_test.cxx
b/editeng/qa/items/borderline_test.cxx
index 5d67b62..05172d6 100644
--- a/editeng/qa/items/borderline_test.cxx
+++ b/editeng/qa/items/borderline_test.cxx
@@ -85,7 +85,7 @@ void BorderLineTest::testGuessWidthNoMatch()
line.GuessLinesWidths( DOUBLE,
TEST_WIDTH + 1, TEST_WIDTH + 2, TEST_WIDTH + 3 );
CPPUNIT_ASSERT_EQUAL( DOUBLE, line.GetStyle() );
-CPPUNIT_ASSERT_EQUAL( long( 0 ), line.GetWidth() );
+CPPUNIT_ASSERT_EQUAL( long( (3 * TEST_WIDTH) + 6 ), line.GetWidth() );
}
void BorderLineTest::testGuessWidthThinthickSmallgap()
diff --git a/editeng/source/items/borderline.cxx
b/editeng/source/items/borderline.cxx
index de24284..88adf29 100644
--- a/editeng/source/items/borderline.cxx
+++ b/editeng/source/items/borderline.cxx
@@ -279,10 +279,25 @@ void SvxBorderLine::GuessLinesWidths( SvxBorderStyle
nStyle, sal_uInt16 nOut, sa
// If anything matched, then set it
if ( nWidth 0 )
+{
nStyle = nTestStyle;
-
-SetStyle( nStyle );
-m_nWidth = nWidth;
+SetStyle( nStyle );
+m_nWidth = nWidth;
+}
+else
+{
+// fdo#38542: not a known double, default to something custom...
+SetStyle( nStyle );
+m_nWidth = nOut + nIn + nDist;
+if (nOut + nIn + nDist)
+{
+m_aWidthImpl = BorderWidthImpl(
+CHANGE_LINE1 | CHANGE_LINE2 | CHANGE_DIST,
+static_castdouble(nOut ) / static_castdouble(m_nWidth),
+static_castdouble(nIn ) / static_castdouble(m_nWidth),
+static_castdouble(nDist) /
static_castdouble(m_nWidth));
+}
+}
}
else
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - svtools/inc svtools/source
svtools/inc/svtools/ctrlbox.hxx|4
svtools/source/control/ctrlbox.cxx |2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
New commits:
commit c59ecb9a758cb61f1b146d8a844030fcd085eb65
Author: Michael Stahl mst...@redhat.com
Date: Fri Jan 27 23:45:53 2012 +0100
svtools: LineListBox: fix handling of none style
This was erroneously mapped to SOLID, thus effectively preventing the
removal of borders via the list box.
Signed-off-by: Noel Power noel.po...@novell.com
diff --git a/svtools/inc/svtools/ctrlbox.hxx b/svtools/inc/svtools/ctrlbox.hxx
index 267a104..8813820 100644
--- a/svtools/inc/svtools/ctrlbox.hxx
+++ b/svtools/inc/svtools/ctrlbox.hxx
@@ -47,9 +47,13 @@ typedef ::std::vector ImplColorListData* ImpColorList;
typedef ::std::vector ImpLineListData* ImpLineList;
typedef ::std::vector ImplFontNameListData* ImplFontList;
+// FIXME: STYLE_* duplicate values from editeng::SvxBorderStyle,
+// which in turn duplicates values from com::sun::star::table::BorderLineStyle:
+// this needs cleaning up on master
#define STYLE_SOLID( ( sal_uInt16 ) 0 )
#define STYLE_DOTTED ( ( sal_uInt16 ) 1 )
#define STYLE_DASHED ( ( sal_uInt16 ) 2 )
+#define STYLE_NONE ( ( sal_uInt16 ) -1)
#define CHANGE_LINE1 ( ( sal_uInt16 ) 1 )
#define CHANGE_LINE2 ( ( sal_uInt16 ) 2 )
diff --git a/svtools/source/control/ctrlbox.cxx
b/svtools/source/control/ctrlbox.cxx
index 70a040e..68047af 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -866,7 +866,7 @@ long LineListBox::GetEntryDistance( sal_uInt16 nPos ) const
sal_uInt16 LineListBox::GetEntryStyle( sal_uInt16 nPos ) const
{
ImpLineListData* pData = (nPos pLineList-size()) ? (*pLineList)[ nPos ]
: NULL;
-return ( pData ) ? pData-GetStyle() : STYLE_SOLID;
+return ( pData ) ? pData-GetStyle() : STYLE_NONE;
}
// ---
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - 2 commits - sw/source
sw/source/filter/xml/xmlithlp.cxx | 35 ++-
1 file changed, 22 insertions(+), 13 deletions(-)
New commits:
commit fcdf6cde90c7f9f941a5664d4b0866adcfab5db9
Author: Michael Stahl mst...@redhat.com
Date: Wed Jan 25 17:56:08 2012 +0100
fdo#38542: sw: ODF import: prevent border width overriding:
If there is a width in fo:border{,-left,-right,-top,-bottom}, then
it should not override the values from
style:border-line-width{,-left,-right,-top,-bottom}, which are more
specific in case of double borders.
Signed-off-by: Cédric Bosdonnat cedric.bosdonnat@free.fr
Signed-off-by: Noel Power noel.po...@novell.com
diff --git a/sw/source/filter/xml/xmlithlp.cxx
b/sw/source/filter/xml/xmlithlp.cxx
index 7946b81..6fe9072 100644
--- a/sw/source/filter/xml/xmlithlp.cxx
+++ b/sw/source/filter/xml/xmlithlp.cxx
@@ -198,23 +198,28 @@ sal_Bool lcl_frmitems_setXMLBorder( SvxBorderLine*
rpLine,
sal_Bool bDouble = (bHasWidth API_LINE_DOUBLE == nStyle ) ||
rpLine-GetDistance();
- // The width has to be changed
- if( bHasWidth USHRT_MAX != nNamedWidth )
+ // fdo#38542: for double borders, do not override the width
+ // set via style:border-line-width{,-left,-right,-top,-bottom}
+ if (!bDouble || !rpLine-GetWidth())
{
- if ( bDouble )
- rpLine-SetStyle( ::editeng::DOUBLE );
- rpLine-SetWidth( aBorderWidths[nNamedWidth] );
- }
- else
- {
- if( !bHasWidth )
- nWidth = rpLine-GetInWidth() + rpLine-GetDistance() +
- rpLine-GetOutWidth();
-
- rpLine-SetWidth( nWidth );
- if (bDouble)
- { // fdo#38542: divide width by 3 for outer line, gap, inner line
- rpLine-ScaleMetrics(1, 3);
+ // The width has to be changed
+ if (bHasWidth USHRT_MAX != nNamedWidth)
+ {
+ if (bDouble)
+ rpLine-SetStyle( ::editeng::DOUBLE );
+ rpLine-SetWidth( aBorderWidths[nNamedWidth] );
+ }
+ else
+ {
+ if (!bHasWidth)
+ nWidth = rpLine-GetInWidth() + rpLine-GetDistance() +
+ rpLine-GetOutWidth();
+
+ rpLine-SetWidth( nWidth );
+ if (bDouble)
+ { // fdo#38542: divide width by 3 for outer line, gap, inner
line
+ rpLine-ScaleMetrics(1, 3);
+ }
}
}
lcl_frmitems_setXMLBorderStyle( *rpLine, nStyle );
commit 8e184c376ce77b3c27d7a2722b15b8f36de71ea5
Author: Michael Stahl mst...@redhat.com
Date: Wed Jan 25 17:44:36 2012 +0100
fdo#38542: sw: ODF import: divide width by 3 for double borders
The problem is that the width from the fo:border{,-left,-right,-top,-bottom}
attributes is effectively tripled for double borders.
Signed-off-by: Cédric Bosdonnat cedric.bosdonnat@free.fr
Signed-off-by: Noel Power noel.po...@novell.com
diff --git a/sw/source/filter/xml/xmlithlp.cxx
b/sw/source/filter/xml/xmlithlp.cxx
index 6a50937..7946b81 100644
--- a/sw/source/filter/xml/xmlithlp.cxx
+++ b/sw/source/filter/xml/xmlithlp.cxx
@@ -212,6 +212,10 @@ sal_Bool lcl_frmitems_setXMLBorder( SvxBorderLine* rpLine,
rpLine-GetOutWidth();
rpLine-SetWidth( nWidth );
+ if (bDouble)
+ { // fdo#38542: divide width by 3 for outer line, gap, inner line
+ rpLine-ScaleMetrics(1, 3);
+ }
}
lcl_frmitems_setXMLBorderStyle( *rpLine, nStyle );
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: basctl/source dbaccess/source sw/source
basctl/source/basicide/baside2b.cxx|4 ++--
dbaccess/source/ui/control/sqledit.cxx |4 ++--
sw/source/ui/docvw/srcedtw.cxx |4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit a1275f841a1ca601cadd2e6ec130af0703a328e5
Author: Korrawit Pruegsanusak detective.conan.1...@gmail.com
Date: Sun Jan 29 18:20:29 2012 +0700
use SAL_CALL - fix bulid in msvc
diff --git a/basctl/source/basicide/baside2b.cxx
b/basctl/source/basicide/baside2b.cxx
index 107c853..a1f0766 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -158,13 +158,13 @@ public:
private:
virtual ~ChangesListener() {}
-virtual void disposing(lang::EventObject const ) throw (RuntimeException)
+virtual void SAL_CALL disposing(lang::EventObject const ) throw
(RuntimeException)
{
osl::MutexGuard g(editor_.mutex_);
editor_.notifier_.clear();
}
-virtual void propertiesChange(
+virtual void SAL_CALL propertiesChange(
Sequence beans::PropertyChangeEvent const ) throw
(RuntimeException)
{
SolarMutexGuard g;
diff --git a/dbaccess/source/ui/control/sqledit.cxx
b/dbaccess/source/ui/control/sqledit.cxx
index 4fe5224..5a47883 100644
--- a/dbaccess/source/ui/control/sqledit.cxx
+++ b/dbaccess/source/ui/control/sqledit.cxx
@@ -66,14 +66,14 @@ public:
private:
virtual ~ChangesListener() {}
-virtual void disposing(css::lang::EventObject const )
+virtual void SAL_CALL disposing(css::lang::EventObject const )
throw (css::uno::RuntimeException)
{
osl::MutexGuard g(editor_.m_mutex);
editor_.m_notifier.clear();
}
-virtual void propertiesChange(
+virtual void SAL_CALL propertiesChange(
css::uno::Sequence css::beans::PropertyChangeEvent const )
throw (css::uno::RuntimeException)
{
diff --git a/sw/source/ui/docvw/srcedtw.cxx b/sw/source/ui/docvw/srcedtw.cxx
index 07c1c81..91dbf07 100644
--- a/sw/source/ui/docvw/srcedtw.cxx
+++ b/sw/source/ui/docvw/srcedtw.cxx
@@ -231,14 +231,14 @@ public:
private:
virtual ~ChangesListener() {}
-virtual void disposing(css::lang::EventObject const )
+virtual void SAL_CALL disposing(css::lang::EventObject const )
throw (css::uno::RuntimeException)
{
osl::MutexGuard g(editor_.mutex_);
editor_.notifier_.clear();
}
-virtual void propertiesChange(
+virtual void SAL_CALL propertiesChange(
css::uno::Sequence css::beans::PropertyChangeEvent const )
throw (css::uno::RuntimeException)
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sal/systools
sal/systools/win32/uwinapi/uwinapi.dxp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b572ebecf0b04288870d3a22fb8828dcf091d03d Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Sat Jan 28 13:49:16 2012 +0100 Avoid accidental linking with GetShortPathNameW from uwinapi.dll Signed-off-by: Noel Power noel.po...@novell.com diff --git a/sal/systools/win32/uwinapi/uwinapi.dxp b/sal/systools/win32/uwinapi/uwinapi.dxp index 0eeb2a3..ff5bc44 100755 --- a/sal/systools/win32/uwinapi/uwinapi.dxp +++ b/sal/systools/win32/uwinapi/uwinapi.dxp @@ -22,4 +22,4 @@ ; ;* -GetShortPathNameW +GetShortPathNameW PRIVATE ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5-0' - officecfg/registry
officecfg/registry/data/org/openoffice/Setup.xcu |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 11a8220e2fa6be14ca99d42b7f191d16813ed10d Author: Andras Timar ati...@suse.com Date: Fri Jan 27 19:25:32 2012 +0100 use the correct application icon of Writer/Web under Windows (cherry picked from commit fcc91f9df71c2b5f06e5cd0729f4cc0fed6b1ded) Signed-off-by: Stephan Bergmann sberg...@redhat.com diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu b/officecfg/registry/data/org/openoffice/Setup.xcu index 237e824..4163b1b 100644 --- a/officecfg/registry/data/org/openoffice/Setup.xcu +++ b/officecfg/registry/data/org/openoffice/Setup.xcu @@ -454,7 +454,7 @@ value /value /prop prop oor:name=ooSetupFactoryIcon -value 1/value +value 11/value /prop prop oor:name=ooSetupFactoryTemplateFile value /value ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5-0' - sal/systools
sal/systools/win32/uwinapi/uwinapi.dxp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3f1cbd260f1d73be1c0cdd7129829ff1a03db629 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Sat Jan 28 13:49:16 2012 +0100 Avoid accidental linking with GetShortPathNameW from uwinapi.dll Signed-off-by: Noel Power noel.po...@novell.com Signed-off-by: Michael Meeks michael.me...@suse.com diff --git a/sal/systools/win32/uwinapi/uwinapi.dxp b/sal/systools/win32/uwinapi/uwinapi.dxp index 0eeb2a3..ff5bc44 100755 --- a/sal/systools/win32/uwinapi/uwinapi.dxp +++ b/sal/systools/win32/uwinapi/uwinapi.dxp @@ -22,4 +22,4 @@ ; ;* -GetShortPathNameW +GetShortPathNameW PRIVATE ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - oox/source sal/inc starmath/source
oox/source/mathml/importutils.cxx | 56 --
sal/inc/sal/log-areas.dox |8 +
starmath/source/ooxmlexport.cxx | 15 +-
starmath/source/ooxmlimport.cxx |7 ++--
4 files changed, 44 insertions(+), 42 deletions(-)
New commits:
commit 74ded8e619cac076e8fbf4ea547d61e055e7e3ce
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Mon Jan 30 14:09:17 2012 +0100
add log areas
diff --git a/sal/inc/sal/log-areas.dox b/sal/inc/sal/log-areas.dox
index 9dfe176..5c10567 100644
--- a/sal/inc/sal/log-areas.dox
+++ b/sal/inc/sal/log-areas.dox
@@ -13,9 +13,17 @@ a new area, use it and add it to the list in the proper
section with an explanat
This list should give you an overview of which areas to enable when debugging
certain functionality.
+@section oox
+
+@li oox.xmlstream - XmlStream class
+
@section Writer
@li sw.uno - Writer's UNO interfaces
@li sw.ww8 - .doc/.docx export filter, .doc import filter (not writerfilter)
+@section StarMath
+
+@li starmath.ooxml - OOXML export/import support
+
*/
commit 0843da18a6da6f01c6ad8d141a741c92e857d66e
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Mon Jan 30 14:07:42 2012 +0100
fprintf - SAL_INFO
diff --git a/oox/source/mathml/importutils.cxx
b/oox/source/mathml/importutils.cxx
index 55eb1fa..23db8f2 100644
--- a/oox/source/mathml/importutils.cxx
+++ b/oox/source/mathml/importutils.cxx
@@ -35,20 +35,15 @@
#include oox/token/tokenmap.hxx
#include oox/token/tokens.hxx
#include oox/token/namespaces.hxx
+#include rtl/oustringostreaminserter.hxx
#include rtl/string.hxx
// *sigh*
#define STR( str ) OUString( RTL_CONSTASCII_USTRINGPARAM( str ))
-#define CSTR( str ) ( rtl::OUStringToOString( str, RTL_TEXTENCODING_UTF8
).getStr())
#define OPENING( token ) XML_STREAM_OPENING( token )
#define CLOSING( token ) XML_STREAM_CLOSING( token )
-// HACK - TODO convert to the real debug stuff
-#undef SAL_LOG_LEVEL
-#define SAL_LOG_LEVEL 2
-
-
using namespace com::sun::star;
using rtl::OUString;
@@ -84,7 +79,6 @@ AttributeListBuilder::AttributeListBuilder( const
uno::Reference xml::sax::XFas
}
}
-#if 0
static OUString tokenToString( int token )
{
OUString tokenname = StaticTokenMap::get().getUnicodeTokenName( token
TOKEN_MASK );
@@ -117,7 +111,6 @@ static OUString tokenToString( int token )
// just the name itself, not specified whether opening or closing
return namespacename + STR( : ) + tokenname;
}
-#endif
} // namespace
@@ -145,7 +138,7 @@ bool XmlStream::AttributeList::attribute( int token, bool
def ) const
if( find-second.equalsIgnoreAsciiCaseAscii( false ) ||
find-second.equalsIgnoreAsciiCaseAscii( off )
|| find-second.equalsIgnoreAsciiCaseAscii( f ) ||
find-second.equalsIgnoreAsciiCaseAscii( 0 ))
return false;
-//fprintf( stderr, Cannot convert \'%s\' to bool.\n, CSTR(
find-second ));
+SAL_WARN( oox.xmlstream, Cannot convert \' find-second \'
to bool. );
}
return def;
}
@@ -157,8 +150,8 @@ sal_Unicode XmlStream::AttributeList::attribute( int token,
sal_Unicode def ) co
{
if( !find-second.isEmpty() )
{
-//if( find-second.getLength() != 1 )
-//fprintf( stderr, Cannot convert \'%s\' to sal_Unicode,
stripping.\n, CSTR( find-second ));
+if( find-second.getLength() != 1 )
+SAL_WARN( oox.xmlstream, Cannot convert \' find-second
\' to sal_Unicode, stripping. );
return find-second[ 0 ];
}
}
@@ -229,7 +222,6 @@ XmlStream::Tag XmlStream::checkTag( int token, bool
optional )
{
// either it's the following tag, or find it
int savedPos = pos;
-#if SAL_LOG_LEVEL = 2
if( optional )
{ // avoid printing debug messages about skipping tags if the optional one
// will not be found and the position will be reset back
@@ -239,7 +231,6 @@ XmlStream::Tag XmlStream::checkTag( int token, bool
optional )
return Tag();
}
}
-#endif
if( currentToken() == token || findTag( token ))
{
Tag ret = currentTag();
@@ -251,7 +242,7 @@ XmlStream::Tag XmlStream::checkTag( int token, bool
optional )
pos = savedPos;
return Tag();
}
-//fprintf( stderr, Expected tag %s not found.\n, CSTR( tokenToString(
token )));
+SAL_WARN( oox.xmlstream, Expected tag tokenToString( token )
not found. );
return Tag();
}
@@ -260,7 +251,7 @@ bool XmlStream::findTag( int token )
return findTagInternal( token, false );
}
-bool XmlStream::findTagInternal( int token, bool /*silent*/ )
+bool XmlStream::findTagInternal( int token, bool silent )
{
int depth = 0;
for(;
@@ -271,20 +262,21 @@ bool XmlStream::findTagInternal( int token, bool
/*silent*/ )
{
if( currentToken() == OPENING( currentToken()))
{
-//if( !silent )
-//fprintf( stderr,
[Libreoffice-commits] .: 2 commits - binfilter/bf_forms binfilter/bf_sc binfilter/bf_starmath binfilter/bf_svtools binfilter/bf_svx binfilter/inc
binfilter/bf_forms/source/component/forms_DatabaseForm.cxx |5 +
binfilter/bf_sc/source/filter/xml/sc_XMLStylesExportHelper.cxx |3 +--
binfilter/bf_sc/source/filter/xml/sc_xmlexprt.cxx |3 +--
binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx |3 +--
binfilter/bf_sc/source/ui/unoobj/sc_editsrc.cxx|2 +-
binfilter/bf_starmath/source/starmath_parse.cxx|3 +--
binfilter/bf_starmath/source/starmath_utility.cxx |3 +--
binfilter/bf_svtools/source/items1/svt_slstitm.cxx |6 ++
binfilter/bf_svx/source/editeng/svx_impedit2.cxx |3 +--
binfilter/bf_svx/source/outliner/svx_outliner.cxx |3 +--
binfilter/bf_svx/source/unoedit/svx_unofored.cxx |4 +---
binfilter/bf_svx/source/unoedit/svx_unotext.cxx|3 +--
binfilter/inc/bf_svtools/bf_solar.h|3 +++
13 files changed, 16 insertions(+), 28 deletions(-)
New commits:
commit 06704560cd535895d1a4ac2c9aa680f7422c591d
Author: Caolán McNamara caol...@redhat.com
Date: Mon Jan 30 13:17:16 2012 +
move SWAPSHORT and SWAPLONG into binfilter
diff --git a/binfilter/inc/bf_svtools/bf_solar.h
b/binfilter/inc/bf_svtools/bf_solar.h
index 92c0106..1b0a837 100644
--- a/binfilter/inc/bf_svtools/bf_solar.h
+++ b/binfilter/inc/bf_svtools/bf_solar.h
@@ -76,6 +76,9 @@ typedef sal_uInt32 UINT32; /* typedef unsigned int
UINT32; previousl
#endif /* _SOLAR_NOUINT */
#endif
+#define SWAPSHORT OSL_SWAPWORD
+#define SWAPLONG OSL_SWAPDWORD
+
#endif /* _BF_SOLAR_H */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 04d774e82df6e2730baad4fa6f179816b00479ce
Author: Caolán McNamara caol...@redhat.com
Date: Mon Jan 30 11:31:57 2012 +
conversions for refactored ConvertLineEnd
diff --git a/binfilter/bf_forms/source/component/forms_DatabaseForm.cxx
b/binfilter/bf_forms/source/component/forms_DatabaseForm.cxx
index bdd57df..4f4a420 100644
--- a/binfilter/bf_forms/source/component/forms_DatabaseForm.cxx
+++ b/binfilter/bf_forms/source/component/forms_DatabaseForm.cxx
@@ -970,10 +970,7 @@ void ODatabaseForm::Encode( ::rtl::OUString rString )
const
::rtl::OUString aResult;
// Zeilenendezeichen werden als CR dargestellt
-UniString sConverter = rString;
-sConverter.ConvertLineEnd( LINEEND_CR );
-rString = sConverter;
-
+rString = convertLineEnd(rString, LINEEND_CR);
// Jeden einzelnen Character ueberpruefen
sal_Int32 nStrLen = rString.getLength();
diff --git a/binfilter/bf_sc/source/filter/xml/sc_XMLStylesExportHelper.cxx
b/binfilter/bf_sc/source/filter/xml/sc_XMLStylesExportHelper.cxx
index 463caa3..156d714 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_XMLStylesExportHelper.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_XMLStylesExportHelper.cxx
@@ -318,8 +318,7 @@ void ScMyValidationsContainer::WriteMessage(ScXMLExport
rExport,
{
sal_Int32 i = 0;
::rtl::OUStringBuffer sTemp;
-String sMessage(sOUMessage);
-::rtl::OUString sText (sMessage.ConvertLineEnd(LINEEND_LF));
+::rtl::OUString sText(convertLineEnd(sOUMessage, LINEEND_LF));
sal_Bool bPrevCharWasSpace(sal_True);
while(i sText.getLength())
{
diff --git a/binfilter/bf_sc/source/filter/xml/sc_xmlexprt.cxx
b/binfilter/bf_sc/source/filter/xml/sc_xmlexprt.cxx
index 59e571a..02813dc 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_xmlexprt.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_xmlexprt.cxx
@@ -2327,8 +2327,7 @@ void ScXMLExport::WriteAnnotation(const ScMyCell rMyCell)
sal_Int32 i = 0;
::rtl::OUStringBuffer sTemp;
sal_Bool bPrevCharWasSpace(sal_True);
-String sText(rMyCell.sAnnotationText);
-::rtl::OUString sOUText2 (sText.ConvertLineEnd(LINEEND_LF));
+::rtl::OUString sOUText2(convertLineEnd(rMyCell.sAnnotationText,
LINEEND_LF));
while(i sOUText2.getLength())
{
if (sOUText2[i] == '\n')
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx
b/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx
index e35c515..fbb3546 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx
@@ -652,8 +652,7 @@ using namespace ::com::sun::star;
/*?*/ return FALSE;
/*N*/ }
/*N*/
-/*N*/ String aNewText = rText;
-/*N*/ aNewText.ConvertLineEnd(); //! ist das noetig ???
+/*N*/ String aNewText = convertLineEnd(rText, GetSystemLineEnd()); //! ist
das noetig ???
/*N*/
/*N*/ ScPostIt aNote;
/*N*/ pDoc-GetNote( rPos.Col(), rPos.Row(), rPos.Tab(), aNote );
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_editsrc.cxx
b/binfilter/bf_sc/source/ui/unoobj/sc_editsrc.cxx
index 4bbf3a8..a26cace 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_editsrc.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_editsrc.cxx
[Libreoffice-commits] .: sal/inc
sal/inc/sal/log-areas.dox |1 + 1 file changed, 1 insertion(+) New commits: commit f7aac5d4a5f7da91aae2eef906140df4a522e07f Author: Miklos Vajna vmik...@frugalware.org Date: Mon Jan 30 14:21:10 2012 +0100 sal: add sw.rtf log area diff --git a/sal/inc/sal/log-areas.dox b/sal/inc/sal/log-areas.dox index 5c10567..42a96ae 100644 --- a/sal/inc/sal/log-areas.dox +++ b/sal/inc/sal/log-areas.dox @@ -21,6 +21,7 @@ certain functionality. @li sw.uno - Writer's UNO interfaces @li sw.ww8 - .doc/.docx export filter, .doc import filter (not writerfilter) +@li sw.rtf - .rtf export filter @section StarMath ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5-0' - 2 commits - cui/source svtools/inc svtools/source
cui/source/tabpages/border.src |2 +-
svtools/inc/svtools/ctrlbox.hxx|4
svtools/source/control/ctrlbox.cxx |2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit d0b38a9f9c95106fb6112de0181193e9402a0548
Author: Michael Stahl mst...@redhat.com
Date: Fri Jan 27 23:44:26 2012 +0100
SvxBorderTabPage: the minimal border width is 1 twip
Signed-off-by: Noel Power noel.po...@novell.com
Signed-off-by: Michael Meeks michael.me...@suse.com
Signed-off-by: Petr Mladek pmla...@suse.cz
diff --git a/cui/source/tabpages/border.src b/cui/source/tabpages/border.src
index 8496f18..45b412d 100644
--- a/cui/source/tabpages/border.src
+++ b/cui/source/tabpages/border.src
@@ -116,7 +116,7 @@ TabPage RID_SVXPAGE_BORDER
First = 25 ;
Last = 900 ;
Maximum = 900 ;
-Minimum = 25 ;
+Minimum = 5 ;
DecimalDigits = 2 ;
Unit = FUNIT_POINT ;
};
commit 5a0eecea063d4fb87597fd70b20e8be77cac6fde
Author: Michael Stahl mst...@redhat.com
Date: Fri Jan 27 23:45:53 2012 +0100
svtools: LineListBox: fix handling of none style
This was erroneously mapped to SOLID, thus effectively preventing the
removal of borders via the list box.
Signed-off-by: Noel Power noel.po...@novell.com
Signed-off-by: Michael Meeks michael.me...@suse.com
Signed-off-by: Petr Mladek pmla...@suse.cz
diff --git a/svtools/inc/svtools/ctrlbox.hxx b/svtools/inc/svtools/ctrlbox.hxx
index 3ab9e31..1174beb 100644
--- a/svtools/inc/svtools/ctrlbox.hxx
+++ b/svtools/inc/svtools/ctrlbox.hxx
@@ -48,9 +48,13 @@ typedef ::std::vector ImplColorListData* ImpColorList;
typedef ::std::vector ImpLineListData* ImpLineList;
typedef ::std::vector ImplFontNameListData* ImplFontList;
+// FIXME: STYLE_* duplicate values from editeng::SvxBorderStyle,
+// which in turn duplicates values from com::sun::star::table::BorderLineStyle:
+// this needs cleaning up on master
#define STYLE_SOLID( ( sal_uInt16 ) 0 )
#define STYLE_DOTTED ( ( sal_uInt16 ) 1 )
#define STYLE_DASHED ( ( sal_uInt16 ) 2 )
+#define STYLE_NONE ( ( sal_uInt16 ) -1)
#define CHANGE_LINE1 ( ( sal_uInt16 ) 1 )
#define CHANGE_LINE2 ( ( sal_uInt16 ) 2 )
diff --git a/svtools/source/control/ctrlbox.cxx
b/svtools/source/control/ctrlbox.cxx
index cf7df79..6d8db08 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -879,7 +879,7 @@ long LineListBox::GetEntryDistance( sal_uInt16 nPos ) const
sal_uInt16 LineListBox::GetEntryStyle( sal_uInt16 nPos ) const
{
ImpLineListData* pData = (nPos pLineList-size()) ? (*pLineList)[ nPos ]
: NULL;
-return ( pData ) ? pData-GetStyle() : STYLE_SOLID;
+return ( pData ) ? pData-GetStyle() : STYLE_NONE;
}
// ---
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5-0' - 3 commits - editeng/qa editeng/source sw/source
editeng/qa/items/borderline_test.cxx |2 +-
editeng/source/items/borderline.cxx | 21 ++---
sw/source/filter/xml/xmlithlp.cxx| 35 ++-
3 files changed, 41 insertions(+), 17 deletions(-)
New commits:
commit 9d0756e2be9698f0c567d930fe3b6b36bd147af5
Author: Michael Stahl mst...@redhat.com
Date: Wed Jan 25 22:43:39 2012 +0100
fdo#38542: SvxBorderLine::GuessLinesWidths:
Importing style:border-line-width=0.002cm 0.088cm 0.141cm (which older
OOo/LO apparently could write) fails, because GuessLinesWidths can't find
a matching style (result: standard double border, 3 equal width parts).
Try to create a custom BorderWidthImpl of type DOUBLE instead, that
preserves the individual widths.
Signed-off-by: Cédric Bosdonnat cedric.bosdonnat@free.fr
(cherry picked from commit f05b865607a832cdc1b9b4bfdfd07bcfdc7431cc)
Signed-off-by: Caolán McNamara caol...@redhat.com
diff --git a/editeng/qa/items/borderline_test.cxx
b/editeng/qa/items/borderline_test.cxx
index 80a840c..4b32ec6 100644
--- a/editeng/qa/items/borderline_test.cxx
+++ b/editeng/qa/items/borderline_test.cxx
@@ -106,7 +106,7 @@ void BorderLineTest::testGuessWidthNoMatch()
line.GuessLinesWidths( DOUBLE,
TEST_WIDTH + 1, TEST_WIDTH + 2, TEST_WIDTH + 3 );
CPPUNIT_ASSERT_EQUAL( DOUBLE, line.GetStyle() );
-CPPUNIT_ASSERT_EQUAL( long( 0 ), line.GetWidth() );
+CPPUNIT_ASSERT_EQUAL( long( (3 * TEST_WIDTH) + 6 ), line.GetWidth() );
}
void BorderLineTest::testGuessWidthThinthickSmallgap()
diff --git a/editeng/source/items/borderline.cxx
b/editeng/source/items/borderline.cxx
index e729343..61cecce 100644
--- a/editeng/source/items/borderline.cxx
+++ b/editeng/source/items/borderline.cxx
@@ -277,10 +277,25 @@ void SvxBorderLine::GuessLinesWidths( SvxBorderStyle
nStyle, sal_uInt16 nOut, sa
// If anything matched, then set it
if ( nWidth 0 )
+{
nStyle = nTestStyle;
-
-SetStyle( nStyle );
-m_nWidth = nWidth;
+SetStyle( nStyle );
+m_nWidth = nWidth;
+}
+else
+{
+// fdo#38542: not a known double, default to something custom...
+SetStyle( nStyle );
+m_nWidth = nOut + nIn + nDist;
+if (nOut + nIn + nDist)
+{
+m_aWidthImpl = BorderWidthImpl(
+CHANGE_LINE1 | CHANGE_LINE2 | CHANGE_DIST,
+static_castdouble(nOut ) / static_castdouble(m_nWidth),
+static_castdouble(nIn ) / static_castdouble(m_nWidth),
+static_castdouble(nDist) /
static_castdouble(m_nWidth));
+}
+}
}
else
{
commit b88f689a13550659f3abf6a1282b6e45889194f5
Author: Michael Stahl mst...@redhat.com
Date: Wed Jan 25 17:56:08 2012 +0100
fdo#38542: sw: ODF import: prevent border width overriding:
If there is a width in fo:border{,-left,-right,-top,-bottom}, then
it should not override the values from
style:border-line-width{,-left,-right,-top,-bottom}, which are more
specific in case of double borders.
Signed-off-by: Cédric Bosdonnat cedric.bosdonnat@free.fr
(cherry picked from commit 858d8a4a2312139545e910cc0854c45f5d65a296)
Signed-off-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/filter/xml/xmlithlp.cxx
b/sw/source/filter/xml/xmlithlp.cxx
index f1bfca6..c6c762c 100644
--- a/sw/source/filter/xml/xmlithlp.cxx
+++ b/sw/source/filter/xml/xmlithlp.cxx
@@ -198,23 +198,28 @@ sal_Bool lcl_frmitems_setXMLBorder( SvxBorderLine*
rpLine,
sal_Bool bDouble = (bHasWidth API_LINE_DOUBLE == nStyle ) ||
rpLine-GetDistance();
- // The width has to be changed
- if( bHasWidth USHRT_MAX != nNamedWidth )
+ // fdo#38542: for double borders, do not override the width
+ // set via style:border-line-width{,-left,-right,-top,-bottom}
+ if (!bDouble || !rpLine-GetWidth())
{
- if ( bDouble )
- rpLine-SetStyle( ::editeng::DOUBLE );
- rpLine-SetWidth( aBorderWidths[nNamedWidth] );
- }
- else
- {
- if( !bHasWidth )
- nWidth = rpLine-GetInWidth() + rpLine-GetDistance() +
- rpLine-GetOutWidth();
-
- rpLine-SetWidth( nWidth );
- if (bDouble)
- { // fdo#38542: divide width by 3 for outer line, gap, inner line
- rpLine-ScaleMetrics(1, 3);
+ // The width has to be changed
+ if (bHasWidth USHRT_MAX != nNamedWidth)
+ {
+ if (bDouble)
+ rpLine-SetStyle( ::editeng::DOUBLE );
+ rpLine-SetWidth( aBorderWidths[nNamedWidth] );
+ }
+ else
+ {
+ if (!bHasWidth)
+ nWidth = rpLine-GetInWidth() + rpLine-GetDistance() +
+
[Libreoffice-commits] .: Branch 'feature/android' - vcl/android
vcl/android/androidinst.cxx | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
New commits:
commit 4f989ddb0dc644c46dee97f4656a03fd24813d00
Author: Michael Meeks michael.me...@suse.com
Date: Mon Jan 30 13:52:50 2012 +
android: ask for RGBA visual, and flip images the right way up.
diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index a12d7ac..31b1560 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -102,7 +102,7 @@ static void BlitFrameRegionToWindow(ANativeWindow_Buffer
*pOutBuffer,
for (unsigned int y = 0; y (unsigned int)(aSrcRect.bottom -
aSrcRect.top); y++)
{
-unsigned char *sp = ( pSrc + nStride * (y + aSrcRect.top) +
+unsigned char *sp = ( pSrc + nStride * (aSrcRect.bottom - aSrcRect.top
- y - 1) +
aSrcRect.left * 3 /* src pixel size */ );
switch (pOutBuffer-format) {
@@ -238,10 +238,13 @@ void AndroidSalInstance::onAppCmd (struct android_app*
app, int32_t cmd)
ARect aRect = { 0, 0, 0, 0 };
aRect.right = ANativeWindow_getWidth(pWindow);
aRect.bottom = ANativeWindow_getHeight(pWindow);
-fprintf (stderr, we have an app window ! %p %dx%x (%d)\n,
+int nRet = ANativeWindow_setBuffersGeometry(
+pWindow, ANativeWindow_getWidth(pWindow),
+ANativeWindow_getHeight(pWindow),
+WINDOW_FORMAT_RGBA_);
+fprintf (stderr, we have an app window ! %p %dx%x (%d) set %d\n,
pWindow, aRect.right, aRect.bottom,
- ANativeWindow_getFormat(pWindow));
-
+ ANativeWindow_getFormat(pWindow), nRet);
break;
}
case APP_CMD_WINDOW_RESIZED:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: officecfg/registry sc/inc sc/source
officecfg/registry/schema/org/openoffice/Office/Calc.xcs | 13 +++-
sc/inc/docoptio.hxx |7 +-
sc/source/core/data/document.cxx | 16 -
sc/source/core/tool/docoptio.cxx | 17 -
sc/source/ui/inc/optdlg.hrc |2
sc/source/ui/inc/tpdefaults.hxx |7 +-
sc/source/ui/optdlg/tpdefaults.cxx | 46 ---
sc/source/ui/src/optdlg.src | 13
8 files changed, 103 insertions(+), 18 deletions(-)
New commits:
commit 58ee2fad1ecb326f46795249b42fb23be3f8403e
Author: Albert Thuswaldner albert.thuswald...@gmail.com
Date: Mon Jan 30 12:56:37 2012 +
Option to set tab prefix for new worksheets
diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 3efc2e3..700d716 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1610,11 +1610,11 @@
info
descContains various defaults settings./desc
/info
- group oor:name=Other
+ group oor:name=Sheet
info
- descOther Program defaults/desc
+ descSheet defaults/desc
/info
- prop oor:name=TabCount oor:type=xs:int
oor:nillable=false
+ prop oor:name=SheetCount oor:type=xs:int
oor:nillable=false
!-- UIHints: Tools - Options - Spreadsheet -
Defaults --
info
authorAlbert Thuswaldner/author
@@ -1622,6 +1622,13 @@
/info
value3/value
/prop
+ prop oor:name=SheetPrefix oor:type=xs:string
+ !-- UIHints: Tools - Options - Spreadsheet -
Defaults --
+ info
+ authorAlbert Thuswaldner/author
+ descOption to set the prefix name for new
sheet tabs/desc
+ /info
+ /prop
/group
/group
/component
diff --git a/sc/inc/docoptio.hxx b/sc/inc/docoptio.hxx
index 8557a82..a960ec0 100644
--- a/sc/inc/docoptio.hxx
+++ b/sc/inc/docoptio.hxx
@@ -42,7 +42,8 @@ class SC_DLLPUBLIC ScDocOptions
{
double fIterEps;// epsilon value dazu
sal_uInt16 nIterCount; // number
-SCTAB nInitTabCount;// number of Tabs for new Spreadssheet doc
+SCTAB nInitTabCount;// number of Tabs for new Spreadsheet doc
+::rtl::OUString aInitTabPrefix; // The Tab prefix name in new
Spreadsheet doc
sal_uInt16 nPrecStandardFormat; // precision for standard format
ScOptionsUtil::KeyBindingType eKeyBindingType;
sal_uInt16 nDay;// Null date:
@@ -83,6 +84,8 @@ public:
void SetIterCount( sal_uInt16 nCount) { nIterCount = nCount; }
SCTAB GetInitTabCount() const { return nInitTabCount; }
void SetInitTabCount( SCTAB nTabs) { nInitTabCount = nTabs; }
+void SetInitTabPrefix( ::rtl::OUString aPrefix) { aInitTabPrefix =
aPrefix; }
+::rtl::OUString GetInitTabPrefix() const { return
aInitTabPrefix; }
double GetIterEps() const { return fIterEps; }
void SetIterEps( double fEps ){ fIterEps = fEps; }
@@ -139,6 +142,7 @@ inline const ScDocOptions ScDocOptions::operator=( const
ScDocOptions rCpy )
bIsIter = rCpy.bIsIter;
nIterCount = rCpy.nIterCount;
nInitTabCount = rCpy.nInitTabCount;
+aInitTabPrefix = rCpy.aInitTabPrefix;
fIterEps= rCpy.fIterEps;
nPrecStandardFormat = rCpy.nPrecStandardFormat;
eKeyBindingType = rCpy.eKeyBindingType;
@@ -168,6 +172,7 @@ inline bool ScDocOptions::operator==( const ScDocOptions
rOpt ) const
rOpt.bIsIter== bIsIter
rOpt.nIterCount == nIterCount
rOpt.nInitTabCount == nInitTabCount
+ rOpt.aInitTabPrefix == aInitTabPrefix
rOpt.fIterEps == fIterEps
rOpt.nPrecStandardFormat== nPrecStandardFormat
rOpt.eKeyBindingType== eKeyBindingType
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index e5420cb..02790bc 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -95,6 +95,7 @@
#include tabprotection.hxx
#include clipparam.hxx
#include stlalgorithm.hxx
+#include docoptio.hxx
#include map
#include limits
@@ -142,7 +143,10 @@ void ScDocument::MakeTable( SCTAB nTab,bool
_bNeedsNameCheck )
{
if ( ValidTab(nTab) ( nTab =
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - connectivity/source
connectivity/source/drivers/odbcbase/OResultSet.cxx | 75 +++
connectivity/source/drivers/odbcbase/OStatement.cxx | 100 +++-
connectivity/source/inc/odbc/OResultSet.hxx |2
connectivity/source/inc/odbc/OStatement.hxx |3
4 files changed, 79 insertions(+), 101 deletions(-)
New commits:
commit 3e0a5403a5b7c86d6103f6219cb22d0f69c85d8a
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Tue Jan 24 22:21:41 2012 +0100
use proper sizes for SQL(Get|Set)StmtAttr
Fixes fdo#34432 (driver smashes our stack)
Continuation of
commit 9a466d9718cceeb4ace9e3352a173c7b62387eee
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Tue Nov 29 17:49:36 2011 +0100
ODBC: use right integer length to get Statement Options
diff --git a/connectivity/source/drivers/odbcbase/OResultSet.cxx
b/connectivity/source/drivers/odbcbase/OResultSet.cxx
index 1787744..a882c21 100644
--- a/connectivity/source/drivers/odbcbase/OResultSet.cxx
+++ b/connectivity/source/drivers/odbcbase/OResultSet.cxx
@@ -118,15 +118,15 @@ OResultSet::OResultSet(SQLHANDLE _pStatementHandle
,OStatement_Base* pStmt) :
try
{
m_pRowStatusArray = new SQLUSMALLINT[1]; // the default value
-
N3SQLSetStmtAttr(m_aStatementHandle,SQL_ATTR_ROW_STATUS_PTR,m_pRowStatusArray,SQL_IS_POINTER);
+setStmtOptionSQLUSMALLINT*, SQL_IS_POINTER(SQL_ATTR_ROW_STATUS_PTR,
m_pRowStatusArray);
}
catch(const Exception)
{ // we don't want our result destroy here
}
-SQLINTEGER nCurType = 0;
+SQLULEN nCurType = 0;
try
{
-
N3SQLGetStmtAttr(m_aStatementHandle,SQL_ATTR_CURSOR_TYPE,nCurType,SQL_IS_UINTEGER,0);
+nCurType = getStmtOptionSQLULEN,
SQL_IS_UINTEGER(SQL_ATTR_CURSOR_TYPE);
SQLUINTEGER nValueLen =
m_pStatement-getCursorProperties(nCurType,sal_False);
if( (nValueLen SQL_CA2_SENSITIVITY_DELETIONS) !=
SQL_CA2_SENSITIVITY_DELETIONS ||
(nValueLen SQL_CA2_CRC_EXACT) != SQL_CA2_CRC_EXACT)
@@ -841,9 +841,10 @@ void SAL_CALL OResultSet::insertRow( )
throw(SQLException, RuntimeException)
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
-SQLLEN nMaxLen = 20;
+const SQLLEN nMaxLen = 20;
SQLLEN nRealLen = 0;
Sequencesal_Int8 aBookmark(nMaxLen);
+assert (static_castsize_t(nMaxLen) = sizeof(SQLLEN));
SQLRETURN nRet = N3SQLBindCol(m_aStatementHandle,
0,
@@ -880,7 +881,7 @@ void SAL_CALL OResultSet::insertRow( ) throw(SQLException,
RuntimeException)
if ( bPositionByBookmark )
{
-nRet =
N3SQLSetStmtAttr(m_aStatementHandle,SQL_ATTR_FETCH_BOOKMARK_PTR,aBookmark.getArray(),SQL_IS_POINTER);
// SQL_LEN_BINARY_ATTR(aBookmark.getLength())
+setStmtOptionSQLLEN*, SQL_IS_POINTER(SQL_ATTR_FETCH_BOOKMARK_PTR,
reinterpret_castSQLLEN*(aBookmark.getArray()));
nRet = N3SQLFetchScroll(m_aStatementHandle,SQL_FETCH_BOOKMARK,0);
}
@@ -1156,10 +1157,7 @@ Any SAL_CALL OResultSet::getBookmark( ) throw(
SQLException, RuntimeException)
{
if ( m_nUseBookmarks == ODBC_SQL_NOT_DEFINED )
{
-RTL_LOGFILE_CONTEXT_TRACE( aLogger, SQLGetStmtAttr );
-m_nUseBookmarks = SQL_UB_OFF;
-SQLRETURN nRet =
N3SQLGetStmtAttr(m_aStatementHandle,SQL_ATTR_USE_BOOKMARKS,m_nUseBookmarks,SQL_IS_UINTEGER,NULL);
-OSL_UNUSED( nRet );
+m_nUseBookmarks = getStmtOptionSQLULEN,
SQL_IS_UINTEGER(SQL_ATTR_USE_BOOKMARKS, SQL_UB_OFF);
}
if(m_nUseBookmarks == SQL_UB_OFF)
throw SQLException();
@@ -1184,8 +1182,7 @@ sal_Bool SAL_CALL OResultSet::moveToBookmark( const Any
bookmark ) throw( SQLE
OSL_ENSURE(m_aBookmark.getLength(),Invalid bookmark from length 0!);
if(m_aBookmark.getLength())
{
-SQLRETURN nReturn =
N3SQLSetStmtAttr(m_aStatementHandle,SQL_ATTR_FETCH_BOOKMARK_PTR,m_aBookmark.getArray(),SQL_IS_POINTER);
// SQL_LEN_BINARY_ATTR(aBookmark.getLength())
-OSL_UNUSED( nReturn );
+SQLRETURN nReturn = setStmtOptionSQLLEN*,
SQL_IS_POINTER(SQL_ATTR_FETCH_BOOKMARK_PTR,
reinterpret_castSQLLEN*(m_aBookmark.getArray()));
if ( SQL_INVALID_HANDLE != nReturn SQL_ERROR != nReturn )
{
@@ -1211,7 +1208,7 @@ sal_Bool SAL_CALL OResultSet::moveRelativeToBookmark(
const Any bookmark, sal_
m_nLastColumnPos = 0;
bookmark = m_aBookmark;
-SQLRETURN nReturn =
N3SQLSetStmtAttr(m_aStatementHandle,SQL_ATTR_FETCH_BOOKMARK_PTR,m_aBookmark.getArray(),SQL_IS_POINTER);
+SQLRETURN nReturn = setStmtOptionSQLLEN*,
SQL_IS_POINTER(SQL_ATTR_FETCH_BOOKMARK_PTR,
reinterpret_castSQLLEN*(m_aBookmark.getArray()));
OSL_UNUSED( nReturn );
m_nCurrentFetchState =
N3SQLFetchScroll(m_aStatementHandle,SQL_FETCH_BOOKMARK,rows);
@@ -1266,11 +1263,23 @@ Sequence sal_Int32 SAL_CALL OResultSet::deleteRows(
const Sequence Any
return aRet;
}
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/platform/unxgcc.mk |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2b7cfe121426f72651499aca73f61cf2f274a0a2
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Jan 30 15:28:27 2012 +0100
Adapt gb_Module_DEBUGRUNCOMMAND to --disable-linkoo.
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index a22d234..f533c04 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -393,7 +393,7 @@ endef
define gb_Module_DEBUGRUNCOMMAND
OFFICESCRIPT=`mktemp` \
-printf . $(OUTDIR)/installation/opt/program/ooenv\\n $${OFFICESCRIPT} \
+printf 'if [ -e $(OUTDIR)/installation/opt/program/ooenv ]; then .
$(OUTDIR)/installation/opt/program/ooenv; fi\n' $${OFFICESCRIPT} \
printf gdb --tui $(OUTDIR)/installation/opt/program/soffice.bin
$${OFFICESCRIPT} \
printf -ex \set args --norestore --nologo '--accept=pipe,name=$(USER);urp;'
-env:UserInstallation=file://$(OUTDIR)/installation/\ $${OFFICESCRIPT} \
printf -ex \r\\\n $${OFFICESCRIPT} \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/android' - vcl/android vcl/inc
vcl/android/androidinst.cxx | 214 +---
vcl/inc/android/androidinst.hxx |7 -
2 files changed, 183 insertions(+), 38 deletions(-)
New commits:
commit 7c6cc25249f708805c4073399b09a17ec7ac32f7
Author: Michael Meeks michael.me...@suse.com
Date: Mon Jan 30 16:21:04 2012 +
android: add start of keycode mapping
diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index 31b1560..081f11b 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -81,6 +81,123 @@ static rtl::OString KeyMetaStateToString(int32_t nFlags)
return aStr.makeStringAndClear();
}
+static sal_uInt16 KeyMetaStateToCode(AInputEvent *event)
+{
+sal_uInt16 nCode = 0;
+int32_t nFlags = AKeyEvent_getMetaState(event);
+if (nFlags AMETA_SHIFT_ON)
+nCode |= KEY_SHIFT;
+if (nFlags AMETA_SYM_ON)
+nCode |= KEY_MOD1;
+if (nFlags AMETA_ALT_ON)
+nCode |= KEY_MOD2;
+return nCode;
+}
+
+static sal_uInt16 KeyToCode(AInputEvent *event)
+{
+sal_uInt16 nCode = 0;
+switch (AKeyEvent_getKeyCode(event)) {
+#define MAP(a,b) \
+case AKEYCODE_##a: nCode = KEY_##b; break
+#define MAP_SAME(a) MAP(a,a)
+
+MAP_SAME(HOME);
+MAP_SAME(0); MAP_SAME(1); MAP_SAME(2); MAP_SAME(3); MAP_SAME(4);
+MAP_SAME(5); MAP_SAME(6); MAP_SAME(7); MAP_SAME(8); MAP_SAME(9);
+
+MAP_SAME(A); MAP_SAME(B); MAP_SAME(C); MAP_SAME(D);
+MAP_SAME(E); MAP_SAME(F); MAP_SAME(G); MAP_SAME(H);
+MAP_SAME(I); MAP_SAME(J); MAP_SAME(K); MAP_SAME(L);
+MAP_SAME(M); MAP_SAME(N); MAP_SAME(O); MAP_SAME(P);
+MAP_SAME(Q); MAP_SAME(R); MAP_SAME(S); MAP_SAME(T);
+MAP_SAME(U); MAP_SAME(V); MAP_SAME(W); MAP_SAME(X);
+MAP_SAME(Y); MAP_SAME(Z);
+
+MAP_SAME(TAB); MAP_SAME(SPACE); MAP_SAME(COMMA);
+
+MAP(ENTER,RETURN);
+MAP(PAGE_UP, PAGEUP);
+MAP(PAGE_DOWN, PAGEDOWN);
+MAP(DEL, DELETE);
+MAP(PERIOD, POINT);
+
+case AKEYCODE_BACK: // escape ?
+case AKEYCODE_UNKNOWN:
+case AKEYCODE_SOFT_LEFT:
+case AKEYCODE_SOFT_RIGHT:
+case AKEYCODE_CALL:
+case AKEYCODE_ENDCALL:
+case AKEYCODE_STAR:
+case AKEYCODE_POUND:
+case AKEYCODE_DPAD_UP:
+case AKEYCODE_DPAD_DOWN:
+case AKEYCODE_DPAD_LEFT:
+case AKEYCODE_DPAD_RIGHT:
+case AKEYCODE_DPAD_CENTER:
+case AKEYCODE_VOLUME_UP:
+case AKEYCODE_VOLUME_DOWN:
+case AKEYCODE_POWER:
+case AKEYCODE_CAMERA:
+case AKEYCODE_CLEAR:
+case AKEYCODE_ALT_LEFT:
+case AKEYCODE_ALT_RIGHT:
+case AKEYCODE_SHIFT_LEFT:
+case AKEYCODE_SHIFT_RIGHT:
+case AKEYCODE_SYM:
+case AKEYCODE_EXPLORER:
+case AKEYCODE_ENVELOPE:
+case AKEYCODE_GRAVE:
+case AKEYCODE_MINUS:
+case AKEYCODE_EQUALS:
+case AKEYCODE_LEFT_BRACKET:
+case AKEYCODE_RIGHT_BRACKET:
+case AKEYCODE_BACKSLASH:
+case AKEYCODE_SEMICOLON:
+case AKEYCODE_APOSTROPHE:
+case AKEYCODE_SLASH:
+case AKEYCODE_AT:
+case AKEYCODE_NUM:
+case AKEYCODE_HEADSETHOOK:
+case AKEYCODE_FOCUS: // not widget, but camera focus
+case AKEYCODE_PLUS:
+case AKEYCODE_MENU:
+case AKEYCODE_NOTIFICATION:
+case AKEYCODE_SEARCH:
+case AKEYCODE_MEDIA_PLAY_PAUSE:
+case AKEYCODE_MEDIA_STOP:
+case AKEYCODE_MEDIA_NEXT:
+case AKEYCODE_MEDIA_PREVIOUS:
+case AKEYCODE_MEDIA_REWIND:
+case AKEYCODE_MEDIA_FAST_FORWARD:
+case AKEYCODE_MUTE:
+case AKEYCODE_PICTSYMBOLS:
+case AKEYCODE_SWITCH_CHARSET:
+case AKEYCODE_BUTTON_A:
+case AKEYCODE_BUTTON_B:
+case AKEYCODE_BUTTON_C:
+case AKEYCODE_BUTTON_X:
+case AKEYCODE_BUTTON_Y:
+case AKEYCODE_BUTTON_Z:
+case AKEYCODE_BUTTON_L1:
+case AKEYCODE_BUTTON_R1:
+case AKEYCODE_BUTTON_L2:
+case AKEYCODE_BUTTON_R2:
+case AKEYCODE_BUTTON_THUMBL:
+case AKEYCODE_BUTTON_THUMBR:
+case AKEYCODE_BUTTON_START:
+case AKEYCODE_BUTTON_SELECT:
+case AKEYCODE_BUTTON_MODE:
+fprintf (stderr, un-mapped keycode %d\n, nCode);
+nCode = 0;
+break;
+#undef MAP_SAME
+#undef MAP
+}
+fprintf (stderr, mapped %d - %d\n, AKeyEvent_getKeyCode(event), nCode);
+return nCode;
+}
+
static void BlitFrameRegionToWindow(ANativeWindow_Buffer *pOutBuffer,
const basebmp::BitmapDeviceSharedPtr aDev,
const ARect rSrcRect,
@@ -174,8 +291,8 @@ void AndroidSalInstance::RedrawWindows(ANativeWindow
*pWindow)
int32_t *p = (int32_t *)aOutBuffer.bits;
for (int32_t y = 0; y aOutBuffer.height; y++)
{
-for (int32_t x = 0; x aOutBuffer.stride / 2; x++)
-*p++ = (y 24) + x;
+for (int32_t x = 0; x aOutBuffer.stride; x++)
+*p++ = (y 24) + (x 10) + 0xff ;
}
#endif
@@ -199,7 +316,12 @@ void AndroidSalInstance::RedrawWindows(ANativeWindow
*pWindow)
ANativeWindow_unlockAndPost(pWindow);
fprintf
[Libreoffice-commits] .: basic/inc basic/source
basic/inc/basic/sbstar.hxx|4 ++--
basic/source/classes/sb.cxx |8
basic/source/comp/scanner.cxx |6 +++---
basic/source/comp/token.cxx |4 ++--
basic/source/inc/scanner.hxx |5 ++---
basic/source/inc/token.hxx|2 +-
6 files changed, 14 insertions(+), 15 deletions(-)
New commits:
commit 6073c31fe8c500066bb033cdb646e9d1cca9b94a
Author: Takeshi Abe t...@fixedpoint.jp
Date: Tue Jan 31 02:18:11 2012 +0900
Replaced String by rtl::OUString in SbiScanner
diff --git a/basic/inc/basic/sbstar.hxx b/basic/inc/basic/sbstar.hxx
index dc6622e..7cf87ea 100644
--- a/basic/inc/basic/sbstar.hxx
+++ b/basic/inc/basic/sbstar.hxx
@@ -82,7 +82,7 @@ class BASIC_DLLPUBLIC StarBASIC : public SbxObject
BASIC_DLLPRIVATE void implClearDependingVarsOnDelete( StarBASIC*
pDeletedBasic );
protected:
-sal_BoolCError( SbError, const String, xub_StrLen,
xub_StrLen, xub_StrLen );
+sal_BoolCError( SbError, const ::rtl::OUString, xub_StrLen,
xub_StrLen, xub_StrLen );
private:
BASIC_DLLPRIVATE sal_Bool RTError( SbError, xub_StrLen,
xub_StrLen, xub_StrLen );
BASIC_DLLPRIVATE sal_Bool RTError( SbError, const String rMsg,
xub_StrLen, xub_StrLen, xub_StrLen );
@@ -154,7 +154,7 @@ public:
sal_uInt16 nCol1, sal_uInt16 nCol2 );
// Specific to error handler
-static void MakeErrorText( SbError, const String aMsg );
+static void MakeErrorText( SbError, const ::rtl::OUString aMsg );
static constString GetErrorText();
static SbError GetErrorCode();
static sal_Bool IsCompilerError();
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index a0b3bb8..816c7d3 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -1575,7 +1575,7 @@ struct BasicStringList_Impl : private Resource
};
//
-void StarBASIC::MakeErrorText( SbError nId, const String aMsg )
+void StarBASIC::MakeErrorText( SbError nId, const ::rtl::OUString aMsg )
{
SolarMutexGuard aSolarGuard;
sal_uInt16 nOldID = GetVBErrorCode( nId );
@@ -1612,7 +1612,7 @@ void StarBASIC::MakeErrorText( SbError nId, const String
aMsg )
}
sal_Bool StarBASIC::CError
-( SbError code, const String rMsg, sal_uInt16 l, sal_uInt16 c1,
sal_uInt16 c2 )
+( SbError code, const ::rtl::OUString rMsg, sal_uInt16 l, sal_uInt16 c1,
sal_uInt16 c2 )
{
SolarMutexGuard aSolarGuard;
@@ -1634,8 +1634,8 @@ sal_Bool StarBASIC::CError
MakeErrorText( code, rMsg );
// Implementation of the code for the string transport to SFX-Error
-if( rMsg.Len() )
-code = (sal_uIntPtr)*new StringErrorInfo( code, String(rMsg) );
+if( !rMsg.isEmpty() )
+code = (sal_uIntPtr)*new StringErrorInfo( code, rMsg );
SetErrorData( code, l, c1, c2 );
GetSbData()-bCompiler = sal_True;
diff --git a/basic/source/comp/scanner.cxx b/basic/source/comp/scanner.cxx
index 5768ed4..872bdd7 100644
--- a/basic/source/comp/scanner.cxx
+++ b/basic/source/comp/scanner.cxx
@@ -369,7 +369,7 @@ bool SbiScanner::NextSym()
aSym = p; bNumber = true;
if( comma 1 || exp 1 )
-{ aError = '.';
+{ aError = ::rtl::OUString('.');
GenError( SbERR_BAD_CHAR_IN_NUMBER ); }
// #57844 use localized function
@@ -437,7 +437,7 @@ bool SbiScanner::NextSym()
*p++ = ch;
else
{
-aError = ch;
+aError = ::rtl::OUString(ch);
GenError( SbERR_BAD_CHAR_IN_NUMBER );
}
}
@@ -474,7 +474,7 @@ bool SbiScanner::NextSym()
{
pLine++; nCol++;
if( *pLine != cSep || cSep == ']' ) break;
-} else aError = cSep, GenError( SbERR_EXPECTED );
+} else aError = ::rtl::OUString(cSep), GenError( SbERR_EXPECTED );
}
// If VBA Interop then doen't eat the [] chars
if ( cSep == ']' bVBASupportOn )
diff --git a/basic/source/comp/token.cxx b/basic/source/comp/token.cxx
index d18953d..63c9867 100644
--- a/basic/source/comp/token.cxx
+++ b/basic/source/comp/token.cxx
@@ -244,11 +244,11 @@ void SbiTokenizer::Push( SbiToken t )
void SbiTokenizer::Error( SbError code, const char* pMsg )
{
-aError = String::CreateFromAscii( pMsg );
+aError = ::rtl::OUString::createFromAscii( pMsg );
Error( code );
}
-void SbiTokenizer::Error( SbError code, String aMsg )
+void SbiTokenizer::Error( SbError code, const ::rtl::OUString aMsg )
{
aError = aMsg;
Error( code );
diff --git a/basic/source/inc/scanner.hxx b/basic/source/inc/scanner.hxx
index 69c3d87..926706c 100644
--- a/basic/source/inc/scanner.hxx
+++ b/basic/source/inc/scanner.hxx
@@ -29,12 +29,11 @@
#ifndef _SCANNER_HXX
#define _SCANNER_HXX
-#include tools/string.hxx
#include basic/sberrors.hxx
[Libreoffice-commits] .: oox/source
oox/source/xls/workbookhelper.cxx |3 ---
1 file changed, 3 deletions(-)
New commits:
commit 1f2bf6d863a25475f27e2b0d37f8c36aec74d6d4
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Mon Jan 30 12:30:03 2012 -0500
Removed debug statement.
diff --git a/oox/source/xls/workbookhelper.cxx
b/oox/source/xls/workbookhelper.cxx
index d1a61c9..675a6a1 100644
--- a/oox/source/xls/workbookhelper.cxx
+++ b/oox/source/xls/workbookhelper.cxx
@@ -69,8 +69,6 @@
#include oox/xls/workbooksettings.hxx
#include oox/xls/worksheetbuffer.hxx
-#include iostream
-
namespace oox {
namespace xls {
@@ -394,7 +392,6 @@ Reference XNamedRange
WorkbookGlobals::createLocalNamedRangeObject( OUString
Reference XSpreadsheet xSheet (xSheets-getByIndex(nTab),
UNO_QUERY_THROW);
Reference com::sun::star::container::XNamed xNamed(xSheet,
UNO_QUERY_THROW);
rtl::OUString aName = xNamed-getName();
-std::cout sheetName: rtl::OUStringToOString( aName,
RTL_TEXTENCODING_UTF8).getStr() std::endl;
PropertySet aSheetProps( xSheet );
Reference XNamedRanges xNamedRanges( aSheetProps.getAnyProperty(
PROP_NamedRanges ), UNO_QUERY_THROW );
Reference XNameAccess xNameAccess( xNamedRanges, UNO_QUERY_THROW );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/win
vcl/win/source/app/salinst.cxx | 23 +++
1 file changed, 3 insertions(+), 20 deletions(-)
New commits:
commit 6c779863bbd25499f4c7dff7d201403ebef898be
Author: Julien Nabet serval2...@yahoo.fr
Date: Mon Jan 30 19:00:00 2012 +0100
Fix Found duplicate branches for if and else
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index bf1b89f..196b013 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -332,27 +332,10 @@ bool WinSalInstance::CheckYieldMutex()
bool bRet = true;
SalData*pSalData = GetSalData();
DWORD nCurThreadId = GetCurrentThreadId();
-if ( pSalData-mnAppThreadId != nCurThreadId )
-{
-if ( pSalData-mpFirstInstance )
-{
-SalYieldMutex* pYieldMutex =
pSalData-mpFirstInstance-mpSalYieldMutex;
-if ( pYieldMutex-mnThreadId != nCurThreadId )
-{
-bRet = false;
-}
-}
-}
-else
+if ( pSalData-mpFirstInstance )
{
-if ( pSalData-mpFirstInstance )
-{
-SalYieldMutex* pYieldMutex =
pSalData-mpFirstInstance-mpSalYieldMutex;
-if ( pYieldMutex-mnThreadId != nCurThreadId )
-{
-bRet = false;
-}
-}
+SalYieldMutex* pYieldMutex =
pSalData-mpFirstInstance-mpSalYieldMutex;
+bRet = (pYieldMutex-mnThreadId == nCurThreadId);
}
return bRet;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - oox/source
oox/source/xls/workbookhelper.cxx |3 ---
1 file changed, 3 deletions(-)
New commits:
commit 89e5c595d126b8d7da63b22a9819bc2000da87c1
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Mon Jan 30 12:30:03 2012 -0500
Removed debug statement.
Signed-off-by: Andras Timar ati...@suse.com
diff --git a/oox/source/xls/workbookhelper.cxx
b/oox/source/xls/workbookhelper.cxx
index 3cc56cd..a9d9b5c 100644
--- a/oox/source/xls/workbookhelper.cxx
+++ b/oox/source/xls/workbookhelper.cxx
@@ -69,8 +69,6 @@
#include oox/xls/workbooksettings.hxx
#include oox/xls/worksheetbuffer.hxx
-#include iostream
-
namespace oox {
namespace xls {
@@ -394,7 +392,6 @@ Reference XNamedRange
WorkbookGlobals::createLocalNamedRangeObject( OUString
Reference XSpreadsheet xSheet (xSheets-getByIndex(nTab),
UNO_QUERY_THROW);
Reference com::sun::star::container::XNamed xNamed(xSheet,
UNO_QUERY_THROW);
rtl::OUString aName = xNamed-getName();
-std::cout sheetName: rtl::OUStringToOString( aName,
RTL_TEXTENCODING_UTF8).getStr() std::endl;
PropertySet aSheetProps( xSheet );
Reference XNamedRanges xNamedRanges( aSheetProps.getAnyProperty(
PROP_NamedRanges ), UNO_QUERY_THROW );
Reference XNameAccess xNameAccess( xNamedRanges, UNO_QUERY_THROW );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/filter/ww8/ww8scan.cxx | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
New commits:
commit b5a73d4b2b283d3d1a57ac0f66b608998960a873
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Mon Jan 30 19:07:43 2012 +0100
query remaining stream size after seeking, not before (fdo#45255)
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index a97f383..593624b 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -1978,10 +1978,11 @@ WW8PLCFspecial::WW8PLCFspecial(SvStream* pSt,
sal_uInt32 nFilePos,
const sal_uInt32 nValidMin=4;
sal_Size nOldPos = pSt-Tell();
-sal_Size nRemainingSize = pSt-remainingSize();
-bool bValid = checkSeek(*pSt, nFilePos) (nRemainingSize = nValidMin)
-(nPLCF = nValidMin);
+bool bValid = checkSeek(*pSt, nFilePos);
+sal_Size nRemainingSize = pSt-remainingSize();
+if( !(nRemainingSize = nValidMin nPLCF = nValidMin ))
+bValid = false;
nPLCF = bValid ? std::min(nRemainingSize, static_castsal_Size(nPLCF)) :
nValidMin;
// Pointer auf Pos- u. Struct-Array
@@ -2136,9 +2137,7 @@ WW8PLCF::WW8PLCF(SvStream rSt, WW8_FC nFilePos,
sal_Int32 nPLCF, int nStruct,
void WW8PLCF::ReadPLCF(SvStream rSt, WW8_FC nFilePos, sal_uInt32 nPLCF)
{
sal_Size nOldPos = rSt.Tell();
-sal_Size nRemainingSize = rSt.remainingSize();
-
-bool bValid = checkSeek(rSt, nFilePos) (nRemainingSize = nPLCF);
+bool bValid = checkSeek(rSt, nFilePos) (rSt.remainingSize() = nPLCF);
if (bValid)
{
@@ -2317,10 +2316,11 @@ WW8PLCFpcd::WW8PLCFpcd(SvStream* pSt, sal_uInt32
nFilePos,
const sal_uInt32 nValidMin=4;
sal_Size nOldPos = pSt-Tell();
-sal_Size nRemainingSize = pSt-remainingSize();
-bool bValid = checkSeek(*pSt, nFilePos) (nRemainingSize = nValidMin)
-(nPLCF = nValidMin);
+bool bValid = checkSeek(*pSt, nFilePos);
+sal_Size nRemainingSize = pSt-remainingSize();
+if( !(nRemainingSize = nValidMin nPLCF = nValidMin ))
+bValid = false;
nPLCF = bValid ? std::min(nRemainingSize, static_castsal_Size(nPLCF)) :
nValidMin;
pPLCF_PosArray = new sal_Int32[ ( nPLCF + 3 ) / 4 ];// Pointer auf
Pos-Array
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5-0' - oox/source
oox/source/xls/workbookhelper.cxx |3 ---
1 file changed, 3 deletions(-)
New commits:
commit 30d2afc75698cf836e3cf145f56faa2feb686039
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Mon Jan 30 12:30:03 2012 -0500
Removed debug statement.
Signed-off-by: Eike Rathke er...@redhat.com
(cherry picked from commit 1f2bf6d863a25475f27e2b0d37f8c36aec74d6d4)
Signed-off-by: Markus Mohrhard markus.mohrh...@googlemail.com
Signed-off-by: Andras Timar tima...@gmail.com
diff --git a/oox/source/xls/workbookhelper.cxx
b/oox/source/xls/workbookhelper.cxx
index 3cc56cd..a9d9b5c 100644
--- a/oox/source/xls/workbookhelper.cxx
+++ b/oox/source/xls/workbookhelper.cxx
@@ -69,8 +69,6 @@
#include oox/xls/workbooksettings.hxx
#include oox/xls/worksheetbuffer.hxx
-#include iostream
-
namespace oox {
namespace xls {
@@ -394,7 +392,6 @@ Reference XNamedRange
WorkbookGlobals::createLocalNamedRangeObject( OUString
Reference XSpreadsheet xSheet (xSheets-getByIndex(nTab),
UNO_QUERY_THROW);
Reference com::sun::star::container::XNamed xNamed(xSheet,
UNO_QUERY_THROW);
rtl::OUString aName = xNamed-getName();
-std::cout sheetName: rtl::OUStringToOString( aName,
RTL_TEXTENCODING_UTF8).getStr() std::endl;
PropertySet aSheetProps( xSheet );
Reference XNamedRanges xNamedRanges( aSheetProps.getAnyProperty(
PROP_NamedRanges ), UNO_QUERY_THROW );
Reference XNameAccess xNameAccess( xNamedRanges, UNO_QUERY_THROW );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/ui/src/namedefdlg.src | 42
1 file changed, 21 insertions(+), 21 deletions(-)
New commits:
commit 5be59017ca21301e70eca987e8323c92215f0ed4
Author: Petr Mladek pmla...@suse.cz
Date: Mon Jan 30 20:00:33 2012 +0100
Make named ranges dialog more consistent, localizable (III)
There was still not enough space for German traslation
diff --git a/sc/source/ui/src/namedefdlg.src b/sc/source/ui/src/namedefdlg.src
index 65de9e5..2bf1926 100644
--- a/sc/source/ui/src/namedefdlg.src
+++ b/sc/source/ui/src/namedefdlg.src
@@ -34,20 +34,20 @@ ModelessDialog RID_SCDLG_NAMES_DEFINE
HelpId = CMD_FID_ADD_NAME ;
Hide = TRUE ;
SVLook = TRUE ;
-Size = MAP_APPFONT ( 200 , 116 ) ;
+Size = MAP_APPFONT ( 225 , 116 ) ;
Text [ en-US ] = Define Name ;
Moveable = TRUE ;
Closeable = TRUE;
PushButton BTN_ADD
{
-Pos = MAP_APPFONT( 90, 96 );
+Pos = MAP_APPFONT( 115, 96 );
Size = MAP_APPFONT( 50, 15 );
TabStop = TRUE;
Text [en-US] = Add;
};
PushButton BTN_CANCEL
{
-Pos = MAP_APPFONT( 145, 96 );
+Pos = MAP_APPFONT( 170, 96 );
Size = MAP_APPFONT ( 50, 15 );
TabStop = TRUE;
Text [en-US] = Cancel;
@@ -61,43 +61,43 @@ ModelessDialog RID_SCDLG_NAMES_DEFINE
FixedText FT_INFO
{
Pos = MAP_APPFONT( 5, 5 );
-Size = MAP_APPFONT( 190, 15 );
+Size = MAP_APPFONT( 215, 15 );
};
FixedText FT_NAME
{
Pos = MAP_APPFONT( 5, 27 );
-Size = MAP_APPFONT( 40, 13 );
+Size = MAP_APPFONT( 50, 13 );
Text [en-US] = Name;
};
FixedText FT_RANGE
{
Pos = MAP_APPFONT( 5, 45 );
-Size = MAP_APPFONT( 40, 13 );
+Size = MAP_APPFONT( 50, 13 );
Text [en-US] = Range;
};
FixedText FT_SCOPE
{
Pos = MAP_APPFONT( 5, 63 );
-Size = MAP_APPFONT( 40, 13 );
+Size = MAP_APPFONT( 50, 13 );
Text [en-US] = Scope;
};
Edit ED_NAME
{
Border = TRUE;
-Pos = MAP_APPFONT( 50, 25 );
-Size = MAP_APPFONT( 145, 13 );
+Pos = MAP_APPFONT( 60, 25 );
+Size = MAP_APPFONT( 160, 13 );
TabStop = TRUE;
};
Edit ED_RANGE
{
Border = TRUE;
-Pos = MAP_APPFONT( 50, 43 );
-Size = MAP_APPFONT( 130, 13 );
+Pos = MAP_APPFONT( 60, 43 );
+Size = MAP_APPFONT( 145, 13 );
TabStop = TRUE;
};
ImageButton RB_RANGE
{
-Pos = MAP_APPFONT ( 180 , 43 ) ;
+Pos = MAP_APPFONT ( 205 , 43 ) ;
Size = MAP_APPFONT ( 15 , 13 ) ;
TabStop = TRUE ;
QuickHelpText [ en-US ] = Shrink ;
@@ -106,7 +106,7 @@ ModelessDialog RID_SCDLG_NAMES_DEFINE
{
HelpID = sc:CheckBox:RID_SCDLG_NAMES:BTN_PRINTAREA;
Pos = MAP_APPFONT ( 5 , 94 ) ;
-Size = MAP_APPFONT ( 80 , 10 ) ;
+Size = MAP_APPFONT ( 90 , 10 ) ;
Text [ en-US ] = ~Print range ;
TabStop = TRUE ;
};
@@ -114,38 +114,38 @@ ModelessDialog RID_SCDLG_NAMES_DEFINE
{
HelpID = sc:CheckBox:RID_SCDLG_NAMES:BTN_CRITERIA;
Pos = MAP_APPFONT ( 5 , 107 ) ;
-Size = MAP_APPFONT ( 60 , 10 ) ;
+Size = MAP_APPFONT ( 70 , 10 ) ;
Text [ en-US ] = ~Filter ;
TabStop = TRUE ;
};
CheckBox BTN_ROWHEADER
{
HelpID = sc:CheckBox:RID_SCDLG_NAMES:BTN_ROWHEADER;
-Pos = MAP_APPFONT ( 110, 107 ) ;
-Size = MAP_APPFONT ( 82 , 10 ) ;
+Pos = MAP_APPFONT ( 120, 107 ) ;
+Size = MAP_APPFONT ( 92 , 10 ) ;
Text [ en-US ] = Repeat ~row ;
TabStop = TRUE ;
};
CheckBox BTN_COLHEADER
{
HelpID = sc:CheckBox:RID_SCDLG_NAMES:BTN_COLHEADER;
-Pos = MAP_APPFONT ( 110 , 94 ) ;
-Size = MAP_APPFONT ( 82 , 10 ) ;
+Pos = MAP_APPFONT ( 120 , 94 ) ;
+Size = MAP_APPFONT ( 92 , 10 ) ;
Text [ en-US ] = Repeat ~column ;
TabStop = TRUE ;
};
ListBox LB_SCOPE
{
Border = TRUE;
-Pos = MAP_APPFONT ( 50 , 61 );
-Size = MAP_APPFONT ( 145 , 80 );
+Pos = MAP_APPFONT ( 60 , 61 );
+Size = MAP_APPFONT ( 160 , 80 );
TabStop = TRUE;
DropDown = TRUE;
};
FixedLine FL_DIV
{
Pos = MAP_APPFONT( 0, 91 );
-Size = MAP_APPFONT(200, 3 );
+Size = MAP_APPFONT(225, 3 );
};
String STR_DEFAULT_INFO
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source
sw/source/filter/ww8/ww8scan.cxx | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 6594688df45cb491042470c4ae5289c47192994a
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Mon Jan 30 19:07:43 2012 +0100
query remaining stream size after seeking, not before (fdo#45255)
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 9ef2ff9..b149478 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -1996,10 +1996,11 @@ WW8PLCFspecial::WW8PLCFspecial(SvStream* pSt,
sal_uInt32 nFilePos,
const sal_uInt32 nValidMin=4;
sal_Size nOldPos = pSt-Tell();
-sal_Size nRemainingSize = pSt-remainingSize();
-bool bValid = checkSeek(*pSt, nFilePos) (nRemainingSize = nValidMin)
-(nPLCF = nValidMin);
+bool bValid = checkSeek(*pSt, nFilePos);
+sal_Size nRemainingSize = pSt-remainingSize();
+if( !(nRemainingSize = nValidMin nPLCF = nValidMin ))
+bValid = false;
nPLCF = bValid ? std::min(nRemainingSize, static_castsal_Size(nPLCF)) :
nValidMin;
// Pointer auf Pos- u. Struct-Array
@@ -2154,9 +2155,7 @@ WW8PLCF::WW8PLCF(SvStream rSt, WW8_FC nFilePos,
sal_Int32 nPLCF, int nStruct,
void WW8PLCF::ReadPLCF(SvStream rSt, WW8_FC nFilePos, sal_uInt32 nPLCF)
{
sal_Size nOldPos = rSt.Tell();
-sal_Size nRemainingSize = rSt.remainingSize();
-
-bool bValid = checkSeek(rSt, nFilePos) (nRemainingSize = nPLCF);
+bool bValid = checkSeek(rSt, nFilePos) (rSt.remainingSize() = nPLCF);
if (bValid)
{
@@ -2335,10 +2334,11 @@ WW8PLCFpcd::WW8PLCFpcd(SvStream* pSt, sal_uInt32
nFilePos,
const sal_uInt32 nValidMin=4;
sal_Size nOldPos = pSt-Tell();
-sal_Size nRemainingSize = pSt-remainingSize();
-bool bValid = checkSeek(*pSt, nFilePos) (nRemainingSize = nValidMin)
-(nPLCF = nValidMin);
+bool bValid = checkSeek(*pSt, nFilePos);
+sal_Size nRemainingSize = pSt-remainingSize();
+if( !(nRemainingSize = nValidMin nPLCF = nValidMin ))
+bValid = false;
nPLCF = bValid ? std::min(nRemainingSize, static_castsal_Size(nPLCF)) :
nValidMin;
pPLCF_PosArray = new sal_Int32[ ( nPLCF + 3 ) / 4 ];// Pointer auf
Pos-Array
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/win
vcl/win/source/app/salinst.cxx |6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 9b6cb7319e46a2da6f5d3e3f748f103cb508f698
Author: Julien Nabet serval2...@yahoo.fr
Date: Mon Jan 30 21:16:20 2012 +0100
Just some simplification
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index 196b013..d0a6bd0 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -329,15 +329,13 @@ void ImplSalAcquireYieldMutex( sal_uLong nCount )
bool WinSalInstance::CheckYieldMutex()
{
-bool bRet = true;
SalData*pSalData = GetSalData();
-DWORD nCurThreadId = GetCurrentThreadId();
if ( pSalData-mpFirstInstance )
{
SalYieldMutex* pYieldMutex =
pSalData-mpFirstInstance-mpSalYieldMutex;
-bRet = (pYieldMutex-mnThreadId == nCurThreadId);
+return (pYieldMutex-mnThreadId == (GetCurrentThreadId()));
}
-return bRet;
+return true;
}
// ===
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svtools/source
svtools/source/filter/sgvtext.cxx |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 10bfc4df5335c6cd2ae700df7485668d896998b5 Author: Julien Nabet serval2...@yahoo.fr Date: Mon Jan 30 21:21:34 2012 +0100 Replace literal control characters (thank you Eike !) diff --git a/svtools/source/filter/sgvtext.cxx b/svtools/source/filter/sgvtext.cxx index 8848c1f..28f950b 100644 --- a/svtools/source/filter/sgvtext.cxx +++ b/svtools/source/filter/sgvtext.cxx @@ -136,10 +136,10 @@ extern SgfFontLst* pSgfFonts; //EscBold, EscLSlnt,EscRSlnt,EscUndln,EscDbUnd,EscKaptF,EscStrik,EscDbStk, //EscSupSc,EscSubSc,Esc2DShd,Esc3DShd,Esc4DShd]; // Justify muss spaetestens am Anfang des Absatzes stehen -#define EscSet' ' /* Flag setzen */ -#define EscReset ' ' /* Flag loeschen */ +#define EscSet'\x1e' /* Flag setzen */ +#define EscReset '\x1f' /* Flag loeschen */ #define EscDeflt '\x11' /* Flag auf default setzen */ -#define EscToggl ' ' /* Flag Toggeln */ +#define EscToggl '\x1d' /* Flag Toggeln */ #define EscRelat '%' #define EscNoFlg 0 #define EscNoVal -2147483647 /* -MaxLongInt */ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: boost/boost.6397.warnings.patch
boost/boost.6397.warnings.patch | 35 +++
1 file changed, 35 insertions(+)
New commits:
commit 2b7083aef8b9508ca93c55c62448ce044ae1fc95
Author: Caolán McNamara caol...@redhat.com
Date: Mon Jan 30 17:00:59 2012 +
WaE: more multi_array warnings
diff --git a/boost/boost.6397.warnings.patch b/boost/boost.6397.warnings.patch
index a307c31..82e3b5e 100644
--- a/boost/boost.6397.warnings.patch
+++ b/boost/boost.6397.warnings.patch
@@ -169,6 +169,18 @@
} else {
std::fill_n(index_base_list_.begin(),NumDims,0);
}
+@@ -622,9 +622,9 @@
+ // This is only supplied to support multi_array's default constructor
+ explicit multi_array_ref(T* base,
+const storage_order_type so,
+- const index* index_bases,
++ const index* index_bases_,
+const size_type* extents) :
+-super_type(base,so,index_bases,extents) { }
++super_type(base,so,index_bases_,extents) { }
+
+ };
+
--- misc/boost_1_44_0/boost/multi_array/storage_order.hpp 2012-01-12
20:21:29.790009198 +
+++ misc/build/boost_1_44_0/boost/multi_array/storage_order.hpp
2012-01-12 20:30:57.667472937 +
@@ -34,10 +34,10 @@
@@ -199,7 +211,19 @@
+base_(base), extents_(extents), strides_(i_strides),
index_base_(index_base) {
}
+
+@@ -369,9 +369,9 @@
+
+ sub_array (T* base,
+ const size_type* extents,
+-const index* strides,
++const index* _strides,
+ const index* index_base) :
+-super_type(base,extents,strides,index_base) {
++super_type(base,extents,_strides,index_base) {
+ }
+ };
--- misc/boost_1_44_0/boost/multi_array/view.hpp 2012-01-12
20:21:29.790009198 +
+++ misc/build/boost_1_44_0/boost/multi_array/view.hpp 2012-01-12
20:26:36.350945110 +
@@ -231,7 +231,7 @@
@@ -220,3 +244,14 @@
// Calculate the array size
num_elements_ = std::accumulate(extent_list_.begin(),extent_list_.end(),
+@@ -441,8 +441,8 @@
+ template typename ExtentList, typename Index
+ explicit multi_array_view(T* base,
+ const ExtentList extents,
+-const boost::arrayIndex,NumDims strides) :
+-super_type(base,extents,strides) { }
++const boost::arrayIndex,NumDims _strides) :
++super_type(base,extents,_strides) { }
+
+ };
+
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx |9 +
1 file changed, 9 insertions(+)
New commits:
commit 2aa3d43a3746c797391afb1a08c024d512976006
Author: Miklos Vajna vmik...@frugalware.org
Date: Mon Jan 30 21:29:57 2012 +0100
fdo#43965 fix RTF import of page break symbol
This was unnoticed so far as both Writer and Word output \pagebb instead
of \page when exporting page breaks.
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 805dd20..faf3943 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1317,6 +1317,8 @@ int RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword)
m_bWasInFrame = inFrame();
if (!m_bWasInFrame)
m_bNeedPar = false;
+// this has to be reset even without a pard, since it's a
symbol in RTF terms
+
m_aStates.top().aParagraphSprms.erase(NS_sprm::LN_PFPageBreakBefore);
}
break;
case RTF_SECT:
@@ -1437,6 +1439,13 @@ int RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword)
case RTF_CHFTN:
// Nothing to do, dmapper assumes this is the default.
break;
+case RTF_PAGE:
+{
+RTFValue::Pointer_t pValue(new RTFValue(1));
+dispatchSymbol(RTF_PAR);
+
m_aStates.top().aParagraphSprms-push_back(make_pair(NS_sprm::LN_PFPageBreakBefore,
pValue));
+}
+break;
default:
SAL_INFO(writerfilter, OSL_THIS_FUNC : TODO handle symbol '
lcl_RtfToString(nKeyword) ');
aSkip.setParsed(false);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: ucb/source
ucb/source/ucp/gio/gio_datasupplier.cxx |2 -- 1 file changed, 2 deletions(-) New commits: commit 400f715ad7ebecb9c657fed4ade40bd5135efde2 Author: Julien Nabet serval2...@yahoo.fr Date: Mon Jan 30 22:05:13 2012 +0100 Don't repeat a return ! diff --git a/ucb/source/ucp/gio/gio_datasupplier.cxx b/ucb/source/ucp/gio/gio_datasupplier.cxx index 252cbbf..57e4300 100644 --- a/ucb/source/ucp/gio/gio_datasupplier.cxx +++ b/ucb/source/ucp/gio/gio_datasupplier.cxx @@ -138,8 +138,6 @@ DataSupplier::~DataSupplier() maResults[ nIndex ]-aId = aId; return aId; - -return aId; } return ::rtl::OUString(); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/inc sc/source
sc/inc/cell.hxx|2 ++
sc/inc/formularesult.hxx | 12
sc/source/core/data/cell.cxx |5 +
sc/source/core/data/table4.cxx |1 +
4 files changed, 20 insertions(+)
New commits:
commit e2b11f4fd79dce4116badb0ecf6477546ca5d0d4
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Mon Jan 30 16:10:48 2012 -0500
Prevent excessive references to single token instance during fill.
Because if not, we may run out of the 16-bit integer space to store
reference count.
diff --git a/sc/inc/cell.hxx b/sc/inc/cell.hxx
index 52244f6..3bc7aee 100644
--- a/sc/inc/cell.hxx
+++ b/sc/inc/cell.hxx
@@ -535,6 +535,8 @@ public:
boolIsMultilineResult();
voidMaybeInterpret();
+
+voidResetFormulaResult();
};
// Iterator for references in a formula cell
diff --git a/sc/inc/formularesult.hxx b/sc/inc/formularesult.hxx
index c1cb906..94c62f8 100644
--- a/sc/inc/formularesult.hxx
+++ b/sc/inc/formularesult.hxx
@@ -117,6 +117,8 @@ public:
mpToken-DecRef();
}
+inline void Reset();
+
/** Well, guess what ... */
inline ScFormulaResultoperator=( const ScFormulaResult r );
@@ -216,6 +218,16 @@ public:
inline ScMatrixFormulaCellToken* GetMatrixFormulaCellTokenNonConst();
};
+inline void ScFormulaResult::Reset()
+{
+ResetToDefaults();
+
+if (mbToken mpToken)
+mpToken-DecRef();
+
+mbToken = true;
+mpToken = NULL;
+}
inline void ScFormulaResult::ResetToDefaults()
{
diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx
index 2f3df26..1f89aed 100644
--- a/sc/source/core/data/cell.cxx
+++ b/sc/source/core/data/cell.cxx
@@ -2041,6 +2041,11 @@ void ScFormulaCell::MaybeInterpret()
Interpret();
}
+void ScFormulaCell::ResetFormulaResult()
+{
+aResult.Reset();
+}
+
EditTextObject* ScFormulaCell::CreateURLObject()
{
String aCellText;
diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index dac4111..6a21a07 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -429,6 +429,7 @@ void ScTable::FillFormula(sal_uLong /* nFormulaCounter */,
bool /* bFirst */, S
pDocument-SetNoListening( true ); // noch falsche Referenzen
ScAddress aAddr( nDestCol, nDestRow, nTab );
ScFormulaCell* pDestCell = new ScFormulaCell( *pSrcCell, *pDocument, aAddr
);
+pDestCell-ResetFormulaResult(); // formula cell is interpreted later
during fill.
aCol[nDestCol].Insert(nDestRow, pDestCell);
if ( bLast pDestCell-GetMatrixFlag() )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/ui/vba/vbaselection.cxx |2 --
1 file changed, 2 deletions(-)
New commits:
commit 17dcc215e0501dfb0821c0ee42ab5ae5699caae2
Author: Julien Nabet serval2...@yahoo.fr
Date: Mon Jan 30 22:28:39 2012 +0100
Don't need a break after a throw
diff --git a/sw/source/ui/vba/vbaselection.cxx
b/sw/source/ui/vba/vbaselection.cxx
index 4ddee39..14152f8 100644
--- a/sw/source/ui/vba/vbaselection.cxx
+++ b/sw/source/ui/vba/vbaselection.cxx
@@ -163,7 +163,6 @@ SwVbaSelection::HomeKey( const uno::Any _unit, const
uno::Any _extend ) throw
default:
{
throw uno::RuntimeException( rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(Not implemented) ), uno::Reference
uno::XInterface () );
-break;
}
}
}
@@ -199,7 +198,6 @@ SwVbaSelection::EndKey( const uno::Any _unit, const
uno::Any _extend ) throw (
default:
{
throw uno::RuntimeException( rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(Not implemented) ), uno::Reference
uno::XInterface () );
-break;
}
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - sw/source
sw/source/core/fields/reffld.cxx | 39 ---
1 file changed, 24 insertions(+), 15 deletions(-)
New commits:
commit 5de902f2b66e64bc4b4755356db3b259c01ddcdd
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date: Mon Jan 30 11:35:42 2012 +0100
fdo#35669: more robust references merging
(cherry picked from commit 458d56d9b35f2ecb2eea2589737079390b10ee26)
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index c15c542..eca22ba 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -974,11 +974,13 @@ void _RefIdsMap::Init( SwDoc rDoc, SwDoc rDestDoc,
sal_Bool bField )
GetFieldIdsFromDoc( rDoc, aDstIds );
// Define the mappings now
-sal_uInt16 nMaxDstId = *aIds.end();
+sal_uInt16 nMaxDstId = -1;
+if ( !aIds.empty() )
+nMaxDstId = *aIds.rbegin();
// Map all the src fields to their value + nMaxDstId
for ( std::setsal_uInt16::iterator pIt = aDstIds.begin(); pIt !=
aDstIds.end(); ++pIt )
-AddId( nMaxDstId++, *pIt );
+AddId( ++nMaxDstId, *pIt );
// Change the Sequence number of all the SetExp fields in the
destination document
SwFieldType* pType = rDoc.GetFldType( RES_SETEXPFLD, aName, false );
commit d3294590d6c15205cc0a176e96ef04f2816079cd
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date: Thu Jan 26 15:30:01 2012 +0100
fdo#35669: properly merge ref fields in master documents
(cherry picked from commit 5e51960dede5015b862df05b7b16f02884647889)
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index 98111d0..c15c542 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -972,6 +972,26 @@ void _RefIdsMap::Init( SwDoc rDoc, SwDoc rDestDoc,
sal_Bool bField )
{
GetFieldIdsFromDoc( rDestDoc, aIds );
GetFieldIdsFromDoc( rDoc, aDstIds );
+
+// Define the mappings now
+sal_uInt16 nMaxDstId = *aIds.end();
+
+// Map all the src fields to their value + nMaxDstId
+for ( std::setsal_uInt16::iterator pIt = aDstIds.begin(); pIt !=
aDstIds.end(); ++pIt )
+AddId( nMaxDstId++, *pIt );
+
+// Change the Sequence number of all the SetExp fields in the
destination document
+SwFieldType* pType = rDoc.GetFldType( RES_SETEXPFLD, aName, false );
+if( pType )
+{
+SwIteratorSwFmtFld,SwFieldType aIter( *pType );
+for( SwFmtFld* pF = aIter.First(); pF; pF = aIter.Next() )
+if( pF-GetTxtFld() )
+{
+sal_uInt16 n =
((SwSetExpField*)pF-GetFld())-GetSeqNumber( );
+((SwSetExpField*)pF-GetFld())-SetSeqNumber(
sequencedIds[ n ] );
+}
+}
}
else
{
@@ -1030,21 +1050,8 @@ void _RefIdsMap::Check( SwDoc rDoc, SwDoc rDestDoc,
SwGetRefField rFld,
AddId( n, nSeqNo );
rFld.SetSeqNo( n );
-// und noch die Felder oder Fuss-/EndNote auf die neue
-// Id umsetzen
-if( bField )
-{
-SwFieldType* pType = rDoc.GetFldType( RES_SETEXPFLD, aName,
false );
-if( pType )
-{
-SwIteratorSwFmtFld,SwFieldType aIter( *pType );
-for( SwFmtFld* pF = aIter.First(); pF; pF = aIter.Next() )
-if( pF-GetTxtFld() nSeqNo ==
-((SwSetExpField*)pF-GetFld())-GetSeqNumber() )
-((SwSetExpField*)pF-GetFld())-SetSeqNumber( n );
-}
-}
-else
+// und noch die Fuss-/EndNote auf die neue Id umsetzen
+if( !bField )
{
SwTxtFtn* pFtnIdx;
for( sal_uInt16 i = 0, nCnt = rDoc.GetFtnIdxs().Count(); i
nCnt; ++i )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5-0' - 2 commits - connectivity/source sw/source
connectivity/source/drivers/odbcbase/OResultSet.cxx | 14 +++---
connectivity/source/drivers/odbcbase/OStatement.cxx | 14 +++---
connectivity/source/inc/odbc/OResultSet.hxx |2 +-
sw/source/filter/ww8/ww8scan.cxx| 18 +-
4 files changed, 24 insertions(+), 24 deletions(-)
New commits:
commit fb22e20d218e46eab5a3609db6e376a8f00ca904
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Sun Jan 29 21:17:36 2012 +0100
use proper sizes for SQL(Get|Set)StmtAttr
Fixes fdo#34432 (driver smashes our stack on 64bits arch)
Signed-off-by: Michael Meeks michael.me...@suse.com
Signed-off-by: Stephan Bergmann sberg...@redhat.com
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/connectivity/source/drivers/odbcbase/OResultSet.cxx
b/connectivity/source/drivers/odbcbase/OResultSet.cxx
index 1787744..e97b819 100644
--- a/connectivity/source/drivers/odbcbase/OResultSet.cxx
+++ b/connectivity/source/drivers/odbcbase/OResultSet.cxx
@@ -123,7 +123,7 @@ OResultSet::OResultSet(SQLHANDLE _pStatementHandle
,OStatement_Base* pStmt) :
catch(const Exception)
{ // we don't want our result destroy here
}
-SQLINTEGER nCurType = 0;
+SQLULEN nCurType = 0;
try
{
N3SQLGetStmtAttr(m_aStatementHandle,SQL_ATTR_CURSOR_TYPE,nCurType,SQL_IS_UINTEGER,0);
@@ -1268,7 +1268,7 @@ Sequence sal_Int32 SAL_CALL OResultSet::deleteRows(
const Sequence Any
//--
sal_Int32 OResultSet::getResultSetConcurrency() const
{
-sal_uInt32 nValue = 0;
+SQLULEN nValue = 0;
SQLRETURN nReturn =
N3SQLGetStmtAttr(m_aStatementHandle,SQL_ATTR_CONCURRENCY,nValue,SQL_IS_UINTEGER,0);
OSL_UNUSED( nReturn );
if(SQL_CONCUR_READ_ONLY == nValue)
@@ -1281,7 +1281,7 @@ sal_Int32 OResultSet::getResultSetConcurrency() const
//--
sal_Int32 OResultSet::getResultSetType() const
{
-sal_uInt32 nValue = 0;
+SQLULEN nValue = 0;
N3SQLGetStmtAttr(m_aStatementHandle,SQL_ATTR_CURSOR_SENSITIVITY,nValue,SQL_IS_UINTEGER,0);
if(SQL_SENSITIVE == nValue)
nValue = ResultSetType::SCROLL_SENSITIVE;
@@ -1289,7 +1289,7 @@ sal_Int32 OResultSet::getResultSetType() const
nValue = ResultSetType::SCROLL_INSENSITIVE;
else
{
-SQLINTEGER nCurType = 0;
+SQLULEN nCurType = 0;
N3SQLGetStmtAttr(m_aStatementHandle,SQL_ATTR_CURSOR_TYPE,nCurType,SQL_IS_UINTEGER,0);
if(SQL_CURSOR_KEYSET_DRIVEN == nCurType)
nValue = ResultSetType::SCROLL_SENSITIVE;
@@ -1310,7 +1310,7 @@ sal_Int32 OResultSet::getFetchDirection() const
//--
sal_Int32 OResultSet::getFetchSize() const
{
-sal_uInt32 nValue = 0;
+SQLULEN nValue = 0;
N3SQLGetStmtAttr(m_aStatementHandle,SQL_ATTR_ROW_ARRAY_SIZE,nValue,SQL_IS_UINTEGER,0);
return nValue;
}
@@ -1328,7 +1328,7 @@ sal_Bool OResultSet::isBookmarkable() const
if(!m_aConnectionHandle)
return sal_False;
-sal_uInt32 nValue = 0;
+SQLULEN nValue = 0;
N3SQLGetStmtAttr(m_aStatementHandle,SQL_ATTR_CURSOR_TYPE,nValue,SQL_IS_UINTEGER,0);
sal_Int32 nAttr = 0;
@@ -1679,7 +1679,7 @@ sal_Bool OResultSet::move(IResultSetHelper::Movement
_eCursorPosition, sal_Int32
//
-
sal_Int32 OResultSet::getDriverPos() const
{
-sal_Int32 nValue = 0;
+SQLULEN nValue = 0;
SQLRETURN nRet =
N3SQLGetStmtAttr(m_aStatementHandle,SQL_ATTR_ROW_NUMBER,nValue,SQL_IS_UINTEGER,0);
OSL_UNUSED( nRet );
OSL_TRACE( __FILE__: OResultSet::getDriverPos() = Ret = %d, RowNum = %d,
RowPos = %d,nRet,nValue , m_nRowPos);
diff --git a/connectivity/source/drivers/odbcbase/OStatement.cxx
b/connectivity/source/drivers/odbcbase/OStatement.cxx
index 1e8558c..d79e188 100644
--- a/connectivity/source/drivers/odbcbase/OStatement.cxx
+++ b/connectivity/source/drivers/odbcbase/OStatement.cxx
@@ -300,7 +300,7 @@ sal_Bool OStatement_Base::lockIfNecessary (const
::rtl::OUString sql) throw( SQ
OSL_ENSURE(m_aStatementHandle,StatementHandle is null!);
try
{
-SQLINTEGER nLock = SQL_CONCUR_LOCK;
+const SQLULEN nLock = SQL_CONCUR_LOCK;
THROW_SQL(N3SQLSetStmtAttr(m_aStatementHandle,
SQL_CONCURRENCY,(SQLPOINTER)(sal_IntPtr)nLock,SQL_IS_UINTEGER));
}
catch (const SQLWarning warn)
@@ -683,7 +683,7 @@ sal_Int64 OStatement_Base::getMaxRows() const
sal_Int32 OStatement_Base::getResultSetConcurrency() const
{
OSL_ENSURE(m_aStatementHandle,StatementHandle is null!);
-sal_uInt32 nValue;
+SQLULEN nValue;
SQLRETURN nRetCode =
N3SQLGetStmtAttr(m_aStatementHandle,SQL_ATTR_CONCURRENCY,nValue,SQL_IS_UINTEGER,0);
[Libreoffice-commits] .: dbaccess/source reportdesign/source
dbaccess/source/ui/control/VertSplitView.cxx |1 +
dbaccess/source/ui/inc/QueryTextView.hxx |1 -
dbaccess/source/ui/inc/VertSplitView.hxx |4 +++-
reportdesign/source/ui/inc/ReportWindow.hxx |2 --
4 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 648f6ac7c51656a21cd2df29eec21f9610b4657f
Author: Matteo Casalin matteo.casa...@poste.it
Date: Wed Jan 25 00:23:05 2012 +0100
Do not forward declare Splitter or include its header file if unneeded
diff --git a/dbaccess/source/ui/control/VertSplitView.cxx
b/dbaccess/source/ui/control/VertSplitView.cxx
index e04aafe..c1f7384 100644
--- a/dbaccess/source/ui/control/VertSplitView.cxx
+++ b/dbaccess/source/ui/control/VertSplitView.cxx
@@ -29,6 +29,7 @@
#include VertSplitView.hxx
#include tools/debug.hxx
+#include vcl/split.hxx
#define SPLITTER_WIDTH 80
diff --git a/dbaccess/source/ui/inc/QueryTextView.hxx
b/dbaccess/source/ui/inc/QueryTextView.hxx
index d541e97..03670be 100644
--- a/dbaccess/source/ui/inc/QueryTextView.hxx
+++ b/dbaccess/source/ui/inc/QueryTextView.hxx
@@ -31,7 +31,6 @@
#include queryview.hxx
#include querycontainerwindow.hxx
-class Splitter;
namespace dbaui
{
class OSqlEdit;
diff --git a/dbaccess/source/ui/inc/VertSplitView.hxx
b/dbaccess/source/ui/inc/VertSplitView.hxx
index b9d52b3..e25c6d4 100644
--- a/dbaccess/source/ui/inc/VertSplitView.hxx
+++ b/dbaccess/source/ui/inc/VertSplitView.hxx
@@ -28,7 +28,9 @@
#ifndef DBAUI_VERTSPLITVIEW_HXX
#define DBAUI_VERTSPLITVIEW_HXX
-#include vcl/split.hxx
+#include vcl/window.hxx
+
+class Splitter;
namespace dbaui
{
diff --git a/reportdesign/source/ui/inc/ReportWindow.hxx
b/reportdesign/source/ui/inc/ReportWindow.hxx
index 27200bd..87d549b 100644
--- a/reportdesign/source/ui/inc/ReportWindow.hxx
+++ b/reportdesign/source/ui/inc/ReportWindow.hxx
@@ -42,8 +42,6 @@
#include MarkedSection.hxx
#include ViewsWindow.hxx
-class Splitter;
-
namespace rptui
{
class ODesignView;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - vcl/inc vcl/unx
vcl/inc/win/salids.hrc |2 -
vcl/unx/generic/app/saldisp.cxx | 62 ++--
2 files changed, 10 insertions(+), 54 deletions(-)
New commits:
commit ae501cc73fe11c0f7b85b9f8be2bfb0d6fbe487f
Author: Thomas Arnhold tho...@arnhold.org
Date: Mon Jan 30 22:48:36 2012 +0100
W40ONLY is never defined
diff --git a/vcl/inc/win/salids.hrc b/vcl/inc/win/salids.hrc
index 3049f11..f8aec19 100644
--- a/vcl/inc/win/salids.hrc
+++ b/vcl/inc/win/salids.hrc
@@ -30,9 +30,7 @@
// Cursor
#define SAL_RESID_POINTER_NULL 1
-#ifndef W40ONLY
#define SAL_RESID_POINTER_HELP 10001
-#endif
#ifndef WNT
#define SAL_RESID_POINTER_HSIZE 10002
#define SAL_RESID_POINTER_VSIZE 10003
commit 3b90a3f1eaf9b98e52917d97b6991762d498c10d
Author: Thomas Arnhold tho...@arnhold.org
Date: Sun Jan 29 15:24:33 2012 +0100
vcl: stuff
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 90cfe61..4c10665 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -243,14 +243,18 @@ sal_Bool SalDisplay::BestVisual( Display *pDisplay,
VisualID nDefVID = XVisualIDFromVisual( DefaultVisual( pDisplay, nScreen )
);
XVisualInfo aVI;
+//aVI.visualid = nDefVID;
aVI.screen = nScreen;
// get all visuals
int nVisuals;
XVisualInfo* pVInfos = XGetVisualInfo( pDisplay, VisualScreenMask,
aVI, nVisuals );
+if (!pVInfos)
+return sal_False;
+
// HACK
-rVI = pVInfos[ 0 ];
+rVI = *pVInfos;
XFree( pVInfos );
return rVI.visualid == nDefVID;
@@ -434,10 +438,11 @@ SalDisplay::initScreen( SalX11Screen nXScreen ) const
if( SalDisplay::BestVisual( pDisp_, nXScreen.getXScreen(), aVI ) ) //
DefaultVisual
aColMap = DefaultColormap( pDisp_, nXScreen.getXScreen() );
else
-aColMap = XCreateColormap( pDisp_,
- RootWindow( pDisp_, nXScreen.getXScreen() ),
- aVI.visual,
- AllocNone );
+fprintf( stderr, HACK: XCreateColormap would be called...\n );
+//aColMap = XCreateColormap( pDisp_,
+// RootWindow( pDisp_, nXScreen.getXScreen()
),
+// aVI.visual,
+// AllocNone );
Screen* pScreen = ScreenOfDisplay( pDisp_, nXScreen.getXScreen() );
commit 9c1a107696d032ec4e5e5ac0526c643d3a666c06
Author: Thomas Arnhold tho...@arnhold.org
Date: Sun Jan 29 13:50:45 2012 +0100
vcl: BestVisuals strip
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 5269065..90cfe61 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -241,13 +241,6 @@ sal_Bool SalDisplay::BestVisual( Display *pDisplay,
XVisualInfo rVI )
{
VisualID nDefVID = XVisualIDFromVisual( DefaultVisual( pDisplay, nScreen )
);
-VisualIDnVID = 0;
-char *pVID = getenv( SAL_VISUAL );
-if( pVID )
-sscanf( pVID, %li, nVID );
-
-if( nVID sal_GetVisualInfo( pDisplay, nVID, rVI ) )
-return rVI.visualid == nDefVID;
XVisualInfo aVI;
aVI.screen = nScreen;
@@ -255,49 +248,9 @@ sal_Bool SalDisplay::BestVisual( Display *pDisplay,
int nVisuals;
XVisualInfo* pVInfos = XGetVisualInfo( pDisplay, VisualScreenMask,
aVI, nVisuals );
-// pVInfos should contain at least one visual, otherwise
-// we're in trouble
-int* pWeight = (int*)alloca( sizeof(int)*nVisuals );
-int i;
-for( i = 0; i nVisuals; i++ )
-{
-sal_Bool bUsable = sal_False;
-int nTrueColor = 1;
-
-if ( pVInfos[i].screen != nScreen )
-{
-bUsable = sal_False;
-}
-else
-if( pVInfos[i].c_class == TrueColor )
-{
-nTrueColor = 2048;
-if( pVInfos[i].depth == 24 )
-bUsable = sal_True;
-}
-else if( pVInfos[i].c_class == PseudoColor )
-{
-if( pVInfos[i].depth = 8 )
-bUsable = sal_True;
-else if( pVInfos[i].depth == 12 )
-bUsable = sal_True;
-}
-pWeight[ i ] = bUsable ? nTrueColor*pVInfos[i].depth : -1024;
-pWeight[ i ] -= pVInfos[ i ].visualid;
-}
-
-int nBestVisual = 0;
-int nBestWeight = -1024;
-for( i = 0; i nVisuals; i++ )
-{
-if( pWeight[ i ] nBestWeight )
-{
-nBestWeight = pWeight[ i ];
-nBestVisual = i;
-}
-}
-rVI = pVInfos[ nBestVisual ];
+// HACK
+rVI = pVInfos[ 0 ];
XFree( pVInfos );
return rVI.visualid == nDefVID;
___
[Libreoffice-commits] .: 2 commits - vcl/unx
vcl/unx/generic/app/saldisp.cxx | 62 +---
1 file changed, 52 insertions(+), 10 deletions(-)
New commits:
commit 0e93d1e91f2b6994e509e16de6989afb8fdf3207
Author: Thomas Arnhold tho...@arnhold.org
Date: Mon Jan 30 22:52:19 2012 +0100
Revert vcl: BestVisuals strip
This reverts commit 9c1a107696d032ec4e5e5ac0526c643d3a666c06.
this is work is progress, not public...
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 90cfe61..5269065 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -241,6 +241,13 @@ sal_Bool SalDisplay::BestVisual( Display *pDisplay,
XVisualInfo rVI )
{
VisualID nDefVID = XVisualIDFromVisual( DefaultVisual( pDisplay, nScreen )
);
+VisualIDnVID = 0;
+char *pVID = getenv( SAL_VISUAL );
+if( pVID )
+sscanf( pVID, %li, nVID );
+
+if( nVID sal_GetVisualInfo( pDisplay, nVID, rVI ) )
+return rVI.visualid == nDefVID;
XVisualInfo aVI;
aVI.screen = nScreen;
@@ -248,9 +255,49 @@ sal_Bool SalDisplay::BestVisual( Display *pDisplay,
int nVisuals;
XVisualInfo* pVInfos = XGetVisualInfo( pDisplay, VisualScreenMask,
aVI, nVisuals );
+// pVInfos should contain at least one visual, otherwise
+// we're in trouble
+int* pWeight = (int*)alloca( sizeof(int)*nVisuals );
+int i;
+for( i = 0; i nVisuals; i++ )
+{
+sal_Bool bUsable = sal_False;
+int nTrueColor = 1;
+
+if ( pVInfos[i].screen != nScreen )
+{
+bUsable = sal_False;
+}
+else
+if( pVInfos[i].c_class == TrueColor )
+{
+nTrueColor = 2048;
+if( pVInfos[i].depth == 24 )
+bUsable = sal_True;
+}
+else if( pVInfos[i].c_class == PseudoColor )
+{
+if( pVInfos[i].depth = 8 )
+bUsable = sal_True;
+else if( pVInfos[i].depth == 12 )
+bUsable = sal_True;
+}
+pWeight[ i ] = bUsable ? nTrueColor*pVInfos[i].depth : -1024;
+pWeight[ i ] -= pVInfos[ i ].visualid;
+}
+
+int nBestVisual = 0;
+int nBestWeight = -1024;
+for( i = 0; i nVisuals; i++ )
+{
+if( pWeight[ i ] nBestWeight )
+{
+nBestWeight = pWeight[ i ];
+nBestVisual = i;
+}
+}
-// HACK
-rVI = pVInfos[ 0 ];
+rVI = pVInfos[ nBestVisual ];
XFree( pVInfos );
return rVI.visualid == nDefVID;
commit e11cfa9225b05415e12cf3b3cecc05103e62398a
Author: Thomas Arnhold tho...@arnhold.org
Date: Mon Jan 30 22:52:10 2012 +0100
Revert vcl: stuff
This reverts commit 3b90a3f1eaf9b98e52917d97b6991762d498c10d.
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 4c10665..90cfe61 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -243,18 +243,14 @@ sal_Bool SalDisplay::BestVisual( Display *pDisplay,
VisualID nDefVID = XVisualIDFromVisual( DefaultVisual( pDisplay, nScreen )
);
XVisualInfo aVI;
-//aVI.visualid = nDefVID;
aVI.screen = nScreen;
// get all visuals
int nVisuals;
XVisualInfo* pVInfos = XGetVisualInfo( pDisplay, VisualScreenMask,
aVI, nVisuals );
-if (!pVInfos)
-return sal_False;
-
// HACK
-rVI = *pVInfos;
+rVI = pVInfos[ 0 ];
XFree( pVInfos );
return rVI.visualid == nDefVID;
@@ -438,11 +434,10 @@ SalDisplay::initScreen( SalX11Screen nXScreen ) const
if( SalDisplay::BestVisual( pDisp_, nXScreen.getXScreen(), aVI ) ) //
DefaultVisual
aColMap = DefaultColormap( pDisp_, nXScreen.getXScreen() );
else
-fprintf( stderr, HACK: XCreateColormap would be called...\n );
-//aColMap = XCreateColormap( pDisp_,
-// RootWindow( pDisp_, nXScreen.getXScreen()
),
-// aVI.visual,
-// AllocNone );
+aColMap = XCreateColormap( pDisp_,
+ RootWindow( pDisp_, nXScreen.getXScreen() ),
+ aVI.visual,
+ AllocNone );
Screen* pScreen = ScreenOfDisplay( pDisp_, nXScreen.getXScreen() );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cui/source
cui/source/options/optmemory.src |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5f40691909235903a2683e4c3b26f3bddc4e0cd1
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Jan 30 23:03:04 2012 +0100
MaxTextLength apparently needs to take comma in 1,000 into account.
Otherwise, max undo steps field gets reset to 100 (?) for inputs .
diff --git a/cui/source/options/optmemory.src b/cui/source/options/optmemory.src
index 5c95cbb..c1e748b 100644
--- a/cui/source/options/optmemory.src
+++ b/cui/source/options/optmemory.src
@@ -65,7 +65,7 @@ TabPage OFA_TP_MEMORY
Value = 100 ;
Last = 100 ;
SpinSize = 1 ;
-MaxTextLength = 4;
+MaxTextLength = 5;
};
FixedLine GB_GRAPHICCACHE
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'feature/opengl-canvas'
New branch 'feature/opengl-canvas' available with the following commits: commit ba6993884f219b6892c0475de01f28c810382ddf Author: Thorsten Behrens tbehr...@suse.com Date: Tue Jan 31 01:07:48 2012 +0100 Add opengl canvas implementation. Adds opengl canvas implementation - display-list-based, all rendering done as textured geometry. Needs shader support. Currently compiles and works on Linux, Mac should be ~easy to add, win32 eventually. commit e4bc5be63792e1865ce0e8cc85ea02a01f4b7ea9 Author: Thorsten Behrens tbehr...@suse.com Date: Tue Jan 31 01:04:10 2012 +0100 XCanvas does no longer imply XBitmapCanvas Remove the implication that XCanvas IS-A XBitmapCanvas, i.e. one can access underlying pixels. That's a preparation for display-list based canvas implementations, and was a rather silly assumption in the first place. Also fixes up all client sites. commit f5f7e300bf74cf6f3f2613d5b0b1a9b638b3235e Author: Thorsten Behrens tbehr...@suse.com Date: Tue Jan 31 00:52:50 2012 +0100 Add 7-segment display polygon generator to basegfx. Basegfx gets a basegfx::tools::number2PolyPolygon method that converts a number 0-9 into a 7-segment digit display polygon. ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: freetype/prj libexttextcat/prj
freetype/prj/build.lst |6 +++--- libexttextcat/prj/build.lst |6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) New commits: commit 9f18cc75a2ed2a9316966f863ff9a8b157179474 Author: Norbert Thiebaud nthieb...@gmail.com Date: Mon Jan 30 18:40:13 2012 -0600 keep the module name consistent in build.lst diff --git a/freetype/prj/build.lst b/freetype/prj/build.lst index 8e3134d..5d58fed 100644 --- a/freetype/prj/build.lst +++ b/freetype/prj/build.lst @@ -1,3 +1,3 @@ -ft libfreetype : NULL -ft libfreetype usr1- u ft_mkout NULL -ft libfreetype nmake - u ft_libfreetype NULL +ft freetype : NULL +ft freetype usr1- u ft_mkout NULL +ft freetype nmake - u ft_libfreetype NULL diff --git a/libexttextcat/prj/build.lst b/libexttextcat/prj/build.lst index 8516375..133bcb7 100644 --- a/libexttextcat/prj/build.lst +++ b/libexttextcat/prj/build.lst @@ -1,3 +1,3 @@ -ltc libtextcat : soltools solenv NULL -ltc libtextcat usr1- all ltc_mkout NULL -ltc libtextcat nmake - all ltc_libtextcat NULL +ltc libexttextcat : soltools solenv NULL +ltc libexttextcat usr1- all ltc_mkout NULL +ltc libexttextcat nmake - all ltc_libtextcat NULL ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: fontconfig/prj
fontconfig/prj/build.lst |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 27bd5ff1fd49ea8b98da18b2544793251103d8cf Author: Norbert Thiebaud nthieb...@gmail.com Date: Mon Jan 30 18:44:25 2012 -0600 keep the module name consistent in build.lst diff --git a/fontconfig/prj/build.lst b/fontconfig/prj/build.lst index 43891b4..3033261 100644 --- a/fontconfig/prj/build.lst +++ b/fontconfig/prj/build.lst @@ -1,3 +1,3 @@ -fc libfontconfig : FREETYPE:freetype EXPAT:expat NULL -fc libfontconfig usr1- u fc_mkout NULL -fc libfontconfig nmake - u fc_libfontconfig NULL +fc fontconfig : FREETYPE:freetype EXPAT:expat NULL +fc fontconfig usr1- u fc_mkout NULL +fc fontconfig nmake - u fc_libfontconfig NULL ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sal/inc
sal/inc/sal/log-areas.dox |4 1 file changed, 4 insertions(+) New commits: commit bfd9753b92c225d7cc2b2d3172b26eb53a8e9228 Author: David Tardon dtar...@redhat.com Date: Tue Jan 31 07:18:49 2012 +0100 add vcl log area diff --git a/sal/inc/sal/log-areas.dox b/sal/inc/sal/log-areas.dox index 42a96ae..d0cbaee 100644 --- a/sal/inc/sal/log-areas.dox +++ b/sal/inc/sal/log-areas.dox @@ -17,6 +17,10 @@ certain functionality. @li oox.xmlstream - XmlStream class +@section VCL + +@li vcl.gtk - Gtk+ 2/3 plugin + @section Writer @li sw.uno - Writer's UNO interfaces ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: test/inc test/source
test/inc/test/sheet/xdatapilotdescriptor.hxx |2 --
test/source/sheet/xdatapilotdescriptor.cxx |2 ++
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 2525c93e08f9b6256c298171a792add6b7fa0c29
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Jan 31 08:39:07 2012 +0100
Move definition of static data member to .cxx
diff --git a/test/inc/test/sheet/xdatapilotdescriptor.hxx
b/test/inc/test/sheet/xdatapilotdescriptor.hxx
index 9eca14c..eb5b8c1 100644
--- a/test/inc/test/sheet/xdatapilotdescriptor.hxx
+++ b/test/inc/test/sheet/xdatapilotdescriptor.hxx
@@ -60,8 +60,6 @@ private:
static std::vectorrtl::OUString maFieldNames;
};
-std::vector rtl::OUString XDataPilotDescriptor::maFieldNames;
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/test/source/sheet/xdatapilotdescriptor.cxx
b/test/source/sheet/xdatapilotdescriptor.cxx
index aa39416..eaddff5 100644
--- a/test/source/sheet/xdatapilotdescriptor.cxx
+++ b/test/source/sheet/xdatapilotdescriptor.cxx
@@ -41,6 +41,8 @@ using namespace com::sun::star::uno;
namespace apitest {
+std::vector rtl::OUString XDataPilotDescriptor::maFieldNames;
+
void XDataPilotDescriptor::testTag()
{
rtl::OUString aTag(RTL_CONSTASCII_USTRINGPARAM(DataPilotDescriptor_Tag));
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
