[Libreoffice-commits] .: 5 commits - sc/inc sc/source solenv/bin ucb/source
Eike Rathke
erack at kemper.freedesktop.org
Fri Nov 4 05:51:58 PDT 2011
sc/inc/global.hxx | 41 +++++++++++++-----
sc/source/core/data/patattr.cxx | 5 --
sc/source/core/tool/docoptio.cxx | 8 +--
sc/source/filter/excel/xlescher.cxx | 9 ++--
sc/source/filter/starcalc/scflt.cxx | 16 +++----
sc/source/ui/unoobj/cellsuno.cxx | 5 --
sc/source/ui/unoobj/defltuno.cxx | 6 +-
sc/source/ui/unoobj/docuno.cxx | 5 --
sc/source/ui/unoobj/styleuno.cxx | 5 --
sc/source/ui/view/cellsh3.cxx | 6 +-
solenv/bin/create-ids | 4 -
solenv/bin/id-lang.map | 12 +++--
ucb/source/ucp/webdav/NeonLockStore.cxx | 2
ucb/source/ucp/webdav/NeonLockStore.hxx | 2
ucb/source/ucp/webdav/NeonTypes.hxx | 2
ucb/source/ucp/webdav/warnings_guard_ne_locks.h | 54 ++++++++++++++++++++++++
16 files changed, 128 insertions(+), 54 deletions(-)
New commits:
commit 3976f78ac001ad3d14d3fdcd6c53e967ea656037
Author: Eike Rathke <erack at redhat.com>
Date: Fri Nov 4 13:40:18 2011 +0100
Fixed fdo#37083 mis-positioning caused by internal TeX points.
* Changed Calc's internal definition of points per inch from TeX points (72.27
points per inch) to PostScript points (72 points per inch) as used by the
rest of the world (except TeX).
* Aligns between internal representation and API that at various places
assumed PS points already.
* Fixes mis-positioning and bad sizing of drawing layer objects relative to
column widths and row heights.
* More precise printout of column widths and row heights.
* UI dialogs such as Column Width always assumed PS points, so earlier
versions actually displayed wrong metric (and imperial) units.
* Printouts now are slightly larger due to 0.27 points less in an inch, but
more accurate in reflecting the actual UI values, and drawing layer objects'
position and size match the row heights and column widths.
- Problems with drawing layer objects and zoomed view versus Page Preview
versus printout that don't align still persist.
- Problems with resized rows and misplaced drawing layer objects are also not
magically healed.
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index e8f7da1..cd9f9e3 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -102,12 +102,20 @@ const SCSIZE MAXQUERY = 8;
// Above this threshold are indices
// for data base areas
+#define SC_USE_PS_POINTS 1 /**< use PostScript points (72ppi) instead of old TeX points (72.27ppi) */
+
#define PIXEL_PER_INCH 96.0
#define CM_PER_INCH 2.54
-#define POINTS_PER_INCH 72.27
+#define PS_POINTS_PER_INCH 72.0 /**< PostScript points per inch */
+#define TEX_POINTS_PER_INCH 72.27 /**< old printer points, or TeX points per inch */
+#if SC_USE_PS_POINTS
+#define POINTS_PER_INCH PS_POINTS_PER_INCH /**< the actual definition of points used */
+#else
+#define POINTS_PER_INCH TEX_POINTS_PER_INCH
+#endif
#define PIXEL_PER_POINT (PIXEL_PER_INCH / POINTS_PER_INCH)
-#define INCHT_PER_CM (1.0 / CM_PER_INCH)
+#define INCH_PER_CM (1.0 / CM_PER_INCH)
#define POINTS_PER_CM (POINTS_PER_INCH / CM_PER_INCH)
#define TWIPS_PER_POINT 20.0
#define TWIPS_PER_INCH (TWIPS_PER_POINT * POINTS_PER_INCH)
@@ -118,22 +126,35 @@ const SCSIZE MAXQUERY = 8;
#define PIXEL_PER_TWIPS (PIXEL_PER_INCH / TWIPS_PER_INCH)
#define HMM_PER_TWIPS (CM_PER_TWIPS * 1000.0)
-#define STD_COL_WIDTH 1285
-#define STD_EXTRA_WIDTH 113 // 2mm extra for optimal width
- // standard row height: text + margin - STD_ROWHEIGHT_DIFF
+#if SC_USE_PS_POINTS
+#define STD_COL_WIDTH 1280 /* 2.2577cm, 64.00pt PS */
+#else
+#define STD_COL_WIDTH 1285 /* 2.2581cm, 64.25pt TeX */
+#endif
+#define STD_EXTRA_WIDTH 113 /* 2mm extra for optimal width,
+ * 0.1986cm with TeX points,
+ * 0.1993cm with PS points. */
-#define MAX_EXTRA_WIDTH 23811 // 42cm in TWIPS
+#define MAX_EXTRA_WIDTH 23811 /* 42cm in TWIPS, 41.8430cm TeX, 41.9999cm PS */
#define MAX_EXTRA_HEIGHT 23811
-#define MAX_COL_WIDTH 56693 // 1m in TWIPS
+#define MAX_COL_WIDTH 56693 /* 1m in TWIPS, 99.6266cm TeX, 100.0001cm PS */
#define MAX_COL_HEIGHT 56693
+ /* standard row height: text + margin - STD_ROWHEIGHT_DIFF */
#define STD_ROWHEIGHT_DIFF 23
-#define STD_FONT_HEIGHT 200 // equates 10 points
+#define STD_FONT_HEIGHT 200 /* equates 10 points */
-//! use ScGlobal::nStdRowHeight instead of STD_ROW_HEIGHT !
+/// use ScGlobal::nStdRowHeight instead of STD_ROW_HEIGHT !
-#define STD_ROW_HEIGHT (12.8 * TWIPS_PER_POINT) // 256 Twips, 0.45 cm
+#define STD_ROW_HEIGHT (12.8 * TWIPS_PER_POINT) /* 256 Twips, 0.45 cm */
+
+namespace sc
+{
+ inline long TwipsToHMM( long nTwips ) { return (nTwips * 127 + 36) / 72; }
+ inline long HMMToTwips( long nHMM ) { return (nHMM * 72 + 63) / 127; }
+ inline long TwipsToEvenHMM( long nTwips ) { return ( (nTwips * 127 + 72) / 144 ) * 2; }
+}
// standard size as OLE server (cells)
#define OLE_STD_CELLS_X 4
diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx
index 02d1478..71dcc57 100644
--- a/sc/source/core/data/patattr.cxx
+++ b/sc/source/core/data/patattr.cxx
@@ -82,9 +82,8 @@ ScDocument* ScPatternAttr::pDoc = NULL;
// -----------------------------------------------------------------------
-//! move to some header file
-inline long TwipsToHMM(long nTwips) { return (nTwips * 127 + 36) / 72; }
-inline long HMMToTwips(long nHMM) { return (nHMM * 72 + 63) / 127; }
+using sc::HMMToTwips;
+using sc::TwipsToHMM;
// -----------------------------------------------------------------------
diff --git a/sc/source/core/tool/docoptio.cxx b/sc/source/core/tool/docoptio.cxx
index c26186f..6f4c984 100644
--- a/sc/source/core/tool/docoptio.cxx
+++ b/sc/source/core/tool/docoptio.cxx
@@ -61,11 +61,9 @@ TYPEINIT1(ScTpCalcItem, SfxPoolItem);
//------------------------------------------------------------------------
-//! these functions should be moved to some header file
-inline long TwipsToHMM(long nTwips) { return (nTwips * 127 + 36) / 72; }
-inline long HMMToTwips(long nHMM) { return (nHMM * 72 + 63) / 127; }
-
-inline long TwipsToEvenHMM(long nTwips) { return ( (nTwips * 127 + 72) / 144 ) * 2; }
+using sc::HMMToTwips;
+using sc::TwipsToHMM;
+using sc::TwipsToEvenHMM;
//------------------------------------------------------------------------
diff --git a/sc/source/filter/excel/xlescher.cxx b/sc/source/filter/excel/xlescher.cxx
index ddfb1da..a30da5f 100644
--- a/sc/source/filter/excel/xlescher.cxx
+++ b/sc/source/filter/excel/xlescher.cxx
@@ -82,12 +82,15 @@ double lclGetTwipsScale( MapUnit eMapUnit )
/* We cannot use OutputDevice::LogicToLogic() or the XclTools
conversion functions to calculate drawing layer coordinates due to
Calc's strange definition of a point (1 inch == 72.27 points, instead
- of 72 points). */
+ of 72 points).
+ NOTE: Calc's definition changed from TeX points (72.27) to PS points
+ (72), so the MAP_TWIP case now actually also delivers a scale of 1.0
+ */
double fScale = 1.0;
switch( eMapUnit )
{
- case MAP_TWIP: fScale = 72 / POINTS_PER_INCH; break; // Calc twips <-> real twips
- case MAP_100TH_MM: fScale = HMM_PER_TWIPS; break; // Calc twips <-> 1/100mm
+ case MAP_TWIP: fScale = PS_POINTS_PER_INCH / POINTS_PER_INCH; break; // Calc twips <-> real twips
+ case MAP_100TH_MM: fScale = HMM_PER_TWIPS; break; // Calc twips <-> 1/100mm
default: OSL_FAIL( "lclGetTwipsScale - map unit not implemented" );
}
return fScale;
diff --git a/sc/source/filter/starcalc/scflt.cxx b/sc/source/filter/starcalc/scflt.cxx
index 23ba127..ccb7ee9 100644
--- a/sc/source/filter/starcalc/scflt.cxx
+++ b/sc/source/filter/starcalc/scflt.cxx
@@ -691,14 +691,14 @@ void Sc10PageCollection::PutToDoc( ScDocument* pDoc )
{
Sc10PageFormat* pPage = &At(i)->aPageFormat;
- pPage->Width = (short) ( pPage->Width * ( 72.0 / 72.27 ) + 0.5 );
- pPage->Height = (short) ( pPage->Height * ( 72.0 / 72.27 ) + 0.5 );
- pPage->Top = (short) ( pPage->Top * ( 72.0 / 72.27 ) + 0.5 );
- pPage->Bottom = (short) ( pPage->Bottom * ( 72.0 / 72.27 ) + 0.5 );
- pPage->Left = (short) ( pPage->Left * ( 72.0 / 72.27 ) + 0.5 );
- pPage->Right = (short) ( pPage->Right * ( 72.0 / 72.27 ) + 0.5 );
- pPage->Head = (short) ( pPage->Head * ( 72.0 / 72.27 ) + 0.5 );
- pPage->Foot = (short) ( pPage->Foot * ( 72.0 / 72.27 ) + 0.5 );
+ pPage->Width = (short) ( pPage->Width * ( PS_POINTS_PER_INCH / POINTS_PER_INCH ) + 0.5 );
+ pPage->Height = (short) ( pPage->Height * ( PS_POINTS_PER_INCH / POINTS_PER_INCH ) + 0.5 );
+ pPage->Top = (short) ( pPage->Top * ( PS_POINTS_PER_INCH / POINTS_PER_INCH ) + 0.5 );
+ pPage->Bottom = (short) ( pPage->Bottom * ( PS_POINTS_PER_INCH / POINTS_PER_INCH ) + 0.5 );
+ pPage->Left = (short) ( pPage->Left * ( PS_POINTS_PER_INCH / POINTS_PER_INCH ) + 0.5 );
+ pPage->Right = (short) ( pPage->Right * ( PS_POINTS_PER_INCH / POINTS_PER_INCH ) + 0.5 );
+ pPage->Head = (short) ( pPage->Head * ( PS_POINTS_PER_INCH / POINTS_PER_INCH ) + 0.5 );
+ pPage->Foot = (short) ( pPage->Foot * ( PS_POINTS_PER_INCH / POINTS_PER_INCH ) + 0.5 );
String aName = lcl_MakeOldPageStyleFormatName( i );
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 748b3c0..aa45cc0 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -815,9 +815,8 @@ const SvxItemPropertySet* lcl_GetEditPropertySet()
//------------------------------------------------------------------------
-//! diese Funktionen in einen allgemeinen Header verschieben
-inline long TwipsToHMM(long nTwips) { return (nTwips * 127 + 36) / 72; }
-inline long HMMToTwips(long nHMM) { return (nHMM * 72 + 63) / 127; }
+using sc::HMMToTwips;
+using sc::TwipsToHMM;
//------------------------------------------------------------------------
diff --git a/sc/source/ui/unoobj/defltuno.cxx b/sc/source/ui/unoobj/defltuno.cxx
index 916d958..56116d4 100644
--- a/sc/source/ui/unoobj/defltuno.cxx
+++ b/sc/source/ui/unoobj/defltuno.cxx
@@ -82,9 +82,9 @@ const SfxItemPropertyMapEntry* lcl_GetDocDefaultsMap()
return aDocDefaultsMap_Impl;
}
-inline long TwipsToHMM(long nTwips) { return (nTwips * 127 + 36) / 72; }
-inline long HMMToTwips(long nHMM) { return (nHMM * 72 + 63) / 127; }
-inline long TwipsToEvenHMM(long nTwips) { return ( (nTwips * 127 + 72) / 144 ) * 2; }
+using sc::HMMToTwips;
+using sc::TwipsToHMM;
+using sc::TwipsToEvenHMM;
//------------------------------------------------------------------------
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 7332eda..8015b2c 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -195,9 +195,8 @@ const SfxItemPropertyMapEntry* lcl_GetRowsPropertyMap()
return aRowsPropertyMap_Impl;
}
-//! move these functions to a header file
-inline long TwipsToHMM(long nTwips) { return (nTwips * 127 + 36) / 72; }
-inline long HMMToTwips(long nHMM) { return (nHMM * 72 + 63) / 127; }
+using sc::HMMToTwips;
+using sc::TwipsToHMM;
//------------------------------------------------------------------------
diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx
index 903f41c..41cef8d 100644
--- a/sc/source/ui/unoobj/styleuno.cxx
+++ b/sc/source/ui/unoobj/styleuno.cxx
@@ -383,9 +383,8 @@ static sal_uInt16 aStyleFamilyTypes[SC_STYLE_FAMILY_COUNT] = { SFX_STYLE_FAMILY_
//------------------------------------------------------------------------
-//! diese Funktionen in einen allgemeinen Header verschieben
-inline long TwipsToHMM(long nTwips) { return (nTwips * 127 + 36) / 72; }
-inline long HMMToTwips(long nHMM) { return (nHMM * 72 + 63) / 127; }
+using sc::HMMToTwips;
+using sc::TwipsToHMM;
//------------------------------------------------------------------------
diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx
index b7d6750..6630064 100644
--- a/sc/source/ui/view/cellsh3.cxx
+++ b/sc/source/ui/view/cellsh3.cxx
@@ -61,9 +61,9 @@
#define IS_EDITMODE() GetViewData()->HasEditView( GetViewData()->GetActivePart() )
-inline long TwipsToHMM(long nTwips) { return (nTwips * 127 + 36) / 72; }
-inline long HMMToTwips(long nHMM) { return (nHMM * 72 + 63) / 127; }
-inline long TwipsToEvenHMM(long nTwips) { return ( (nTwips * 127 + 72) / 144 ) * 2; }
+using sc::HMMToTwips;
+using sc::TwipsToHMM;
+using sc::TwipsToEvenHMM;
//------------------------------------------------------------------
commit 07d0503fc641edc988a0142eedfeb79f1bd594a9
Author: Eike Rathke <erack at redhat.com>
Date: Tue Oct 25 17:38:32 2011 +0200
add .idl as C++
diff --git a/solenv/bin/id-lang.map b/solenv/bin/id-lang.map
index acc5afc..03a752a 100644
--- a/solenv/bin/id-lang.map
+++ b/solenv/bin/id-lang.map
@@ -93,13 +93,15 @@ Makefile.* make
*.gz FILTER gzip -d <%s
*.Z FILTER gzip -d <%s
-######### OOo-specific stuff #######################################
+######### LibO-specific stuff #######################################
-# Treat OOo resource header files as C files
+# Treat LibO resource header files as C files
*.hrc C
-# Treat OOo header files generated from *.idl as C++ files
+# Treat LibO header files generated from *.idl as C++ files
*.hdl C++
-# Treat OOo resource files as C files
+# Treat LibO IDL files as C++ files, not exactly a header file, but ...
+*.idl C++
+# Treat LibO resource files as C files
*.src C
-# Treat OOo *.mk files as makefiles
+# Treat LibO *.mk files as makefiles
*.mk make
commit 10751751023eb8c2a1ec64ab9624594d5d719310
Author: Eike Rathke <erack at redhat.com>
Date: Tue Oct 25 17:25:32 2011 +0200
add language java
diff --git a/solenv/bin/create-ids b/solenv/bin/create-ids
index be0a8d0..c0f2496 100755
--- a/solenv/bin/create-ids
+++ b/solenv/bin/create-ids
@@ -5,4 +5,4 @@
. ./Env.Host.sh
dirs="*/$INPATH/inc */$INPATH/misc/build `ls -d */* | sed -e '/\(\/\(common\|unxlng\|unxsol\|unxmac\|wntmsc\|Jamfile\|cscope\.\|tags\|ID\)\)\|^\(solver\|clone\)\//d'`"
-mkid --lang-map=`dirname $0`/id-lang.map --include='C C++ asm perl make' --statistics $dirs
+mkid --lang-map=`dirname $0`/id-lang.map --include='C C++ asm perl java make' --statistics $dirs
commit 5a1225b76112e6abcd2ac232a1cf53d9988ea19f
Author: Eike Rathke <erack at redhat.com>
Date: Tue Oct 25 17:23:08 2011 +0200
ensure that only THE clone dir is excluded
diff --git a/solenv/bin/create-ids b/solenv/bin/create-ids
index 7567e85..be0a8d0 100755
--- a/solenv/bin/create-ids
+++ b/solenv/bin/create-ids
@@ -4,5 +4,5 @@
. ./Env.Host.sh
-dirs="*/$INPATH/inc */$INPATH/misc/build `ls -d */* | sed -e '/\(clone\/\|\/\(common\|unxlng\|unxsol\|unxmac\|wntmsc\|Jamfile\|cscope\.\|tags\|ID\)\)\|^solver\//d'`"
+dirs="*/$INPATH/inc */$INPATH/misc/build `ls -d */* | sed -e '/\(\/\(common\|unxlng\|unxsol\|unxmac\|wntmsc\|Jamfile\|cscope\.\|tags\|ID\)\)\|^\(solver\|clone\)\//d'`"
mkid --lang-map=`dirname $0`/id-lang.map --include='C C++ asm perl make' --statistics $dirs
commit fc2207ecfd0503366b1849ef2c7790df5e95a680
Author: Eike Rathke <erack at redhat.com>
Date: Tue Oct 25 15:31:42 2011 +0200
Silence down ne_lock gcc WaE
Wraps this
/usr/include/neon/ne_locks.h:125:51: warning: 'int ne_lock(ne_session*, ne_lock*)'
hides constructor for 'struct ne_lock' [-Wshadow]
into a system header guard.
diff --git a/ucb/source/ucp/webdav/NeonLockStore.cxx b/ucb/source/ucp/webdav/NeonLockStore.cxx
index 9cb3ec9..5ae25e1 100644
--- a/ucb/source/ucp/webdav/NeonLockStore.cxx
+++ b/ucb/source/ucp/webdav/NeonLockStore.cxx
@@ -29,7 +29,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_ucb.hxx"
-#include <ne_locks.h>
+#include "warnings_guard_ne_locks.h"
#include <ne_uri.h>
#include "rtl/ustring.hxx"
#include "osl/time.h"
diff --git a/ucb/source/ucp/webdav/NeonLockStore.hxx b/ucb/source/ucp/webdav/NeonLockStore.hxx
index 7d253e7..3b6fbde 100644
--- a/ucb/source/ucp/webdav/NeonLockStore.hxx
+++ b/ucb/source/ucp/webdav/NeonLockStore.hxx
@@ -29,7 +29,7 @@
#define INCLUDED_NEONLOCKSTORE_HXX
#include <map>
-#include "ne_locks.h"
+#include "warnings_guard_ne_locks.h"
#include "osl/mutex.hxx"
#include "rtl/ref.hxx"
#include "NeonTypes.hxx"
diff --git a/ucb/source/ucp/webdav/NeonTypes.hxx b/ucb/source/ucp/webdav/NeonTypes.hxx
index d1f8ffa..d6c2741 100644
--- a/ucb/source/ucp/webdav/NeonTypes.hxx
+++ b/ucb/source/ucp/webdav/NeonTypes.hxx
@@ -33,7 +33,7 @@
#include <ne_utils.h>
#include <ne_basic.h>
#include <ne_props.h>
-#include <ne_locks.h>
+#include "warnings_guard_ne_locks.h"
typedef ne_session HttpSession;
typedef ne_status HttpStatus;
diff --git a/ucb/source/ucp/webdav/warnings_guard_ne_locks.h b/ucb/source/ucp/webdav/warnings_guard_ne_locks.h
new file mode 100644
index 0000000..c5ee6a0
--- /dev/null
+++ b/ucb/source/ucp/webdav/warnings_guard_ne_locks.h
@@ -0,0 +1,54 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Major Contributor(s):
+ * [ Copyright (C) 2011 Eike Rathke <erack at redhat.com> (initial developer) ]
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#ifndef INCLUDED_WARNINGS_GUARD_NE_LOCKS_H
+#define INCLUDED_WARNINGS_GUARD_NE_LOCKS_H
+
+// Because the GCC system_header mechanism doesn't work in .c/.cxx compilation
+// units and more important affects the rest of the current include file, the
+// warnings guard is separated into this header file on its own.
+
+/*
+ Silence down this WaE:
+ /usr/include/neon/ne_locks.h:125:51: warning: 'int ne_lock(ne_session*, ne_lock*)'
+ hides constructor for 'struct ne_lock' [-Wshadow]
+*/
+
+#ifdef _MSC_VER
+#pragma warning(push, 1)
+#elif defined __GNUC__
+#pragma GCC system_header
+#endif
+#include <ne_locks.h>
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
+#endif // INCLUDED_WARNINGS_GUARD_NE_LOCKS_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list