[Libreoffice-commits] .: 2 commits - cui/source
cui/source/customize/macropg.cxx |1 -
cui/source/inc/iconcdlg.hxx |1 -
cui/source/options/cuisrchdlg.cxx |2 --
cui/source/options/fontsubs.cxx |4
cui/source/options/optdict.cxx|1 -
cui/source/options/optfltr.cxx|3 ---
cui/source/options/optgdlg.cxx|8
cui/source/options/optgdlg.hxx|1 -
cui/source/options/optinet2.hxx | 13 -
cui/source/options/optlingu.cxx |7 ---
cui/source/options/optmemory.cxx |2 --
cui/source/options/optmemory.hxx |1 -
cui/source/options/optpath.cxx|1 -
cui/source/tabpages/border.cxx|2 --
cui/source/tabpages/macroass.cxx |3 ---
cui/source/tabpages/numpages.cxx |1 -
cui/source/tabpages/transfrm.cxx |3 ---
17 files changed, 54 deletions(-)
New commits:
commit 2496eb6fd40ed6d91bdbc4a85e5b30b1afc707d1
Author: Takeshi Abe
Date: Sun Apr 22 05:08:10 2012 +0900
removed unused static data
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index 30f74ec..f850929 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -55,7 +55,6 @@ using namespace ::com::sun::star::linguistic2;
// static
-static const sal_uInt16 nNameLen= 8;
static const short NOACTDICT = -1;
static long nStaticTabs[]=
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index ea17472..418455e 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1228,10 +1228,6 @@ static const OUString
sInstalledLocalesPath(RTL_CONSTASCII_USTRINGPARAM("org.ope
static OUString
sUserLocalePath(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Linguistic/General"));
//static const OUString
sUserLocalePath(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office/Linguistic"));
static const OUString sUserLocaleKey(RTL_CONSTASCII_USTRINGPARAM("UILocale"));
-static const OUString
sSystemLocalePath(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.System/L10N"));
-static const OUString
sSystemLocaleKey(RTL_CONSTASCII_USTRINGPARAM("UILocale"));
-static const OUString
sOfficeLocalePath(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office/L10N"));
-static const OUString
sOfficeLocaleKey(RTL_CONSTASCII_USTRINGPARAM("ooLocale"));
static Sequence< OUString > seqInstalledLanguages;
OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet&
rSet ) :
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index e433c44..198eff8 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -167,8 +167,6 @@ static void lcl_OpenURL( ::rtl::OUString sURL )
}
}
-static const sal_uInt16 nNameLen = 8;
-
static sal_uInt16 pRanges[] =
{
SID_ATTR_SPELL,
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 0b4dfa1..a4d3837 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -104,7 +104,6 @@
SV_IMPL_PTRARR(SvxNumSettingsArr_Impl,SvxNumSettings_ImplPtr);
static sal_Bool bLastRelative = sal_False;
static const sal_Char cNumberingType[] = "NumberingType";
-static const sal_Char cValue[] = "Value";
static const sal_Char cParentNumbering[] = "ParentNumbering";
static const sal_Char cPrefix[] = "Prefix";
static const sal_Char cSuffix[] = "Suffix";
commit 2ce52cbb18e8083dc14c6701a2dab8ca32b81967
Author: Takeshi Abe
Date: Sun Apr 22 05:07:37 2012 +0900
removed unused defines
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 94719ff..6e5a4ff 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -104,7 +104,6 @@ static long nTabs[] =
#defineITMEID_ASSMACRO2
-#define LB_EVENTS_ITEMPOS1
#define LB_MACROS_ITEMPOS2
diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx
index 41bdf61..ed7079d 100644
--- a/cui/source/inc/iconcdlg.hxx
+++ b/cui/source/inc/iconcdlg.hxx
@@ -40,7 +40,6 @@
#include
#define CTRLS_OFFSET3
-#define BUTTON_DISTANCE 8
#define RET_USER100
#define RET_USER_CANCEL 101
diff --git a/cui/source/options/cuisrchdlg.cxx
b/cui/source/options/cuisrchdlg.cxx
index 7422230..aba0b5b 100644
--- a/cui/source/options/cuisrchdlg.cxx
+++ b/cui/source/options/cuisrchdlg.cxx
@@ -47,8 +47,6 @@
#include
-#define ITEMID_SETITEM 0
-
#include
#include
#include
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index 0646287..d59c5ee 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -46,10 +46,6 @@
/* */
/*/
-#define CBCOL_FIRST 0
-#define CBCOL_SECOND1
-#define CBCOL_BOTH 2
-
SvxFontSubstTabPage::S
[Libreoffice-commits] .: 2 commits - cui/source sc/source
cui/source/inc/border.hxx |3 +--
cui/source/tabpages/border.cxx | 15 +--
sc/source/core/data/docpool.cxx |5 +
3 files changed, 11 insertions(+), 12 deletions(-)
New commits:
commit 149650b087ab5b15ef23e4ac6af5368b2820af1e
Author: Markus Mohrhard
Date: Mon Apr 2 17:20:26 2012 +0200
show synchronized checked only if all margins are the same, related
fdo#44337
diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx
index 7766ec9..ecb6c9e 100644
--- a/cui/source/inc/border.hxx
+++ b/cui/source/inc/border.hxx
@@ -125,8 +125,7 @@ private:
boolmbTLBREnabled; /// true = Top-left to
bottom-right border enabled.
boolmbBLTREnabled; /// true = Bottom-left to
top-right border enabled.
boolmbUseMarginItem;
-
-static sal_Bool bSync;
+boolmbSync;
#ifdef _SVX_BORDER_CXX
// Handler
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 390d60a..fd9c63c 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -86,8 +86,6 @@ static sal_uInt16 pRanges[] =
0
};
-sal_Bool SvxBorderTabPage::bSync = sal_True;
-
// ---
void lcl_SetDecimalDigitsTo1(MetricField& rField)
{
@@ -147,7 +145,8 @@ SvxBorderTabPage::SvxBorderTabPage( Window* pParent,
mbVerEnabled( false ),
mbTLBREnabled( false ),
mbBLTREnabled( false ),
-mbUseMarginItem( false )
+mbUseMarginItem( false ),
+mbSync(true)
{
// diese Page braucht ExchangeSupport
@@ -217,7 +216,6 @@ SvxBorderTabPage::SvxBorderTabPage( Window* pParent,
SetFieldUnit(aRightMF, eFUnit);
SetFieldUnit(aTopMF, eFUnit);
SetFieldUnit(aBottomMF, eFUnit);
-aSynchronizeCB.Check(bSync);
aSynchronizeCB.SetClickHdl(LINK(this, SvxBorderTabPage,
SyncHdl_Impl));
aLeftMF.SetModifyHdl(LINK(this, SvxBorderTabPage,
ModifyDistanceHdl_Impl));
aRightMF.SetModifyHdl(LINK(this, SvxBorderTabPage,
ModifyDistanceHdl_Impl));
@@ -571,6 +569,11 @@ void SvxBorderTabPage::Reset( const SfxItemSet& rSet )
}
LinesChanged_Impl( 0 );
+if(aLeftMF.GetValue() == aRightMF.GetValue() && aTopMF.GetValue() ==
aBottomMF.GetValue() && aTopMF.GetValue() == aLeftMF.GetValue())
+mbSync = true;
+else
+mbSync = false;
+aSynchronizeCB.Check(mbSync);
}
// ---
@@ -1153,7 +1156,7 @@ IMPL_LINK_NOARG(SvxBorderTabPage, LinesChanged_Impl)
IMPL_LINK( SvxBorderTabPage, ModifyDistanceHdl_Impl, MetricField*, pField)
{
-if ( bSync )
+if ( mbSync )
{
sal_Int64 nVal = pField->GetValue();
if(pField != &aLeftMF)
@@ -1170,7 +1173,7 @@ IMPL_LINK( SvxBorderTabPage, ModifyDistanceHdl_Impl,
MetricField*, pField)
IMPL_LINK( SvxBorderTabPage, SyncHdl_Impl, CheckBox*, pBox)
{
-bSync = pBox->IsChecked();
+mbSync = pBox->IsChecked();
return 0;
}
commit 843dd3f75e4d35b8ae5fd3be6804e54233292948
Author: Markus Mohrhard
Date: Mon Apr 2 17:23:46 2012 +0200
this hack in no longer needed, fdo#44337
excel import now uses the stored row height and we should go back to a
symetric default margin
diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx
index 3061856..36f0d3b 100644
--- a/sc/source/core/data/docpool.cxx
+++ b/sc/source/core/data/docpool.cxx
@@ -275,10 +275,7 @@ ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool,
sal_Bool bLoadRefCounts )
ppPoolDefaults[ ATTR_SHRINKTOFIT - ATTR_STARTINDEX ] = new
SfxBoolItem( ATTR_SHRINKTOFIT );
ppPoolDefaults[ ATTR_BORDER_TLBR - ATTR_STARTINDEX ] = new
SvxLineItem( ATTR_BORDER_TLBR );
ppPoolDefaults[ ATTR_BORDER_BLTR - ATTR_STARTINDEX ] = new
SvxLineItem( ATTR_BORDER_BLTR );
-SvxMarginItem* pItem = new SvxMarginItem( ATTR_MARGIN );
-pItem->SetTopMargin( 27 );
-pItem->SetBottomMargin( 27 );
-ppPoolDefaults[ ATTR_MARGIN - ATTR_STARTINDEX ] = pItem;
+ppPoolDefaults[ ATTR_MARGIN - ATTR_STARTINDEX ] = new
SvxMarginItem( ATTR_MARGIN );
ppPoolDefaults[ ATTR_MERGE - ATTR_STARTINDEX ] = new ScMergeAttr;
ppPoolDefaults[ ATTR_MERGE_FLAG - ATTR_STARTINDEX ] = new
ScMergeFlagAttr;
ppPoolDefaults[ ATTR_VALUE_FORMAT- ATTR_STARTINDEX ] = new
SfxUInt32Item( ATTR_VALUE_FORMAT, 0 );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - cui/source sw/source
cui/source/tabpages/tpline.cxx | 141 +++-
sw/source/core/text/atrstck.cxx |2
sw/source/core/text/blink.cxx | 23 +++---
3 files changed, 82 insertions(+), 84 deletions(-)
New commits:
commit bfa1547570add919754cba82d0ca1062eabfb6dd
Author: Philipp Weissenbacher
Date: Tue Mar 27 21:31:31 2012 +0200
Translate German comments, fix some English ones
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index ede160b..2fb8f89 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -116,9 +116,9 @@ SvxLineTabPage::SvxLineTabPage
pSymbolList(NULL),
bNewSize(false),
nNumMenuGalleryItems(0),
-nSymbolType(SVX_SYMBOLTYPE_UNKNOWN), //unbekannt bzw. unchanged
+nSymbolType(SVX_SYMBOLTYPE_UNKNOWN), // unknown respectively unchanged
pSymbolAttr(NULL),
-//#58425# Symbole auf einer Linie (z.B. StarChart)
+//#58425# Symbols on a line (e.g. StarChart)
aFlSymbol ( this, CUI_RES(FL_SYMBOL_FORMAT)),
aSymbolMB ( this, CUI_RES(MB_SYMBOL_BITMAP)),
aSymbolWidthFT ( this, CUI_RES(FT_SYMBOL_WIDTH)),
@@ -181,7 +181,7 @@ SvxLineTabPage::SvxLineTabPage
aMtrStartWidth.SetSpinSize( 2 );
aMtrEndWidth.SetSpinSize( 2 );
break;
-default: ;//prevent warning
+default: ;// prevent warning
}
SetFieldUnit( aMtrLineWidth, eFUnit );
SetFieldUnit( aMtrStartWidth, eFUnit );
@@ -189,7 +189,7 @@ SvxLineTabPage::SvxLineTabPage
// PoolUnit ermitteln
SfxItemPool* pPool = rOutAttrs.GetPool();
-DBG_ASSERT( pPool, "Wo ist der Pool?" );
+DBG_ASSERT( pPool, "Where is the pool?" );
ePoolUnit = pPool->GetMetric( SID_ATTR_LINE_WIDTH );
aLbLineStyle.SetSelectHdl(
@@ -229,7 +229,7 @@ SvxLineTabPage::SvxLineTabPage
void SvxLineTabPage::ShowSymbolControls(sal_Bool bOn)
{
-// Symbols on a line (eg star charts), symbol-enable controls
+// Symbols on a line (e.g. StarCharts), symbol-enable controls
bSymbols=bOn;
aSymbolWidthFT.Show(bOn);
@@ -244,7 +244,7 @@ void SvxLineTabPage::ShowSymbolControls(sal_Bool bOn)
SvxLineTabPage::~SvxLineTabPage()
{
-//Symbols on a line (eg star charts), dtor new!
+// Symbols on a line (e.g. StarCharts), dtor new!
delete aSymbolMB.GetPopupMenu()->GetPopupMenu( MN_GALLERY );
@@ -267,10 +267,10 @@ void SvxLineTabPage::Construct()
void SvxLineTabPage::InitSymbols(MenuButton* pButton)
{
-//Popup initialisieren
+// Initialize popup
if(!pButton->GetPopupMenu()->GetPopupMenu( MN_GALLERY ))
{
-// Gallery-Eintraege besorgen
+// Get gallery entries
GalleryExplorer::FillObjList(GALLERY_THEME_BULLETS, aGrfNames);
PopupMenu* pPopup = new PopupMenu;
@@ -282,7 +282,7 @@ void SvxLineTabPage::InitSymbols(MenuButton* pButton)
{
pUIName = &(*it);
-// convert URL encodings to UI characters (eg %20 for spaces)
+// Convert URL encodings to UI characters (e.g. %20 for spaces)
rtl::OUString aPhysicalName;
if (utl::LocalFileHelper::ConvertURLToPhysicalName(*it,
aPhysicalName))
{
@@ -350,7 +350,7 @@ void SvxLineTabPage::InitSymbols(MenuButton* pButton)
rtl::OUString aEmptyStr;
// Generate invisible square to give all symbols a
-// bitmap size, which is indepedent from specific glyph
+// bitmap size, which is independent from specific glyph
SdrObject *pInvisibleSquare=pSymbolList->GetObj(0);
pInvisibleSquare=pInvisibleSquare->Clone();
pPage->NbcInsertObject(pInvisibleSquare);
@@ -430,7 +430,7 @@ void SvxLineTabPage::SymbolSelected(MenuButton* pButton)
{
if( (nItemId-MN_GALLERY_ENTRY) >= nNumMenuGalleryItems)
{
-nSymbolType=nItemId-MN_GALLERY_ENTRY-nNumMenuGalleryItems; //Index
der Liste
+nSymbolType=nItemId-MN_GALLERY_ENTRY-nNumMenuGalleryItems; //
List's index
}
else
{
@@ -464,7 +464,7 @@ void SvxLineTabPage::SymbolSelected(MenuButton* pButton)
aGrfDlg.AsLink(false);
if( !aGrfDlg.Execute() )
{
-// ausgewaehlten Filter merken
+// Remember selected filters
if( !aGrfDlg.GetGraphic(aGraphic) )
{
nSymbolType=SVX_SYMBOLTYPE_BRUSHITEM;
@@ -570,7 +570,7 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet )
nCount = aLbLineStyle.GetEntryCount();
if ( nCount == 0 )
-; // Dieser Fall sollte nicht auftreten
+; // This case should never occur
else if( nCount <= nPos )
aLbLineStyle.SelectEntryPos( 0 );
else
@@ -582,7 +582,7 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet )
aDashURL.Append( pDashList->GetName()
[Libreoffice-commits] .: 2 commits - cui/source desktop/source embeddedobj/source extensions/source filter/source framework/source odk/examples offapi/com sfx2/Library_sfx.mk sfx2/source shell/source
cui/source/dialogs/SpellDialog.cxx|2
cui/source/dialogs/about.cxx |2
cui/source/options/optlingu.cxx |2
desktop/source/deployment/gui/dp_gui_dialog2.cxx |2
desktop/source/deployment/gui/dp_gui_updatedialog.cxx |2
embeddedobj/source/msole/oleembed.cxx |2
extensions/source/update/check/updatecheck.cxx|2
filter/source/xsltdialog/xmlfiltertestdialog.cxx |2
framework/source/dispatch/mailtodispatcher.cxx|2
framework/source/dispatch/systemexec.cxx |2
framework/source/services/backingwindow.cxx |2
odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx |2
offapi/com/sun/star/system/SystemShellExecuteFlags.idl|6
offapi/com/sun/star/system/XSystemShellExecute.idl|6
sfx2/Library_sfx.mk |1
sfx2/source/appl/app.hrc |2
sfx2/source/appl/app.src |7
sfx2/source/appl/appopen.cxx | 195 +++---
sfx2/source/appl/appserv.cxx |4
sfx2/source/appl/openuriexternally.cxx| 101 +
sfx2/source/appl/sfxhelp.cxx |2
sfx2/source/inc/openuriexternally.hxx | 57 ++
sfx2/source/view/view.hrc |2
sfx2/source/view/view.src | 18
sfx2/source/view/viewsh.cxx | 27 -
shell/source/unix/exec/shellexec.cxx | 44 ++
shell/source/win32/SysShExec.cxx | 26 +
shell/source/win32/SysShExec.hxx |6
shell/source/win32/SysShentry.cxx | 13
svtools/source/contnr/templwin.cxx|2
svtools/source/misc/templatefoldercache.cxx | 11
sw/source/ui/docvw/extedit.cxx|2
sw/source/ui/lingu/olmenu.cxx |2
swext/mediawiki/src/com/sun/star/wiki/Helper.java |2
toolkit/source/awt/vclxwindows.cxx|2
uui/source/newerverwarn.cxx |2
36 files changed, 362 insertions(+), 202 deletions(-)
New commits:
commit 32a5ad89a505be22fb8ca0b990a8991a7de6453a
Author: Stephan Bergmann
Date: Fri Mar 16 14:57:51 2012 +0100
fdo#37593 Make sure needsUpdate compares canonicalized paths
...so that it does not erroneously always claim an update is needed, so that
SvtDocumentTemplateDialog::UpdateHdl_Impl does not always jump back to
OpenTemplateRoot() shortly after opening the dialog (and thus jumps away
from
the last remembered folder).
diff --git a/svtools/source/misc/templatefoldercache.cxx
b/svtools/source/misc/templatefoldercache.cxx
index d7a5679..1486fb2 100644
--- a/svtools/source/misc/templatefoldercache.cxx
+++ b/svtools/source/misc/templatefoldercache.cxx
@@ -693,6 +693,17 @@ namespace svt
{
String sTemplatePath( aDirs.getToken(0, ';', nIndex) );
sTemplatePath = aPathOptions.ExpandMacros( sTemplatePath );
+
+// Make sure excess ".." path segments (from expanding bootstrap
+// variables in paths) are normalized in the same way they are
+// normalized for paths read from the .templdir.cache file (where
+// paths have gone through makeRelocatable URL on writing out and
+// then through makeAbsoluteURL when reading back in), as otherwise
+// equalStates() in needsUpdate() could erroneously consider
+// m_aCurrentState and m_aPreviousState as different:
+sTemplatePath = getOfficeInstDirs()->makeAbsoluteURL(
+getOfficeInstDirs()->makeRelocatableURL(sTemplatePath));
+
// create a new entry
m_aCurrentState.push_back( new TemplateContent( INetURLObject(
sTemplatePath ) ) );
TemplateFolderContent::iterator aCurrentRoot =
m_aCurrentState.end();
commit d4b67611c421ebe9b75284106fe389b434419961
Author: Stephan Bergmann
Date: Fri Mar 16 11:16:14 2012 +0100
Introduced SystemShellExecuteFlags::URIS_ONLY
diff --git a/cui/source/dialogs/SpellDialog.cxx
b/cui/source/dialogs/SpellDialog.cxx
index 21ab29c..570e7eb 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -2146,7 +2146,7 @@ IMPL_LINK( SpellDialog, HandleHyperlink,
svt::FixedHyperlink*, pHyperlink )
uno::Reference< com::sun::star::system::XSystemShellExecute >
xSystemShellExecute(
::comphelp
[Libreoffice-commits] .: 2 commits - cui/source svx/Library_svx.mk
cui/source/options/optinet2.cxx |2 +-
svx/Library_svx.mk |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 46cf18fdf137d68ff42d6e037a1285a37c65c07f
Author: Caolán McNamara
Date: Tue Feb 21 14:45:05 2012 +
catch by reference
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index c42edd7..9df4772 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -284,7 +284,7 @@ void SvxProxyTabPage::ReadConfigData_Impl()
}
}
-catch (const container::NoSuchElementException) {
+catch (const container::NoSuchElementException&) {
OSL_TRACE( "SvxProxyTabPage::ReadConfigData_Impl:
NoSuchElementException caught" );
}
commit 776be2f2a3874126f745bcf03052b0c437666473
Author: Caolán McNamara
Date: Tue Feb 21 14:44:19 2012 +
make this weird-ass DBCONNECTIVITY foo build
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index a545c40..248ab21 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -204,7 +204,7 @@ $(eval $(call gb_Library_add_exception_objects,svx,\
))
ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
-$(eval $(call gb_Library_use_external,svx,icuuc))
+$(eval $(call gb_Library_add_exception_objects,svx,\
svx/source/fmcomp/dbaobjectex \
svx/source/form/databaselocationinput \
svx/source/form/dbcharsethelper \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - cui/source svx/Library_svx.mk
cui/source/options/optinet2.cxx |2 +-
svx/Library_svx.mk |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 46cf18fdf137d68ff42d6e037a1285a37c65c07f
Author: Caolán McNamara
Date: Tue Feb 21 14:45:05 2012 +
catch by reference
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index c42edd7..9df4772 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -284,7 +284,7 @@ void SvxProxyTabPage::ReadConfigData_Impl()
}
}
-catch (const container::NoSuchElementException) {
+catch (const container::NoSuchElementException&) {
OSL_TRACE( "SvxProxyTabPage::ReadConfigData_Impl:
NoSuchElementException caught" );
}
commit 776be2f2a3874126f745bcf03052b0c437666473
Author: Caolán McNamara
Date: Tue Feb 21 14:44:19 2012 +
make this weird-ass DBCONNECTIVITY foo build
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index a545c40..248ab21 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -204,7 +204,7 @@ $(eval $(call gb_Library_add_exception_objects,svx,\
))
ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
-$(eval $(call gb_Library_use_external,svx,icuuc))
+$(eval $(call gb_Library_add_exception_objects,svx,\
svx/source/fmcomp/dbaobjectex \
svx/source/form/databaselocationinput \
svx/source/form/dbcharsethelper \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - cui/source lotuswordpro/source
cui/source/customize/acccfg.cxx | 12 ++--
lotuswordpro/source/filter/lwpfilter.cxx |1 -
2 files changed, 6 insertions(+), 7 deletions(-)
New commits:
commit f9595ad5153ff3f98f9a36f3307aef4ecb62110d
Author: Tor Lillqvist
Date: Mon Feb 13 14:00:29 2012 +0200
WaE: unreferenced local variable
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 5c79188..9ed0741 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -884,7 +884,7 @@ void SfxAcceleratorConfigPage::InitAccCfg()
css::uno::Reference< css::ui::XUIConfigurationManager > xUICfgManager
= xModuleCfgSupplier->getUIConfigurationManager(m_sModuleLongName);
m_xModule = css::uno::Reference< css::ui::XAcceleratorConfiguration
>(xUICfgManager->getShortCutManager(), css::uno::UNO_QUERY_THROW);
}
-catch(const css::uno::RuntimeException& exRun)
+catch(const css::uno::RuntimeException&)
{ throw; }
catch(const css::uno::Exception&)
{ m_xSMGR.clear(); }
@@ -1020,7 +1020,7 @@ void SfxAcceleratorConfigPage::Apply(const
css::uno::Reference< css::ui::XAccele
else
xAccMgr->removeKeyEvent(aAWTKey);
}
-catch(const css::uno::RuntimeException& exRun)
+catch(const css::uno::RuntimeException&)
{ throw; }
catch(const css::uno::Exception&)
{}
@@ -1298,7 +1298,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, LoadHdl,
sfx2::FileDialogHelper*, EMPTYARG
xComponent->dispose();
}
}
-catch(const css::uno::RuntimeException& exRun)
+catch(const css::uno::RuntimeException&)
{ throw; }
catch(const css::uno::Exception&)
{}
@@ -1400,7 +1400,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, SaveHdl,
sfx2::FileDialogHelper*, EMPTYARG
xComponent->dispose();
}
}
-catch(const css::uno::RuntimeException& exRun)
+catch(const css::uno::RuntimeException&)
{ throw; }
catch(const css::uno::Exception&)
{}
@@ -1437,7 +1437,7 @@ sal_Bool SfxAcceleratorConfigPage::FillItemSet(
SfxItemSet& )
{
m_xAct->store();
}
-catch(const css::uno::RuntimeException& exRun)
+catch(const css::uno::RuntimeException&)
{ throw; }
catch(const css::uno::Exception&)
{ return sal_False; }
@@ -1526,7 +1526,7 @@ String SfxAcceleratorConfigPage::GetLabel4Command(const
String& sCommand)
return sLabel;
}
}
-catch(const css::uno::RuntimeException& exRun)
+catch(const css::uno::RuntimeException&)
{ throw; }
catch(const css::uno::Exception&)
{}
commit a52f348700adec5ede76a62381f8d54cb5588da8
Author: Tor Lillqvist
Date: Mon Feb 13 13:54:25 2012 +0200
WaE: unreachable code
diff --git a/lotuswordpro/source/filter/lwpfilter.cxx
b/lotuswordpro/source/filter/lwpfilter.cxx
index f28493a..1f66f94 100644
--- a/lotuswordpro/source/filter/lwpfilter.cxx
+++ b/lotuswordpro/source/filter/lwpfilter.cxx
@@ -421,7 +421,6 @@ int ReadWordproFile(SvStream &rStream,
uno::Reference& xHandle
{
return 1;
}
-return 1;
}
void ErrorMsg(int /*iErrCode*/)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - cui/source filter/inc filter/source l10ntools/inc l10ntools/source svtools/inc svtools/source svx/source unusedcode.easy xmloff/inc xmloff/source xmlsecurity/sourc
cui/source/inc/transfrm.hxx |2
cui/source/tabpages/transfrm.cxx | 16 -
filter/inc/filter/msfilter/mstoolbar.hxx |1
filter/source/msfilter/mstoolbar.cxx | 12 -
l10ntools/inc/cfgmerge.hxx|4
l10ntools/inc/export.hxx | 75 -
l10ntools/inc/helpmerge.hxx |4
l10ntools/source/cfgmerge.cxx | 33 +---
l10ntools/source/export.cxx | 148 +-
l10ntools/source/export2.cxx | 60 +++
l10ntools/source/helpmerge.cxx| 21 +-
l10ntools/source/lngex.cxx| 40 ++--
l10ntools/source/localize.cxx | 48 ++---
l10ntools/source/srciter.cxx |9 -
svtools/inc/svtools/filedlg.hxx |1
svtools/source/dialogs/filedlg.cxx|5
svtools/source/dialogs/filedlg2.cxx |8
svtools/source/dialogs/filedlg2.hxx |1
svx/source/fmcomp/gridcell.cxx| 10 -
svx/source/inc/gridcell.hxx |2
unusedcode.easy | 11 -
xmloff/inc/xmloff/xmlexp.hxx |3
xmloff/source/core/xmlexp.cxx |6
xmlsecurity/source/component/certificatecontainer.cxx | 14 -
xmlsecurity/source/component/certificatecontainer.hxx |3
25 files changed, 221 insertions(+), 316 deletions(-)
New commits:
commit 4995bccb953dd398585f1f328fed10e9c170a029
Author: Caolán McNamara
Date: Tue Jan 31 09:39:40 2012 +
callcatcher: update list
diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx
index 4563e01..ffb98ba 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
@@ -147,8 +147,6 @@ private:
#if _SOLAR__PRIVATE
DECL_LINK( ChangePosProtectHdl, void * );
DECL_LINK( ChangeSizeProtectHdl, void * );
-DECL_LINK( ChangePosXHdl, void * );
-DECL_LINK( ChangePosYHdl, void * );
void SetMinMaxPosition();
void GetTopLeftPosition(double& rfX, double& rfY, const basegfx::B2DRange&
rRange);
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index 3b75b32..9755f51 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -1226,22 +1226,6 @@ IMPL_LINK( SvxPositionSizeTabPage, ChangeSizeProtectHdl,
void *, EMPTYARG )
//
-IMPL_LINK_INLINE_START( SvxPositionSizeTabPage, ChangePosXHdl, void *,
EMPTYARG )
-{
-return( 0L );
-}
-IMPL_LINK_INLINE_END( SvxPositionSizeTabPage, ChangePosXHdl, void *, EMPTYARG )
-
-//
-
-IMPL_LINK_INLINE_START( SvxPositionSizeTabPage, ChangePosYHdl, void *,
EMPTYARG )
-{
-return( 0L );
-}
-IMPL_LINK_INLINE_END( SvxPositionSizeTabPage, ChangePosYHdl, void *, EMPTYARG )
-
-//
-
void SvxPositionSizeTabPage::SetMinMaxPosition()
{
// position
diff --git a/filter/inc/filter/msfilter/mstoolbar.hxx
b/filter/inc/filter/msfilter/mstoolbar.hxx
index 35b05da..4137605 100644
--- a/filter/inc/filter/msfilter/mstoolbar.hxx
+++ b/filter/inc/filter/msfilter/mstoolbar.hxx
@@ -88,7 +88,6 @@ public:
rtl::OUString MSOCommandToOOCommand( sal_Int16 msoCmd );
rtl::OUString MSOTCIDToOOCommand( sal_Int16 msoTCID );
SfxObjectShell& GetDocShell() { return mrDocSh; }
-void showToolbar( const rtl::OUString& rName );
bool createMenu( const rtl::OUString& rName, const css::uno::Reference<
css::container::XIndexAccess >& xMenuDesc, bool bPersist );
};
diff --git a/filter/source/msfilter/mstoolbar.cxx
b/filter/source/msfilter/mstoolbar.cxx
index d8839a7..6c7d554 100644
--- a/filter/source/msfilter/mstoolbar.cxx
+++ b/filter/source/msfilter/mstoolbar.cxx
@@ -52,18 +52,6 @@ using namespace com::sun::star;
int TBBase::nIndent = 0;
-void CustomToolBarImportHelper::showToolbar( const rtl::OUString& rName )
-{
-try
-{
-uno::Reference< frame::XController > xCntrller(
mrDocSh.GetModel()->getCurrentController(), uno::UNO_QUERY_THROW );
-uno::Reference< beans::XPropertySet > xProps( xCntrller->getFrame(),
uno::UNO_QUERY_THROW );
-uno::Reference< frame::XLayoutManager > xLayoutMgr(
xProps->getPropertyValue( rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("LayoutManager") ) ), uno::UNO_QUERY_THROW );
-xLayoutMgr->showElement( rName );
-}
-catch( const uno::Exception& ) {}
-}
-
void CustomToolBarImportHelper::ScaleImage( uno::Reference< graphic::XGraphic
>& xGraphic, long nNewSize )
{
Graphic aGraphic( xGraphic );
diff --
[Libreoffice-commits] .: 2 commits - cui/source
cui/source/inc/macroass.hxx |1
cui/source/inc/macropg.hxx |1
cui/source/tabpages/autocdlg.cxx | 70 +++
3 files changed, 28 insertions(+), 44 deletions(-)
New commits:
commit 1681ee65f67cf1c382a34f7ea35fe118dc8603aa
Author: August Sodora
Date: Tue Jan 10 23:55:12 2012 -0500
SvStringsDtor->std::vector
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index a532f16..48eb935 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -1468,19 +1468,16 @@ IMPL_LINK(OfaAutocorrReplacePage, ModifyHdl, Edit*,
pEdt)
struct StringsArrays
{
+std::vector aAbbrevStrings;
+std::vector aDoubleCapsStrings;
-SvStringsDtor aAbbrevStrings;
-SvStringsDtor aDoubleCapsStrings;
-
-StringsArrays() :
-aAbbrevStrings(5,5), aDoubleCapsStrings(5,5) {}
+StringsArrays() { }
};
-typedef StringsArrays* StringsArraysPtr;
-sal_Bool lcl_FindInArray(SvStringsDtor& rStrings, const String& rString)
+sal_Bool lcl_FindInArray(std::vector& rStrings, const String&
rString)
{
-for(sal_uInt16 i = 0; i < rStrings.Count(); i++)
-if(rString == *rStrings.GetObject(i))
+for(std::vector::iterator i = rStrings.begin(); i !=
rStrings.end(); ++i)
+if((*i).equals(rString))
return sal_True;
return sal_False;
}
@@ -1590,12 +1587,12 @@ sal_Bool OfaAutocorrExceptPage::FillItemSet(
SfxItemSet& )
if( !lcl_FindInArray(pArrays->aDoubleCapsStrings,
*pString))
pWrdList->DeleteAndDestroy( i );
}
-nCount = pArrays->aDoubleCapsStrings.Count();
-for( i = 0; i < nCount; ++i )
+
+for(std::vector::iterator it =
pArrays->aDoubleCapsStrings.begin(); it != pArrays->aDoubleCapsStrings.end();
++i)
{
-String* pEntry = new String(
*pArrays->aDoubleCapsStrings.GetObject( i ) );
-if( !pWrdList->Insert( pEntry ))
-delete pEntry;
+String* s = new String(*it);
+if(!pWrdList->Insert(s))
+delete s;
}
pAutoCorrect->SaveWrdSttExceptList(eCurLang);
}
@@ -1612,13 +1609,14 @@ sal_Bool OfaAutocorrExceptPage::FillItemSet(
SfxItemSet& )
if( !lcl_FindInArray(pArrays->aAbbrevStrings, *pString))
pCplList->DeleteAndDestroy( i );
}
-nCount = pArrays->aAbbrevStrings.Count();
-for( i = 0; i < nCount; ++i )
+
+for(std::vector::iterator it =
pArrays->aAbbrevStrings.begin(); it != pArrays->aAbbrevStrings.end(); ++it)
{
-String* pEntry = new String(
*pArrays->aAbbrevStrings.GetObject(i) );
-if( !pCplList->Insert( pEntry ))
-delete pEntry;
+String* s = new String(*it);
+if(!pCplList->Insert(s))
+delete s;
}
+
pAutoCorrect->SaveCplSttExceptList(eCurLang);
}
}
@@ -1702,14 +1700,12 @@ void OfaAutocorrExceptPage::RefillReplaceBoxes(sal_Bool
bFromReset,
lcl_ClearTable(aStringsTable);
else
{
-StringsArraysPtr pArrays = 0;
+StringsArrays* pArrays = NULL;
if(aStringsTable.IsKeyValid(eOldLanguage))
{
pArrays = aStringsTable.Seek(sal_uLong(eOldLanguage));
-pArrays->aAbbrevStrings.DeleteAndDestroy(
-0, pArrays->aAbbrevStrings.Count());
-pArrays->aDoubleCapsStrings.DeleteAndDestroy(
-0, pArrays->aDoubleCapsStrings.Count());
+pArrays->aAbbrevStrings.clear();
+pArrays->aDoubleCapsStrings.clear();
}
else
{
@@ -1719,16 +1715,10 @@ void OfaAutocorrExceptPage::RefillReplaceBoxes(sal_Bool
bFromReset,
sal_uInt16 i;
for(i = 0; i < aAbbrevLB.GetEntryCount(); i++)
-{
-pArrays->aAbbrevStrings.Insert(
-new String(aAbbrevLB.GetEntry(i)), i);
+
pArrays->aAbbrevStrings.push_back(rtl::OUString(aAbbrevLB.GetEntry(i)));
-}
for(i = 0; i < aDoubleCapsLB.GetEntryCount(); i++)
-{
-pArrays->aDoubleCapsStrings.Insert(
-new String(aDoubleCapsLB.GetEntry(i)), i);
-}
+
pArrays->aDoubleCapsStrings.push_back(rtl::OUString(aDoubleCapsLB.GetEntry(i)));
}
aDoubleCapsLB.Clear();
aAbbrevLB.Clear();
@@ -1738,16 +1728,12 @@ void OfaAutocorrExceptPage::RefillReplaceBoxes(sal_Bool
bFromReset,
if(aStringsTable.IsKeyValid(eLang))
{
-StringsArraysPtr pArrays = aStringsTable.Seek(sal_uLong(eLang));
-sal_uInt16 i;
-for(i = 0; i < pArra
[Libreoffice-commits] .: 2 commits - cui/source unotools/source unusedcode.easy
cui/source/inc/treeopt.hxx |2
cui/source/options/treeopt.cxx | 18 ++--
unotools/source/config/securityoptions.cxx |6 -
unusedcode.easy| 127 +++--
4 files changed, 42 insertions(+), 111 deletions(-)
New commits:
commit 217cde3790a05c786b7809d6326a15542aadd4ac
Author: Caolán McNamara
Date: Tue Dec 20 13:15:45 2011 +
callcatcher: update list
diff --git a/unotools/source/config/securityoptions.cxx
b/unotools/source/config/securityoptions.cxx
index 89b63cb..cb925a2 100644
--- a/unotools/source/config/securityoptions.cxx
+++ b/unotools/source/config/securityoptions.cxx
@@ -198,7 +198,6 @@ class SvtSecurityOptions_Impl : public ConfigItem
Sequence< SvtSecurityOptions::Certificate > GetTrustedAuthors (
) const ;
voidSetTrustedAuthors (
const Sequence< SvtSecurityOptions::Certificate >& rAuthors
) ;
-sal_BoolIsTrustedAuthorsEnabled (
) ;
sal_BoolIsOptionSet ( SvtSecurityOptions::EOption
eOption ) const ;
sal_BoolSetOption ( SvtSecurityOptions::EOption
eOption, sal_Bool bValue ) ;
@@ -968,11 +967,6 @@ void SvtSecurityOptions_Impl::SetTrustedAuthors( const
Sequence< SvtSecurityOpti
}
}
-sal_Bool SvtSecurityOptions_Impl::IsTrustedAuthorsEnabled()
-{
-return m_bROTrustedAuthors;
-}
-
sal_Bool SvtSecurityOptions_Impl::IsOptionSet( SvtSecurityOptions::EOption
eOption ) const
{
sal_Bool* pValue;
diff --git a/unusedcode.easy b/unusedcode.easy
index 5c73cc0..bf0dd0f 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,4 +1,6 @@
+(anonymous namespace)::Test::testCopyPaste()
(anonymous
namespace)::getState(std::__debug::vector > const&)
+Animation::IsEmpty() const
AtomDocument::AtomDocument(AtomPubSession*, std::basic_string, std::allocator >)
AtomFolder::AtomFolder(AtomPubSession*, std::basic_string, std::allocator >)
AtomPubSession::getCollectionUrl(Collection::Type)
@@ -7,7 +9,6 @@ BitmapWriteAccess::DrawPolygon(Polygon const&)
BufferNode::childAt(int) const
ByteString::Assign(char const*, unsigned short)
ByteString::Assign(char)
-ByteString::ByteString(String const&, unsigned short, unsigned int)
CIccCLUT::Interp3dTetra(float*, float const*)
CIccCLUT::Iterate(IIccCLUTExec*)
CIccFormulaCurveSegment::SetFunction(unsigned short, unsigned char, float*)
@@ -66,13 +67,6 @@ CurrencyBox::GetValuePos(long) const
CurrencyField::CurrencyField(Window*, ResId const&)
CurrencyFormatter::SetCurrencySymbol(String const&)
CustomToolBarImportHelper::showToolbar(rtl::OUString const&)
-DateBox::DateBox(Window*, ResId const&)
-DateBox::GetDate(unsigned short) const
-DateBox::GetDatePos(Date const&) const
-DateBox::InsertDate(Date const&, unsigned short)
-DateBox::RemoveDate(Date const&)
-DateFormatter::GetRealDate() const
-DateFormatter::IsDateModified() const
DateTime::MakeDateTimeFromSec(Date const&, unsigned long)
DdeGetPutItem::DdeGetPutItem(DdeItem const&)
DdeService::AddFormat(unsigned long)
@@ -306,6 +300,9 @@ ScCellObj::SetFormulaResultDouble(double)
ScCellObj::SetFormulaResultString(rtl::OUString const&)
ScCellObj::SetFormulaWithGrammar(rtl::OUString const&, rtl::OUString const&,
formula::FormulaGrammar::Grammar)
ScChangeActionContent::SetNewValue(String const&, ScDocument*)
+ScClipRangeNameData::ScClipRangeNameData()
+ScClipRangeNameData::insert(unsigned short, unsigned short)
+ScClipRangeNameData::~ScClipRangeNameData()
ScCompressedArray::GetEntryCount() const
ScCompressedArray::CopyFrom(ScCompressedArray const&, int, int, long)
ScCompressedArray::GetValue(int) const
@@ -376,13 +373,7 @@
ScSimpleRangeList::Range::contains(ScSimpleRangeList::Range const&) const
ScStringCell::ScStringCell()
ScSubTotalDescriptorBase::GetData(ScSubTotalParam&) const
ScSubTotalDescriptorBase::PutData(ScSubTotalParam const&)
-ScTabPageSortFields::GetRanges()
-ScTabPageSortOptions::GetRanges()
ScTabViewShell::LinkStubHtmlOptionsHdl(void*, void*)
-ScTpCalcOptions::GetRanges()
-ScTpPrintOptions::GetRanges()
-ScTpSubTotalGroup::GetRanges()
-ScTpUserLists::GetRanges()
ScUserList::end()
ScUserList::end() const
ScValidationEntries_Impl::Insert(ScValidationData* const&, unsigned short&)
@@ -598,20 +589,16 @@ SvpSalInstance::CancelEvent(SalFrame const*, void*,
unsigned short)
SvtAcceleratorConfiguration::GetCommand(com::sun::star::awt::KeyEvent const&)
SvtAcceleratorConfiguration::GetItems()
SvtAcceleratorConfiguration::SetItems(std::__debug::list > const&, bool)
-SvtAccessibilityOptions::GetIsForDrawings() const
SvtBroadcaster::Forward(SvtBroadcaster&, SfxHint const&)
-SvtCo
[Libreoffice-commits] .: 2 commits - cui/source officecfg/registry sc/sdi vcl/unx
cui/source/customize/acccfg.cxx|5 + officecfg/registry/data/org/openoffice/Office/Accelerators.xcu | 10 ++ sc/sdi/scalc.sdi |4 ++-- vcl/unx/generic/app/saldisp.cxx|3 ++- vcl/unx/gtk/window/gtkframe.cxx|2 +- 5 files changed, 20 insertions(+), 4 deletions(-) New commits: commit 5916088332276b922a6a0d6d27968cd82569639c Author: Miklos Vajna Date: Tue Dec 13 14:32:24 2011 +0100 fdo#30714 move SID_INSERT_CURRENT_DATE/TIME to GID_INSERT diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi index b030a95..99976ec 100644 --- a/sc/sdi/scalc.sdi +++ b/sc/sdi/scalc.sdi @@ -7948,7 +7948,7 @@ SfxVoidItem InsertCurrentDate SID_INSERT_CURRENT_DATE MenuConfig = TRUE, StatusBarConfig = FALSE, ToolBoxConfig = FALSE, -GroupId = GID_OPTIONS; +GroupId = GID_INSERT; ] //-- @@ -7973,7 +7973,7 @@ SfxVoidItem InsertCurrentTime SID_INSERT_CURRENT_TIME MenuConfig = TRUE, StatusBarConfig = FALSE, ToolBoxConfig = FALSE, -GroupId = GID_OPTIONS; +GroupId = GID_INSERT; ] //-- commit b26292882bf2439a78488b55b4ac21c244ef61b1 Author: Miklos Vajna Date: Tue Dec 13 00:46:27 2011 +0100 fdo#30714 Use different default key bindings for Hungarian locale Mimic Hungarian Excel's key bindings: * inserting current date is Ctrl-'.' * inserting current time is Ctrl-Shift-'.' diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index e976a9d..159272f 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -226,6 +226,7 @@ static sal_uInt16 KEYCODE_ARRAY[] = KEY_SEMICOLON| KEY_MOD1 , KEY_BRACKETLEFT | KEY_MOD1 , KEY_BRACKETRIGHT | KEY_MOD1, +KEY_POINT| KEY_MOD1 , KEY_F1| KEY_MOD1 , KEY_F2| KEY_MOD1 , @@ -302,6 +303,7 @@ static sal_uInt16 KEYCODE_ARRAY[] = KEY_SEMICOLON| KEY_SHIFT | KEY_MOD1 , KEY_BRACKETLEFT | KEY_SHIFT | KEY_MOD1 , KEY_BRACKETRIGHT | KEY_SHIFT | KEY_MOD1, +KEY_POINT| KEY_SHIFT | KEY_MOD1, KEY_F1| KEY_SHIFT | KEY_MOD1, KEY_F2| KEY_SHIFT | KEY_MOD1, @@ -373,6 +375,7 @@ static sal_uInt16 KEYCODE_ARRAY[] = KEY_SEMICOLON| KEY_MOD2 , KEY_BRACKETLEFT | KEY_MOD2 , KEY_BRACKETRIGHT | KEY_MOD2, +KEY_POINT| KEY_MOD2 , KEY_F1| KEY_MOD2 , KEY_F2| KEY_MOD2 , @@ -444,6 +447,7 @@ static sal_uInt16 KEYCODE_ARRAY[] = KEY_SEMICOLON| KEY_SHIFT | KEY_MOD2 , KEY_BRACKETLEFT | KEY_SHIFT | KEY_MOD2 , KEY_BRACKETRIGHT | KEY_SHIFT | KEY_MOD2, +KEY_POINT| KEY_SHIFT | KEY_MOD2, KEY_F1| KEY_SHIFT | KEY_MOD2, KEY_F2| KEY_SHIFT | KEY_MOD2, @@ -583,6 +587,7 @@ static sal_uInt16 KEYCODE_ARRAY[] = KEY_SEMICOLON| KEY_SHIFT | KEY_MOD1 | KEY_MOD2, KEY_BRACKETLEFT | KEY_SHIFT | KEY_MOD1 | KEY_MOD2, KEY_BRACKETRIGHT | KEY_SHIFT | KEY_MOD1 | KEY_MOD2, +KEY_POINT| KEY_SHIFT | KEY_MOD1 | KEY_MOD2, KEY_F1| KEY_SHIFT | KEY_MOD1 | KEY_MOD2, KEY_F2| KEY_SHIFT | KEY_MOD1 | KEY_MOD2, diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu index 2f0bfef..30702f9 100644 --- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu @@ -815,6 +815,16 @@ .uno:InsertCurrentTime + + I10N SHORTCUTS - NO TRANSLATE + .uno:InsertCurrentDate + + + + I10N SHORTCUTS - NO TRANSLATE + .uno:InsertCurrentTime + + I10N SHORTCUTS - NO TRANSLATE .uno:MarkPrecedents diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index 07eef83..3c53b7b 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -1125,7 +1125,7 @@ rtl::OUString SalDisplay::GetKeyName( sal_uInt16 nKeyCode ) const nKeySym = XK_slash; break; case KEY_POINT: -nKeySym = XK_period; +aCustomKeyName = '.'; break; case KEY_COMMA: nKeySym = XK_comma; @@ -1467,6 +1467,7 @@ sal_uInt16 SalDisplay::GetKeyCode( KeySym keysym, char*pcPrintable ) const break; case XK_period: nKey = KEY_POINT; +*pcPrintable = '.'; break; case XK_comma: nKey = KEY_COMMA; diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx index ec318c9..2e1c106 100644 --- a/vcl/unx/gtk/window/gtkframe.cxx +++ b/vcl/unx/gtk/window/gtkframe.cxx @@ -215,7 +215,
[Libreoffice-commits] .: 2 commits - cui/source
cui/source/options/optasian.cxx | 79 +++-
1 file changed, 39 insertions(+), 40 deletions(-)
New commits:
commit 38f83bd0a5ae49ff382c64ea8ee4540435f0eb62
Author: Caolán McNamara
Date: Mon Dec 12 16:45:30 2011 +
catch by const reference
diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx
index ced5fcd..28bcb74 100644
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -220,7 +220,7 @@ sal_Bool SvxAsianLayoutPage::FillItemSet( SfxItemSet& )
pImpl->xForbidden->setForbiddenCharacters( aLocale, *(
itElem->second->pCharacters ) );
}
}
-catch(Exception&)
+catch (const Exception&)
{
OSL_FAIL("exception in XForbiddenCharacters");
}
@@ -354,7 +354,7 @@ IMPL_LINK(SvxAsianLayoutPage, LanguageHdl, SvxLanguageBox*,
EMPTYARG )
sEnd = aForbidden.endLine;
}
}
-catch(Exception&)
+catch (const Exception&)
{
OSL_FAIL("exception in XForbiddenCharacters");
}
@@ -417,7 +417,7 @@ IMPL_LINK(SvxAsianLayoutPage, ModifyHdl, Edit*, pEdit)
else
pImpl->addForbiddenCharacters(eSelectLanguage, 0);
}
-catch(Exception&)
+catch (const Exception&)
{
OSL_FAIL("exception in XForbiddenCharacters");
}
commit e5feeed767744a4823e0e672d0606b478a7dfe67
Author: Marcel Metz
Date: Mon Dec 12 16:44:00 2011 +
Related: fdo#38832 Replace Table with std::map
diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx
index 5cafe5d..ced5fcd 100644
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -26,13 +26,13 @@
*
/
+#include
#include
#include
#include
#include
#include
#include
-#include
#include
#include
#include
@@ -59,77 +59,76 @@ const sal_Char cCharacterCompressionType[] =
"CharacterCompressionType";
struct SvxForbiddenChars_Impl
{
+~SvxForbiddenChars_Impl();
+
sal_BoolbRemoved;
ForbiddenCharacters*pCharacters;
};
-DECLARE_TABLE( _SvxForbiddenCharacterTable_Impl, SvxForbiddenChars_Impl* )
-
-class SvxForbiddenCharacterTable_Impl : public _SvxForbiddenCharacterTable_Impl
+SvxForbiddenChars_Impl::~SvxForbiddenChars_Impl()
{
-public:
-SvxForbiddenCharacterTable_Impl()
-: _SvxForbiddenCharacterTable_Impl( 4, 4 )
-{}
-~SvxForbiddenCharacterTable_Impl();
-};
+delete pCharacters;
+}
+
+typedef ::std::map< LanguageType, SvxForbiddenChars_Impl* >
SvxForbiddenCharacterMap_Impl;
struct SvxAsianLayoutPage_Impl
{
SvxAsianConfig aConfig;
SvxAsianLayoutPage_Impl() {}
+~SvxAsianLayoutPage_Impl();
+
Reference< XForbiddenCharacters > xForbidden;
Reference< XPropertySet > xPrSet;
Reference< XPropertySetInfo > xPrSetInfo;
-SvxForbiddenCharacterTable_Impl aChangedLanguagesTbl;
+SvxForbiddenCharacterMap_Impl aChangedLanguagesMap;
sal_BoolhasForbiddenCharacters(LanguageType eLang);
SvxForbiddenChars_Impl* getForbiddenCharacters(LanguageType eLang);
voidaddForbiddenCharacters(LanguageType eLang,
ForbiddenCharacters* pForbidden);
};
-SvxForbiddenCharacterTable_Impl::~SvxForbiddenCharacterTable_Impl()
+SvxAsianLayoutPage_Impl::~SvxAsianLayoutPage_Impl()
{
-for( SvxForbiddenChars_Impl* pDel = First(); pDel; pDel = Next() )
+SvxForbiddenCharacterMap_Impl::iterator it;
+for( it = aChangedLanguagesMap.begin(); it != aChangedLanguagesMap.end();
++it )
{
-delete pDel->pCharacters;
-delete pDel;
+delete it->second;
}
}
sal_BoolSvxAsianLayoutPage_Impl::hasForbiddenCharacters(LanguageType eLang)
{
-return 0 != aChangedLanguagesTbl.Get(eLang);
+return aChangedLanguagesMap.count( eLang );
}
SvxForbiddenChars_Impl*
SvxAsianLayoutPage_Impl::getForbiddenCharacters(LanguageType eLang)
{
-SvxForbiddenChars_Impl* pImp = aChangedLanguagesTbl.Get(eLang);
-DBG_ASSERT(pImp, "language not available");
-if(pImp)
-return pImp;
+SvxForbiddenCharacterMap_Impl::iterator it = aChangedLanguagesMap.find(
eLang );
+DBG_ASSERT( ( it != aChangedLanguagesMap.end() ), "language not
available");
+if( it != aChangedLanguagesMap.end() )
+return it->second;
return 0;
}
void SvxAsianLayoutPage_Impl::addForbiddenCharacters(
LanguageType eLang, ForbiddenCharacters* pForbidden)
{
-SvxForbiddenChars_Impl* pOld = aChangedLanguagesTbl.Get(eLang);
-if( !pOld )
+SvxForbiddenCharacterMap_Impl::iterator itOld = aChangedLanguagesMap.find(
eLang );
+if( itOld == aChangedLanguagesMap.end() )
{
-pOld = new SvxForbiddenChars_I
[Libreoffice-commits] .: 2 commits - cui/source
cui/source/dialogs/pastedlg.cxx | 26 --
cui/source/inc/pastedlg.hxx |4 ++--
2 files changed, 14 insertions(+), 16 deletions(-)
New commits:
commit d6e21fd53cda06460f2c1611ef5d0744132d87bc
Author: Caolán McNamara
Date: Mon Dec 12 16:32:34 2011 +
now with an STL map we don't have to do our own mem allocation
diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx
index 656a813..99cb187 100644
--- a/cui/source/dialogs/pastedlg.cxx
+++ b/cui/source/dialogs/pastedlg.cxx
@@ -112,11 +112,6 @@ void SvPasteObjectDialog::SetDefault()
SvPasteObjectDialog::~SvPasteObjectDialog()
{
-::std::map< SotFormatStringId, String* >::iterator it;
-for(it = aSupplementMap.begin(); it != aSupplementMap.end(); ++it)
-{
-delete it->second;
-}
}
/*
@@ -124,9 +119,7 @@ SvPasteObjectDialog::~SvPasteObjectDialog()
*/
void SvPasteObjectDialog::Insert( SotFormatStringId nFormat, const String&
rFormatName )
{
-String * pStr = new String( rFormatName );
-if( !aSupplementMap.insert( ::std::make_pair( nFormat, pStr ) ).second )
-delete pStr;
+aSupplementMap.insert( ::std::make_pair( nFormat, rFormatName ) );
}
sal_uLong SvPasteObjectDialog::GetFormat( const TransferableDataHelper&
rHelper,
@@ -155,15 +148,15 @@ sal_uLong SvPasteObjectDialog::GetFormat( const
TransferableDataHelper& rHelper,
::com::sun::star::datatransfer::DataFlavor aFlavor( *aIter );
SotFormatStringId nFormat = (*aIter++).mnSotId;
-String* pName = NULL;
-String aName;
-::std::map< SotFormatStringId, String* >::iterator itName;
-itName = aSupplementMap.find( nFormat );
+::std::map< SotFormatStringId, String >::iterator itName =
+aSupplementMap.find( nFormat );
// if there is an "Embed Source" or and "Embedded Object" on the
// Clipboard we read the Description and the Source of this object
// from an accompanied "Object Descriptor" format on the clipboard
// Remember: these formats mostly appear together on the clipboard
+String aName;
+const String* pName = NULL;
if ( itName == aSupplementMap.end() )
{
SvPasteObjectHelper::GetEmbeddedName(rHelper,aName,aSourceName,nFormat);
@@ -172,7 +165,7 @@ sal_uLong SvPasteObjectDialog::GetFormat( const
TransferableDataHelper& rHelper,
}
else
{
-pName = itName->second;
+pName = &(itName->second);
}
if( pName )
@@ -181,7 +174,8 @@ sal_uLong SvPasteObjectDialog::GetFormat( const
TransferableDataHelper& rHelper,
if( SOT_FORMATSTR_ID_EMBED_SOURCE == nFormat )
{
-if( aDesc.maClassName != aEmptyNm )
{
+if( aDesc.maClassName != aEmptyNm )
+{
aSourceName = aDesc.maDisplayName;
if( aDesc.maClassName == aObjClassName )
diff --git a/cui/source/inc/pastedlg.hxx b/cui/source/inc/pastedlg.hxx
index ddf4ccb..21dee34 100644
--- a/cui/source/inc/pastedlg.hxx
+++ b/cui/source/inc/pastedlg.hxx
@@ -60,7 +60,7 @@ class SvPasteObjectDialog : public ModalDialog
OKButton aOKButton1;
CancelButton aCancelButton1;
HelpButton aHelpButton1;
-::std::map< SotFormatStringId, String* > aSupplementMap;
+::std::map< SotFormatStringId, String > aSupplementMap;
SvGlobalNameaObjClassName;
String aObjName;
sal_uInt16 nAspect;
commit 57054f84f66c4d2db8d117a4043e0fbcbd0ee528
Author: Marcel Metz
Date: Mon Dec 12 16:25:22 2011 +
Related: fdo#38832 Replace Table with std::map
diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx
index 47fdf2f..656a813 100644
--- a/cui/source/dialogs/pastedlg.cxx
+++ b/cui/source/dialogs/pastedlg.cxx
@@ -112,11 +112,10 @@ void SvPasteObjectDialog::SetDefault()
SvPasteObjectDialog::~SvPasteObjectDialog()
{
-void * pStr = aSupplementTable.First();
-while( pStr )
+::std::map< SotFormatStringId, String* >::iterator it;
+for(it = aSupplementMap.begin(); it != aSupplementMap.end(); ++it)
{
-delete (String *)pStr;
-pStr = aSupplementTable.Next();
+delete it->second;
}
}
@@ -126,7 +125,7 @@ SvPasteObjectDialog::~SvPasteObjectDialog()
void SvPasteObjectDialog::Insert( SotFormatStringId nFormat, const String&
rFormatName )
{
String * pStr = new String( rFormatName );
-if( !aSupplementTable.Insert( nFormat, pStr ) )
+if( !aSupplementMap.insert( ::std::make_pair( nFormat, pStr ) ).second )
delete pStr;
}
@@ -156,20 +155,25 @@ sal_uLong SvPasteObjectDialog::GetFormat( const
TransferableDataHelper& rHelper,
::com::sun::st
[Libreoffice-commits] .: 2 commits - cui/source drawinglayer/Library_drawinglayer.mk drawinglayer/source editeng/source
cui/source/options/optgdlg.cxx |1
drawinglayer/Library_drawinglayer.mk |1
drawinglayer/source/processor2d/canvasprocessor.cxx | 21 +---
drawinglayer/source/processor2d/getdigitlanguage.cxx | 49 +++
drawinglayer/source/processor2d/getdigitlanguage.hxx | 46 +
drawinglayer/source/processor2d/vclprocessor2d.cxx | 22 +---
editeng/source/editeng/editeng.cxx |1
7 files changed, 102 insertions(+), 39 deletions(-)
New commits:
commit 400b458911a777dfb0d504ba65ed9496c441e556
Author: Stephan Bergmann
Date: Wed Dec 7 16:40:49 2011 +0100
Unused includes.
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index dabc5a7..42a6c21 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -54,7 +54,6 @@
#include
#include
#include
-#include
#include
#include
#include
diff --git a/editeng/source/editeng/editeng.cxx
b/editeng/source/editeng/editeng.cxx
index 796578f..0c7a746 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -34,7 +34,6 @@
#define USE_SVXFONT
-#include
#include
#include
commit 8576bd17844d9c5843e84c330a7d2df79d79db7f
Author: Stephan Bergmann
Date: Wed Dec 7 16:34:32 2011 +0100
Factored out common getDigitLanguage.
diff --git a/drawinglayer/Library_drawinglayer.mk
b/drawinglayer/Library_drawinglayer.mk
index 7b88414..d2934d7 100644
--- a/drawinglayer/Library_drawinglayer.mk
+++ b/drawinglayer/Library_drawinglayer.mk
@@ -153,6 +153,7 @@ $(eval $(call
gb_Library_add_exception_objects,drawinglayer,\
drawinglayer/source/processor2d/baseprocessor2d \
drawinglayer/source/processor2d/canvasprocessor \
drawinglayer/source/processor2d/contourextractor2d \
+drawinglayer/source/processor2d/getdigitlanguage \
drawinglayer/source/processor2d/helperchartrenderer \
drawinglayer/source/processor2d/helperwrongspellrenderer \
drawinglayer/source/processor2d/hittestprocessor2d \
diff --git a/drawinglayer/source/processor2d/canvasprocessor.cxx
b/drawinglayer/source/processor2d/canvasprocessor.cxx
index 1365c5d..e916b29 100644
--- a/drawinglayer/source/processor2d/canvasprocessor.cxx
+++ b/drawinglayer/source/processor2d/canvasprocessor.cxx
@@ -36,8 +36,6 @@
#include
#include
#include
-#include
-#include
#include
#include
#include
@@ -69,6 +67,8 @@
#include
#include
+#include "getdigitlanguage.hxx"
+
//
using namespace com::sun::star;
@@ -969,29 +969,14 @@ namespace drawinglayer
maBColorModifierStack(),
maDrawinglayerOpt(),
maClipPolyPolygon(),
-meLang(LANGUAGE_SYSTEM)
+meLang(drawinglayer::detail::getDigitLanguage())
{
-const SvtCTLOptions aSvtCTLOptions;
-
canvas::tools::initViewState(maViewState);
canvas::tools::initRenderState(maRenderState);
canvas::tools::setViewStateTransform(maViewState,
getViewInformation2D().getViewTransformation());
// set digit language, derived from SvtCTLOptions to have the
correct
// number display for arabic/hindi numerals
-if(SvtCTLOptions::NUMERALS_HINDI ==
aSvtCTLOptions.GetCTLTextNumerals())
-{
-meLang = LANGUAGE_ARABIC_SAUDI_ARABIA;
-}
-else if(SvtCTLOptions::NUMERALS_ARABIC ==
aSvtCTLOptions.GetCTLTextNumerals())
-{
-meLang = LANGUAGE_ENGLISH;
-}
-else
-{
-meLang =
(LanguageType)Application::GetSettings().GetLanguage();
-}
-
rOutDev.SetDigitLanguage(meLang);
// prepare output directly to pixels
diff --git a/drawinglayer/source/processor2d/getdigitlanguage.cxx
b/drawinglayer/source/processor2d/getdigitlanguage.cxx
new file mode 100644
index 000..000588e
--- /dev/null
+++ b/drawinglayer/source/processor2d/getdigitlanguage.cxx
@@ -0,0 +1,49 @@
+/* -*- 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 Red Hat, Inc., Stephan Bergmann
+ * (initial developer) ]
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions
[Libreoffice-commits] .: 2 commits - cui/source dbaccess/source
cui/source/dialogs/gallery.src|2 +-
cui/source/tabpages/numpages.src | 10 +-
dbaccess/source/ext/macromigration/macromigration.src |2 +-
dbaccess/source/ui/relationdesign/relation.src|2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 0443311761e0755bda21a627c684cf00ce32bafe
Author: Lior Kaplan
Date: Fri Dec 2 01:43:50 2011 +0200
Remove extra spaces from strings for translation
diff --git a/cui/source/dialogs/gallery.src b/cui/source/dialogs/gallery.src
index b1c53e6..0108027 100644
--- a/cui/source/dialogs/gallery.src
+++ b/cui/source/dialogs/gallery.src
@@ -450,7 +450,7 @@ String RID_SVXSTR_GALLERYPROPS_OBJECT
};
String RID_SVXSTR_GALLERY_READONLY
{
-Text [ en-US ] = " (read-only)" ;
+Text [ en-US ] = "(read-only)" ;
};
String RID_SVXSTR_GALLERY_ALLFILES
{
diff --git a/cui/source/tabpages/numpages.src b/cui/source/tabpages/numpages.src
index 97b6686..ef3426b 100644
--- a/cui/source/tabpages/numpages.src
+++ b/cui/source/tabpages/numpages.src
@@ -192,12 +192,12 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
CurPos = 0 ;
StringList [ en-US ] =
{
-< "1, 2, 3, ... " ; 4/*SVX_NUM_ARABIC
*/; > ;
-< "A, B, C, ... " ; 0/*SVX_NUM_CHARS_UPPER_LETTER
*/; > ;
+< "1, 2, 3, ..." ; 4/*SVX_NUM_ARABIC
*/; > ;
+< "A, B, C, ..." ; 0/*SVX_NUM_CHARS_UPPER_LETTER
*/; > ;
< "a, b, c, ..." ; 1/*SVX_NUM_CHARS_LOWER_LETTER */;
> ;
-< "I, II, III, ... " ; 2/*SVX_NUM_ROMAN_UPPER */;
> ;
-< "i, ii, iii, ... " ; 3/*SVX_NUM_ROMAN_LOWER */;
> ;
-< "A, .., AA, .., AAA, ... " ; 9/*SVX_NUM_CHARS_UPPER_LETTER_N*/;
> ;
+< "I, II, III, ..." ; 2/*SVX_NUM_ROMAN_UPPER */;
> ;
+< "i, ii, iii, ..." ; 3/*SVX_NUM_ROMAN_LOWER */;
> ;
+< "A, .., AA, .., AAA, ..." ; 9/*SVX_NUM_CHARS_UPPER_LETTER_N*/;
> ;
< "a, .., aa, .., aaa, ..." ; 10/*SVX_NUM_CHARS_LOWER_LETTER_N*/;
> ;
< "Bullet" ;6/*SVX_NUM_CHAR_SPECIAL*/;
> ;
< "Graphics" ; 8/*SVX_NUM_BITMAP */;
> ;
diff --git a/dbaccess/source/ext/macromigration/macromigration.src
b/dbaccess/source/ext/macromigration/macromigration.src
index 5d1d9db..cea1841 100644
--- a/dbaccess/source/ext/macromigration/macromigration.src
+++ b/dbaccess/source/ext/macromigration/macromigration.src
@@ -438,7 +438,7 @@ String STR_WARNINGS
String STR_EXCEPTION
{
-Text [ en-US ] = "caught exception: ";
+Text [ en-US ] = "caught exception:";
};
commit 127c6a3dab9c3a3e7f0cbcea2571a3eb96f990c4
Author: Lior Kaplan
Date: Fri Dec 2 01:43:34 2011 +0200
Typo fix: Maybe -> Maybe
diff --git a/dbaccess/source/ui/relationdesign/relation.src
b/dbaccess/source/ui/relationdesign/relation.src
index 4420ade..7b9a404 100644
--- a/dbaccess/source/ui/relationdesign/relation.src
+++ b/dbaccess/source/ui/relationdesign/relation.src
@@ -79,5 +79,5 @@ String STR_QUERY_REL_DELETE_WINDOW
String STR_QUERY_REL_COULD_NOT_CREATE
{
-Text [ en-US ] = "The database could not create the relation. May be
foreign keys for this kind of table aren't supported.\nPlease check your
documentation of the database.";
+Text [ en-US ] = "The database could not create the relation. Maybe
foreign keys for this kind of table aren't supported.\nPlease check your
documentation of the database.";
};
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - cui/source solenv/gbuild
cui/source/dialogs/pastedlg.cxx |3 +--
cui/source/inc/pastedlg.hxx |2 --
solenv/gbuild/BuildDirs.mk |9 +
3 files changed, 10 insertions(+), 4 deletions(-)
New commits:
commit f077db2668fe12eb260a47ac9abf5db32eeeab15
Author: Kohei Yoshida
Date: Thu Dec 1 01:28:39 2011 -0500
Revert "Don't overwrite OUTDIR & friends."
This reverts commit 28275d470f3a062cfa27d72bbf89328af1e83c68.
diff --git a/solenv/gbuild/BuildDirs.mk b/solenv/gbuild/BuildDirs.mk
index 828546f..6a0933b 100644
--- a/solenv/gbuild/BuildDirs.mk
+++ b/solenv/gbuild/BuildDirs.mk
@@ -35,6 +35,15 @@ ifeq ($(strip $(SOLARENV)),)
$(error SOLARENV variable is empty, no environment set, aborting)
endif
+# HACK
+# unixify windoze paths
+ifeq ($(OS_FOR_BUILD),WNT)
+override WORKDIR := $(shell cygpath -u $(WORKDIR))
+override OUTDIR := $(shell cygpath -u $(OUTDIR))
+override OUTDIR_FOR_BUILD := $(shell cygpath -u $(OUTDIR_FOR_BUILD))
+override SRCDIR := $(shell cygpath -u $(SRCDIR))
+endif
+
REPODIR := $(patsubst %/,%,$(dir $(SRCDIR)))
# vim: set noet sw=4:
commit f41eddb61c76d4bce924dd5fcddd21157a83d4eb
Author: Kohei Yoshida
Date: Thu Dec 1 00:07:47 2011 -0500
This data member is no longer used. Remove it.
diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx
index 3d03466..47fdf2f 100644
--- a/cui/source/dialogs/pastedlg.cxx
+++ b/cui/source/dialogs/pastedlg.cxx
@@ -58,8 +58,7 @@ SvPasteObjectDialog::SvPasteObjectDialog( Window* pParent )
aLbInsertList( this, CUI_RES( LB_INSERT_LIST ) ),
aOKButton1( this, CUI_RES( 1 ) ),
aCancelButton1( this, CUI_RES( 1 ) ),
-aHelpButton1( this, CUI_RES( 1 ) ),
-aSObject( CUI_RES( S_OBJECT ) )
+aHelpButton1( this, CUI_RES( 1 ) )
{
FreeResource();
SetHelpId( HID_PASTE_DLG );
diff --git a/cui/source/inc/pastedlg.hxx b/cui/source/inc/pastedlg.hxx
index 1e27ce9..93c6ff4 100644
--- a/cui/source/inc/pastedlg.hxx
+++ b/cui/source/inc/pastedlg.hxx
@@ -60,7 +60,6 @@ class SvPasteObjectDialog : public ModalDialog
OKButton aOKButton1;
CancelButton aCancelButton1;
HelpButton aHelpButton1;
-String aSObject;
Table aSupplementTable;
SvGlobalNameaObjClassName;
String aObjName;
@@ -72,7 +71,6 @@ class SvPasteObjectDialog : public ModalDialog
RadioButton&PasteLink() { return aRbPasteLink; }
CheckBox& AsIconBox() { return aCbDisplayAsIcon; }
-const String& GetObjString() { return aSObject; }
voidSelectObject();
DECL_LINK( SelectHdl, ListBox * );
DECL_LINK( DoubleClickHdl, ListBox * );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - cui/source sd/source starmath/source sw/source vcl/source
cui/source/dialogs/scriptdlg.cxx |4 ++--
sd/source/ui/view/sdview.cxx |2 +-
starmath/source/unomodel.cxx |4 ++--
sw/source/core/crsr/viscrs.cxx|2 +-
sw/source/core/doc/docdesc.cxx| 17 +++--
sw/source/core/text/itrform2.cxx | 10 --
sw/source/filter/xml/xmlitmpr.cxx |2 +-
sw/source/ui/uiview/view2.cxx |3 ++-
vcl/source/window/decoview.cxx|2 +-
9 files changed, 21 insertions(+), 25 deletions(-)
New commits:
commit 5122e3413b06125ff45fd10e1ac1f0e58c24afcc
Author: Ivan Timofeev
Date: Sun Nov 6 13:20:56 2011 +0400
cppcheck: avoid possible null pointer dereferences
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index 8670778..2e34358 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -623,7 +623,7 @@ sal_Bool View::IsPresObjSelected(sal_Bool bOnPage, sal_Bool
bOnMasterPage, sal_B
if ( pObj && ( bCheckPresObjListOnly || pObj->IsEmptyPresObj() ||
pObj->GetUserCall() ) )
{
pPage = (SdPage*) pObj->GetPage();
-bMasterPage = pPage->IsMasterPage();
+bMasterPage = pPage && pPage->IsMasterPage();
if ( (bMasterPage && bOnMasterPage) || (!bMasterPage && bOnPage) )
{
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index 4ac9297..fae2579 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -882,9 +882,9 @@ void SmModel::_getPropertyValues( const PropertyMapEntry
**ppEntries, Any *pValu
for (size_t i = 0; i < aSymbols.size(); ++i)
{
const SmSym * pSymbol = aSymbols[ i ];
-const bool bIsUsedSymbol = rUsedSymbols.find(
pSymbol->GetName() ) != rUsedSymbols.end();
if (pSymbol && !pSymbol->IsPredefined() &&
-(!bUsedSymbolsOnly || bIsUsedSymbol))
+(!bUsedSymbolsOnly ||
+ rUsedSymbols.find( pSymbol->GetName() ) !=
rUsedSymbols.end()))
{
aVector.push_back ( pSymbol );
nCount++;
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 52312a0..7310b07 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -611,8 +611,9 @@ void SwDoc::PrtDataChanged()
if ( pTmpRoot )
{
ViewShell *pSh = GetCurrentViewShell();
-if( !pSh->GetViewOptions()->getBrowseMode() ||
-pSh->GetViewOptions()->IsPrtFormat() )
+if( pSh &&
+(!pSh->GetViewOptions()->getBrowseMode() ||
+ pSh->GetViewOptions()->IsPrtFormat()) )
{
if ( GetDocShell() )
pWait = new SwWait( *GetDocShell(), sal_True );
@@ -632,16 +633,12 @@ void SwDoc::PrtDataChanged()
std::set aAllLayouts = GetAllLayouts();
std::for_each( aAllLayouts.begin(),
aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::InvalidateAllCntnt),
INV_SIZE));
-if ( pSh )
+do
{
-do
-{
-pSh->InitPrt( pPrt );
-pSh = (ViewShell*)pSh->GetNext();
-}
-while ( pSh != GetCurrentViewShell() );
+pSh->InitPrt( pPrt );
+pSh = (ViewShell*)pSh->GetNext();
}
-
+while ( pSh != GetCurrentViewShell() );
}
}
if ( bDraw && pDrawModel )
diff --git a/sw/source/filter/xml/xmlitmpr.cxx
b/sw/source/filter/xml/xmlitmpr.cxx
index 27c66e9..d61b4df 100644
--- a/sw/source/filter/xml/xmlitmpr.cxx
+++ b/sw/source/filter/xml/xmlitmpr.cxx
@@ -77,7 +77,7 @@ SvXMLItemMapEntry* SvXMLItemMapEntries::getByName(
sal_uInt16 nNameSpace,
pMap++;
}
-return (pMap->eLocalName != XML_TOKEN_INVALID) ? pMap : NULL;
+return (pMap && (pMap->eLocalName != XML_TOKEN_INVALID)) ? pMap : NULL;
}
SvXMLItemMapEntry* SvXMLItemMapEntries::getByIndex( sal_uInt16 nIndex ) const
diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx
index 7b69a02..afc6093 100644
--- a/sw/source/ui/uiview/view2.cxx
+++ b/sw/source/ui/uiview/view2.cxx
@@ -2282,10 +2282,11 @@ void SwView::GenerateFormLetter(sal_Bool
bUseCurrentDocument)
rSh.EnterStdMode(); // Wechsel in Textshell erzwingen; ist fuer
// das Mischen von DB-Feldern notwendig.
AttrChangedNotify( &rSh );
-pNewDBMgr->SetMergeType( DBMGR_MERGE );
if (pNewDBMgr)
{
+pNewDBMgr->SetMergeType( DBMGR_MERGE );
+
Sequence aProperties(3);
PropertyValue* pValues = aProperties.getArray();
pValues[0].Name = C2U("DataSourceName");
diff --git a/vcl/source/window/decoview.cxx b/vcl/source/window/decoview.cxx
index ba41187..ab61741 100644
--- a/vcl/source/win
[Libreoffice-commits] .: 2 commits - cui/source offapi/com sw/source
cui/source/dialogs/SpellAttrib.hxx | 10
cui/source/dialogs/SpellDialog.cxx | 149
cui/source/dialogs/SpellDialog.hrc |5
cui/source/dialogs/SpellDialog.src | 69 ++---
cui/source/inc/SpellDialog.hxx | 29 +-
offapi/com/sun/star/linguistic2/SingleProofreadingError.idl |4
sw/source/ui/docvw/FrameControlsManager.cxx | 15 +
sw/source/ui/docvw/PageBreakWin.cxx | 43 ++-
sw/source/ui/inc/FrameControlsManager.hxx |1
sw/source/ui/inc/PageBreakWin.hxx |1
10 files changed, 210 insertions(+), 116 deletions(-)
New commits:
commit bc3c10b5ce88869871761000e9724bcad9a0d556
Author: Cédric Bosdonnat
Date: Sun Oct 23 07:35:06 2011 -0700
Grammar checking dialog: reworked how explanations are shown
diff --git a/cui/source/dialogs/SpellAttrib.hxx
b/cui/source/dialogs/SpellAttrib.hxx
index 9ebc229..731c694 100644
--- a/cui/source/dialogs/SpellAttrib.hxx
+++ b/cui/source/dialogs/SpellAttrib.hxx
@@ -47,6 +47,7 @@ struct SpellErrorDescription
::rtl::OUString sErrorText;
::rtl::OUString sDialogTitle;
::rtl::OUString sExplanation;
+::rtl::OUString sExplanationURL;
::com::sun::star::lang::Locale aLocale;
::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XProofreader > xGrammarChecker;
::rtl::OUString sServiceName;
//service name of GrammarChecker/SpellChecker
@@ -64,9 +65,13 @@ struct SpellErrorDescription
const ::rtl::OUString& rServiceName,
const ::rtl::OUString* pDialogTitle = 0,
const ::rtl::OUString* pExplanation = 0,
- const ::rtl::OUString* pRuleId = 0 ) :
+ const ::rtl::OUString* pRuleId = 0,
+ const ::rtl::OUString* pExplanationURL = 0 ) :
bIsGrammarError( bGrammar ),
sErrorText( rText ),
+sDialogTitle( ),
+sExplanation( ),
+sExplanationURL( ),
aLocale( rLocale ),
xGrammarChecker( rxGrammarChecker ),
sServiceName( rServiceName ),
@@ -76,6 +81,8 @@ struct SpellErrorDescription
sDialogTitle = *pDialogTitle;
if( pExplanation )
sExplanation = *pExplanation;
+if( pExplanationURL )
+sExplanationURL = *pExplanationURL;
if( pRuleId )
sRuleId = *pRuleId;
};
@@ -91,6 +98,7 @@ struct SpellErrorDescription
xGrammarChecker == rDesc.xGrammarChecker &&
sDialogTitle.equals( rDesc.sDialogTitle ) &&
sExplanation.equals( rDesc.sExplanation ) &&
+sExplanationURL.equals( rDesc.sExplanationURL ) &&
sRuleId == rDesc.sRuleId;
}
};
diff --git a/cui/source/dialogs/SpellDialog.cxx
b/cui/source/dialogs/SpellDialog.cxx
index 389cee6..9990e4c 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -51,6 +51,8 @@
#include
#include
#include
+#include
+#include
#include
#include
#include
@@ -68,6 +70,8 @@
#include
#include "treeopt.hxx"
#include
+#include
+#include
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -189,6 +193,26 @@ sal_uInt16 SpellUndoAction_Impl::GetId()const
return m_nId;
}
+HelpFixedText::HelpFixedText( Window* pParent, const ResId& rResId ):
+FixedText( pParent, rResId )
+{
+}
+
+void HelpFixedText::Paint( const Rectangle& rRect )
+{
+Rectangle aTextRect( rRect.Left() + 6, rRect.Top(), rRect.Right() - 6,
rRect.Bottom() );
+DrawText( aTextRect, GetText(), TEXT_DRAW_WORDBREAK | TEXT_DRAW_MULTILINE
);
+}
+
+long HelpFixedText::GetActualHeight( )
+{
+Rectangle rRect( GetPosPixel( ), GetSizePixel() );
+Rectangle aTextRect( rRect.Left() + 6, rRect.Top(), rRect.Right() - 6,
rRect.Bottom() );
+Rectangle aBounds = GetTextRect( aTextRect, GetText(), TEXT_DRAW_WORDBREAK
| TEXT_DRAW_MULTILINE );
+
+return aBounds.getHeight();
+}
+
// class SvxSpellCheckDialog -
SpellDialog::SpellDialog(
@@ -200,9 +224,10 @@ SpellDialog::SpellDialog(
pParent,
CUI_RES(RID_SVXDLG_SPELLCHECK)),
-aVendorImageFI ( this , CUI_RES( IMG_VENDOR ) ),
aLanguageFT ( this, CUI_RES( FT_LANGUAGE ) ),
aLanguageLB ( this, CUI_RES( LB_LANGUAGE ) ),
+aExplainFT ( this, CUI_RES( FT_EXPLAIN ) ),
+aExplainLink( this, CUI_RES( LINK_EXPLAIN ) ),
aNotInDictFT( this, CUI_RE
[Libreoffice-commits] .: 2 commits - cui/source l10ntools/source
cui/source/inc/grfpage.hxx |1
cui/source/tabpages/grfpage.cxx | 32 +++---
cui/source/tabpages/grfpage.hrc |3 --
cui/source/tabpages/grfpage.src | 42
l10ntools/source/xrmmerge.cxx | 10 -
5 files changed, 41 insertions(+), 47 deletions(-)
New commits:
commit df6c97530ed394d60504523f55d7a21469a73625
Author: Andras Timar
Date: Sat Oct 29 00:14:55 2011 +0200
tweak handling of extension descriptions
diff --git a/l10ntools/source/xrmmerge.cxx b/l10ntools/source/xrmmerge.cxx
index b158b35..9591c55 100644
--- a/l10ntools/source/xrmmerge.cxx
+++ b/l10ntools/source/xrmmerge.cxx
@@ -685,9 +685,8 @@ void XRMResMerge::WorkOnDesc(
sSearch = ByteString("xlink:href=\"");
sReplace = sSearch;
-ByteString sLocDescFilename = sCur;
-sLocDescFilename += ByteString("-");
-sLocDescFilename += sDescFilename;
+ByteString sLocDescFilename = sDescFilename;
+sLocDescFilename.SearchAndReplace( "en-US", sCur );
sSearch += sDescFilename;
sReplace += sLocDescFilename;
@@ -697,8 +696,9 @@ void XRMResMerge::WorkOnDesc(
DirEntry aEntry( String( sOutputFile,
RTL_TEXTENCODING_ASCII_US ));
aEntry.ToAbs();
-ByteString sOutputDescFile( aEntry.GetFull(),
RTL_TEXTENCODING_ASCII_US );
-sOutputDescFile.SearchAndReplaceAll( "description.xml", ""
);
+ByteString sOutputDescFile( aEntry.GetPath().GetFull(),
RTL_TEXTENCODING_ASCII_US );
+ByteString sDel( DirEntry::GetAccessDelimiter(),
RTL_TEXTENCODING_ASCII_US );
+sOutputDescFile += sDel;
sOutputDescFile += sLocDescFilename;
sText.SearchAndReplaceAll( "\\n", "\n" );
ofstream file ( sOutputDescFile.GetBuffer() );
commit adb8868edaebb372a54140f84bf85ac9eef37918
Author: László Németh
Date: Sat Oct 29 00:12:25 2011 +0200
Display original resolution in PPI in Writer's Picture/Crop tab
diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx
index 9d53f2c..4840442 100644
--- a/cui/source/inc/grfpage.hxx
+++ b/cui/source/inc/grfpage.hxx
@@ -97,6 +97,7 @@ class SvxGrfCropPage : public SfxTabPage
Timer aTimer;
String aGraphicName;
SizeaOrigSize;
+SizeaOrigPixelSize;
SizeaPageSize;
const MetricField* pLastCropField;
longnOldWidth;
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index 435345b..af27a6c 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -42,6 +42,7 @@
#include // for RID_SVXPAGE_GRFCROP
#define CM_1_TO_TWIP567
+#define TWIP_TO_INCH1440
inline long lcl_GetValue( MetricField& rMetric, FieldUnit eUnit )
@@ -214,8 +215,13 @@ void SvxGrfCropPage::Reset( const SfxItemSet &rSet )
if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRAF_GRAPHIC, sal_False,
&pItem ) )
{
const Graphic* pGrf = ((SvxBrushItem*)pItem)->GetGraphic();
-if( pGrf )
+if( pGrf ) {
aOrigSize = GetGrfOrigSize( *pGrf );
+if (pGrf->GetType() == GRAPHIC_BITMAP && aOrigSize.Width() &&
aOrigSize.Height()) {
+Bitmap aBitmap = pGrf->GetBitmap();
+aOrigPixelSize = aBitmap.GetSizePixel();
+}
+}
if( aOrigSize.Width() && aOrigSize.Height() )
{
@@ -360,6 +366,10 @@ void SvxGrfCropPage::ActivatePage(const SfxItemSet& rSet)
{
aExampleWN.SetGraphic( *pGrf );
aOrigSize = GetGrfOrigSize( *pGrf );
+if (pGrf->GetType() == GRAPHIC_BITMAP && aOrigSize.Width() > 1 &&
aOrigSize.Height() > 1) {
+Bitmap aBitmap = pGrf->GetBitmap();
+aOrigPixelSize = aBitmap.GetSizePixel();
+}
aExampleWN.SetFrameSize(aOrigSize);
GraphicHasChanged( aOrigSize.Width() && aOrigSize.Height() );
CalcMinMaxBorder();
@@ -664,9 +674,25 @@ void SvxGrfCropPage::GraphicHasChanged( sal_Bool bFound )
aFld.SetValue( aFld.Normalize( aOrigSize.Width() ), eUnit );
String sTemp = aFld.GetText();
aFld.SetValue( aFld.Normalize( aOrigSize.Height() ), eUnit );
-sTemp += UniString::CreateFromAscii(" x ");
+// multiplication sign (U+00D7)
+sTemp += UniString("\xc3\x97", RTL_TEXTENCODING_UTF8);
sTemp += aFld.GetText();
-aOrigSizeFT.SetText(sTemp);
+
+if ( aOrigPixelSize.Width() && aOrigPixelSize.Height() ) {
+ int ax = int(floor((float)aOrigPixelSize.Width() /
+((float)aOrigSize.Width()/TWIP_TO_INCH)+0.5));
+ int
[Libreoffice-commits] .: 2 commits - cui/source unusedcode.easy
cui/source/dialogs/SpellDialog.cxx | 48 +++--- cui/source/inc/SpellDialog.hxx |2 unusedcode.easy| 96 +++-- 3 files changed, 81 insertions(+), 65 deletions(-) New commits: commit fd8fdedd2165917e671e356039d8b0616b4576ac Author: Caolán McNamara Date: Mon Oct 17 15:21:20 2011 +0100 regenerate list diff --git a/unusedcode.easy b/unusedcode.easy index e5bed09..cedf5d7 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -1,5 +1,5 @@ (anonymous namespace)::Registration::~Registration() -(anonymous namespace)::getState(std::vector > const&) +(anonymous namespace)::getState(std::__debug::vector > const&) (anonymous namespace)::writeInfo(com::sun::star::uno::Reference const&, rtl::OUString const&, rtl::OUString const&) AtomDocument::AtomDocument(AtomPubSession*, std::basic_string, std::allocator >) AtomFolder::AtomFolder(AtomPubSession*, std::basic_string, std::allocator >) @@ -214,7 +214,7 @@ IconChoiceDialog::RemoveResetButton() IconChoiceDialog::RemoveTabPage(unsigned short) ImageButton::ImageButton(unsigned short) ImageList::Clear() -ImageList::GetImageIds(std::vector >&) const +ImageList::GetImageIds(std::__debug::vector >&) const ImageList::RemoveImage(rtl::OUString const&) ImageList::ReplaceImage(rtl::OUString const&, rtl::OUString const&) ImageList::ReplaceImage(unsigned short, Image const&) @@ -457,7 +457,7 @@ ScConditionalFormats_Impl::Insert(ScConditionalFormats_Impl const*, unsigned sho ScConditionalFormats_Impl::Remove(ScConditionalFormat* const&, unsigned short) ScConditionalFormats_Impl::Remove(unsigned short, unsigned short) ScCsvControl::ScCsvControl(Window*, ScCsvLayoutData const&, long) -ScDBCollection::AnonDBs::erase(boost::void_ptr_iterator<__gnu_cxx::__normal_iterator > >, ScDBData>) +ScDBCollection::AnonDBs::erase(boost::void_ptr_iterator<__gnu_debug::_Safe_iterator<__gnu_cxx::__normal_iterator > >, std::__debug::vector > >, ScDBData>) ScDBCollection::AnonDBs::size() const ScDLL::Exit() ScDPCache::GetAdditionalItemID(String const&) const @@ -471,12 +471,12 @@ ScDPItemData::CreateTypeString() ScDPItemData::GetNumFormat() const ScDPSaveData::Refresh(com::sun::star::uno::Reference const&) ScDdeLink::ResetValue() -ScDocFunc::ModifyAllRangeNames(ScRangeName const*, std::map, std::allocator > > const&) +ScDocFunc::ModifyAllRangeNames(ScRangeName const*, std::__debug::map, std::allocator > > const&) ScDocRowHeightUpdater::TabRanges::TabRanges() ScDocument::HasControl(short, Rectangle const&) ScDocument::InvalidateControls(Window*, short, Rectangle const&) ScDocument::IsLoadingMedium() const -ScDocument::ValidNewTabName(std::vector > const&) const +ScDocument::ValidNewTabName(std::__debug::vector > const&) const ScExternalRefManager::setCacheTableReferencedPermanently(unsigned short, rtl::OUString const&, unsigned long) ScFilterDetect::impl_createFactory(com::sun::star::uno::Reference const&) ScFiltersTest::testVba() @@ -846,7 +846,6 @@ SvXMLEmbeddedElementArr::Remove(SvXMLEmbeddedElement* const&, unsigned short) SvXMLEmbeddedElementArr::Remove(unsigned short, unsigned short) SvXMLExport::GetErrors() SvXMLExport::SvXMLExport(com::sun::star::uno::Reference const&, rtl::OUString const&, com::sun::star::uno::Reference const&, com::sun::star::uno::Reference const&, com::sun::star::uno::Reference const&, short) -SvXMLExportHelper::AddPercentage(int, rtl::OUStringBuffer&) SvXMLExportPropertyMapper::exportXML(SvXMLAttributeList&, XMLPropertyState const&, SvXMLUnitConverter const&, SvXMLNamespaceMap const&, unsigned short) const SvXMLImport::GetErrors() SvXMLImport::SetError(int, rtl::OUString const&, rtl::OUString const&, rtl::OUString const&) @@ -854,7 +853,7 @@ SvXMLImport::SetError(int, rtl::OUString const&, rtl::OUString const&, rtl::OUSt SvXMLImport::SvXMLImport(com::sun::star::uno::Reference const&, com::sun::star::uno::Reference const&) SvXMLImport::getImplementation(com::sun::star::uno::Reference) SvXMLImportContexts_Impl::DeleteAndDestroy(unsigned short, unsigned short) -SvXMLImportPropertyMapper::importXML(std::vector >&, com::sun::star::uno::Reference, SvXMLUnitConverter const&, SvXMLNamespaceMap const&, unsigned int) const +SvXMLImportPropertyMapper::importXML(std::__debug::vector >&, com::sun::star::uno::Reference, SvXMLUnitConverter const&, SvXMLNamespaceMap const&, unsigned int) const SvXMLNamespaceMap::AddAtIndex(unsigned short, char const*, char const*, unsigned short) SvXMLNamespaceMap::GetKeyByIndex(unsigned short) const SvXMLNumFormatContext::AddCondition(int, rtl::OUString const&, LocaleDataWrapper const&) @@ -865,15 +864,14 @@ SvXMLTokenMap_Impl::Insert(SvXMLTokenMapEntry_Impl* const*, unsigned short) SvXMLTokenMap_Impl::Insert(SvXMLTokenMap_Impl const*, unsigned short, unsigned short) SvXMLTokenMap_Impl::Remove(SvXMLTokenMapEntry_Impl* const&, unsigned short) SvXMLTokenMap_Impl::Remove(unsigned short, unsigned short) -Sv
[Libreoffice-commits] .: 2 commits - cui/source tail_build/prj
cui/source/tabpages/tpcolor.cxx |2 ++
tail_build/prj/makefile.mk |1 +
2 files changed, 3 insertions(+)
New commits:
commit a1c06ff4f270a7d240f08325198d967c09ce4c1b
Author: Michael Stahl
Date: Tue Oct 11 21:19:24 2011 +0200
tpcolor.cxx: unused parameter warning
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index c63c799..dca59c5 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -1297,6 +1297,7 @@ void SvxColorTabPage::SaveToViewFrame( SfxViewFrame
*pViewFrame )
void SvxColorTabPage::SetPropertyList( XPropertyListType t, const
XPropertyListRef &xRef )
{
+(void) t;
OSL_ASSERT( t == XCOLOR_LIST );
pColorList = XColorListRef( static_cast(xRef.get() ) );
}
@@ -1308,6 +1309,7 @@ void SvxColorTabPage::SetColorList( XColorListRef
pColList )
XPropertyListRef SvxColorTabPage::GetPropertyList( XPropertyListType t )
{
+(void) t;
OSL_ASSERT( t == XCOLOR_LIST );
return XPropertyListRef( pColorList.get() );
}
commit 1061899ab6d4554269ef1536d52bd26af1590e0e
Author: Michael Stahl
Date: Tue Oct 11 21:13:42 2011 +0200
tail_build: fix non-parallel build problem
diff --git a/tail_build/prj/makefile.mk b/tail_build/prj/makefile.mk
index 0997622..700891c 100644
--- a/tail_build/prj/makefile.mk
+++ b/tail_build/prj/makefile.mk
@@ -1 +1,2 @@
+GMAKE_MODULE_PARALLELISM := $(GMAKE_PARALLELISM) # tail_build is special!
.INCLUDE : gbuildbridge.mk
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
