cui/source/dialogs/hlinettp.cxx | 23 ---
cui/source/dialogs/hyperdlg.hrc | 1
cui/source/inc/hlinettp.hxx | 2
external/languagetool/UnpackedTarball_languagetool.mk | 2
external/languagetool/english.ireland.patch | 11 +
external/languagetool/esperanto.territory.patch | 12 +
include/vcl/window.hxx | 7
sd/source/filter/eppt/epptbase.hxx | 3
sd/source/filter/eppt/pptx-stylesheet.cxx | 4
sd/source/filter/eppt/pptx-text.cxx | 41 ++++-
sd/source/filter/eppt/text.hxx | 28 ++-
sfx2/AllLangResTarget_sfx2.mk | 1
sfx2/UIConfig_sfx.mk | 1
sfx2/source/dialog/alienwarn.cxx | 133 +-----------------
sfx2/source/dialog/alienwarn.hrc | 54 -------
sfx2/source/dialog/alienwarn.src | 83 -----------
sfx2/source/inc/alienwarn.hxx | 19 --
sfx2/source/inc/helpid.hrc | 1
sfx2/uiconfig/ui/alienwarndialog.ui | 88 +++++++++++
vcl/inc/window.h | 3
vcl/source/control/button.cxx | 6
vcl/source/filter/wmf/emfwr.cxx | 19 +-
vcl/source/window/builder.cxx | 4
vcl/source/window/layout.cxx | 20 ++
vcl/source/window/window.cxx | 1
vcl/source/window/window2.cxx | 12 +
26 files changed, 235 insertions(+), 344 deletions(-)
New commits:
commit fcb7905a7f7c8ad3e46fb49324fb1d7eaae83192
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Nov 18 13:57:14 2013 +0000
missing resource
this is missing since abad15bc31e99d554a68c6806a3ebb5f592dabbd
"small improvement of Insert -> Hyperlink -> Internet dialog". I can only
assume that removing the target button was intentional.
Change-Id: I71147394bcab348ed1d9e1e19e32b5ebdddc8c0e
diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx
index 322ab74..ddaf986 100644
--- a/cui/source/dialogs/hlinettp.cxx
+++ b/cui/source/dialogs/hlinettp.cxx
@@ -47,7 +47,6 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( Window
*pParent,
maBtBrowse ( this, CUI_RES (BTN_BROWSE) ),
maFtLogin ( this, CUI_RES (FT_LOGIN) ),
maEdLogin ( this, CUI_RES (ED_LOGIN) ),
- maBtTarget ( this, CUI_RES (BTN_TARGET) ),
maFtPassword ( this, CUI_RES (FT_PASSWD) ),
maEdPassword ( this, CUI_RES (ED_PASSWD) ),
maCbAnonymous ( this, CUI_RES (CBX_ANONYMOUS) ),
@@ -55,7 +54,6 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( Window
*pParent,
{
// Disable display of bitmap names.
maBtBrowse.EnableTextDisplay (sal_False);
- maBtTarget.EnableTextDisplay (sal_False);
InitStdControls();
FreeResource();
@@ -76,7 +74,6 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( Window
*pParent,
maEdLogin.Show( sal_False );
maEdPassword.Show( sal_False );
maCbAnonymous.Show( sal_False );
- maBtTarget.Enable( sal_False );
maBtBrowse.Enable( sal_True );
///////////////////////////////////////
@@ -86,7 +83,6 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( Window
*pParent,
maRbtLinktypFTP.SetClickHdl ( aLink );
maCbAnonymous.SetClickHdl ( LINK ( this, SvxHyperlinkInternetTp,
ClickAnonymousHdl_Impl ) );
maBtBrowse.SetClickHdl ( LINK ( this, SvxHyperlinkInternetTp,
ClickBrowseHdl_Impl ) );
- maBtTarget.SetClickHdl ( LINK ( this, SvxHyperlinkInternetTp,
ClickTargetHdl_Impl ) );
maEdLogin.SetModifyHdl ( LINK ( this, SvxHyperlinkInternetTp,
ModifiedLoginHdl_Impl ) );
maCbbTarget.SetLoseFocusHdl ( LINK ( this, SvxHyperlinkInternetTp,
LostFocusTargetHdl_Impl ) );
maCbbTarget.SetModifyHdl ( LINK ( this, SvxHyperlinkInternetTp,
ModifiedTargetHdl_Impl ) );
@@ -94,8 +90,6 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( Window
*pParent,
maFtTarget.SetAccessibleRelationMemberOf( &maGrpLinkTyp );
maCbbTarget.SetAccessibleRelationMemberOf( &maGrpLinkTyp );
- maBtTarget.SetAccessibleRelationMemberOf( &maGrpLinkTyp );
- maBtTarget.SetAccessibleRelationLabeledBy( &maFtTarget );
maBtBrowse.SetAccessibleRelationMemberOf( &maGrpLinkTyp );
maBtBrowse.SetAccessibleRelationLabeledBy( &maFtTarget );
}
@@ -298,14 +292,12 @@ void SvxHyperlinkInternetTp::SetScheme(const OUString&
rScheme)
//update 'link target in document'-window and opening-button
if (rScheme.startsWith(sHTTPScheme) || rScheme.isEmpty())
{
- maBtTarget.Enable();
if ( mbMarkWndOpen )
ShowMarkWnd ();
}
else
{
//disable for https and ftp
- maBtTarget.Disable();
if ( mbMarkWndOpen )
HideMarkWnd ();
}
@@ -427,21 +419,6 @@ IMPL_LINK_NOARG(SvxHyperlinkInternetTp,
ClickBrowseHdl_Impl)
return( 0L );
}
-/*************************************************************************
-|*
-|* Click on imagebutton : Target
-|*
-|************************************************************************/
-
-IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ClickTargetHdl_Impl)
-{
- RefreshMarkWindow();
- ShowMarkWnd ();
- mbMarkWndOpen = IsMarkWndVisible ();
-
- return( 0L );
-}
-
void SvxHyperlinkInternetTp::RefreshMarkWindow()
{
if ( maRbtLinktypInternet.IsChecked() && IsMarkWndVisible() )
diff --git a/cui/source/dialogs/hyperdlg.hrc b/cui/source/dialogs/hyperdlg.hrc
index 8c3423d..54152b3 100644
--- a/cui/source/dialogs/hyperdlg.hrc
+++ b/cui/source/dialogs/hyperdlg.hrc
@@ -29,7 +29,6 @@
#define ED_PASSWD 10
#define CBX_ANONYMOUS 11
#define BTN_BROWSE 12
-#define BTN_TARGET 13
/* Tabpage : Hyperlink - Mail & News */
diff --git a/cui/source/inc/hlinettp.hxx b/cui/source/inc/hlinettp.hxx
index 8ff7474..c6f3968 100644
--- a/cui/source/inc/hlinettp.hxx
+++ b/cui/source/inc/hlinettp.hxx
@@ -40,7 +40,6 @@ private:
ImageButton maBtBrowse;
FixedText maFtLogin;
Edit maEdLogin;
- ImageButton maBtTarget;
FixedText maFtPassword;
Edit maEdPassword;
CheckBox maCbAnonymous;
@@ -53,7 +52,6 @@ private:
DECL_LINK (Click_SmartProtocol_Impl , void * ); ///< Radiobutton clicked:
Type HTTP or FTP
DECL_LINK (ClickAnonymousHdl_Impl , void * ); ///< Checkbox : Anonymous
User
DECL_LINK (ClickBrowseHdl_Impl , void * ); ///< Button : Browse
- DECL_LINK (ClickTargetHdl_Impl , void * ); ///< Button : Target
DECL_LINK (ModifiedLoginHdl_Impl , void * ); ///< Contens of editfield
"Login" modified
DECL_LINK (LostFocusTargetHdl_Impl , void * ); ///< Combobox "Target"
lost its focus
DECL_LINK (ModifiedTargetHdl_Impl , void * ); ///< Contens of editfield
"Target" modified
commit e0840df74c9f33cae4e3cea5f5e5de39d51d17fd
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Nov 18 11:34:28 2013 +0000
convert alien dialog to .ui
Change-Id: I5b4a17eb83d61f7f95d7b71024ba035c957adf2c
diff --git a/sfx2/AllLangResTarget_sfx2.mk b/sfx2/AllLangResTarget_sfx2.mk
index c9fc44a..b845e20 100644
--- a/sfx2/AllLangResTarget_sfx2.mk
+++ b/sfx2/AllLangResTarget_sfx2.mk
@@ -42,7 +42,6 @@ $(eval $(call gb_SrsTarget_add_files,sfx/res,\
sfx2/source/bastyp/bastyp.src \
sfx2/source/bastyp/fltfnc.src \
sfx2/source/control/templateview.src \
- sfx2/source/dialog/alienwarn.src \
sfx2/source/dialog/dialog.src \
sfx2/source/dialog/dinfdlg.src \
sfx2/source/dialog/filedlghelper.src \
diff --git a/sfx2/UIConfig_sfx.mk b/sfx2/UIConfig_sfx.mk
index 1ae9091..a62f479 100644
--- a/sfx2/UIConfig_sfx.mk
+++ b/sfx2/UIConfig_sfx.mk
@@ -10,6 +10,7 @@
$(eval $(call gb_UIConfig_UIConfig,sfx))
$(eval $(call gb_UIConfig_add_uifiles,sfx,\
+ sfx2/uiconfig/ui/alienwarndialog \
sfx2/uiconfig/ui/checkin \
sfx2/uiconfig/ui/custominfopage \
sfx2/uiconfig/ui/descriptioninfopage \
diff --git a/sfx2/source/dialog/alienwarn.cxx b/sfx2/source/dialog/alienwarn.cxx
index dd2e9d1..0ec75af 100644
--- a/sfx2/source/dialog/alienwarn.cxx
+++ b/sfx2/source/dialog/alienwarn.cxx
@@ -19,149 +19,38 @@
#include <sal/macros.h>
-#include "alienwarn.hxx"
#include <sfx2/sfxresid.hxx>
#include <sfx2/sfxuno.hxx>
-
-#include "alienwarn.hrc"
-#include "dialog.hrc"
-#include <vcl/msgbox.hxx>
#include <unotools/saveopt.hxx>
+#include "alienwarn.hxx"
-// class SfxAlienWarningDialog -------------------------------------------
-
-SfxAlienWarningDialog::SfxAlienWarningDialog( Window* pParent, const OUString&
_rFormatName ) :
-
- SfxModalDialog( pParent, SfxResId( RID_DLG_ALIEN_WARNING ) ),
-
- m_aKeepCurrentBtn ( this, SfxResId( PB_NO ) ),
- m_aSaveODFBtn ( this, SfxResId( PB_YES ) ),
- m_aMoreInfoBtn ( this, SfxResId( PB_MOREINFO ) ),
- m_aOptionLine ( this, SfxResId( FL_OPTION ) ),
- m_aWarningOnBox ( this, SfxResId( CB_WARNING_OFF ) ),
- m_aQueryImage ( this, SfxResId( FI_QUERY ) ),
- m_aInfoText ( this, SfxResId( FT_INFOTEXT ) )
-
+SfxAlienWarningDialog::SfxAlienWarningDialog(Window* pParent, const OUString&
_rFormatName)
+ : MessageDialog(pParent, "AlienWarnDialog", "sfx/ui/alienwarndialog.ui")
{
- FreeResource();
-
- // set questionmark image
- m_aQueryImage.SetImage( QueryBox::GetStandardImage() );
+ get(m_pWarningOnBox, "ask");
+ get(m_pKeepCurrentBtn, "ok");
// replace formatname (text)
- OUString sInfoText = m_aInfoText.GetText();
+ OUString sInfoText = get_primary_text();
sInfoText = sInfoText.replaceAll( "%FORMATNAME", _rFormatName );
- m_aInfoText.SetText( sInfoText );
+ set_primary_text(sInfoText);
// replace formatname (button)
- sInfoText = m_aKeepCurrentBtn.GetText();
+ sInfoText = m_pKeepCurrentBtn->GetText();
sInfoText = sInfoText.replaceAll( "%FORMATNAME", _rFormatName );
- m_aKeepCurrentBtn.SetText( sInfoText );
+ m_pKeepCurrentBtn->SetText( sInfoText );
// load value of "warning on" checkbox from save options
- m_aWarningOnBox.Check( SvtSaveOptions().IsWarnAlienFormat() == sal_True );
-
- // set focus to "Keep Current Format" button
- m_aKeepCurrentBtn.GrabFocus();
-
- // pb: #i43989# we have no online help for this dialog at the moment
- // -> hide the "more info" button
- //m_aMoreInfoBtn.Hide();
-
- // calculate and set the size of the dialog and its controls
- InitSize();
+ m_pWarningOnBox->Check( SvtSaveOptions().IsWarnAlienFormat() == sal_True );
}
-// -----------------------------------------------------------------------
-
SfxAlienWarningDialog::~SfxAlienWarningDialog()
{
// save value of "warning off" checkbox, if necessary
SvtSaveOptions aSaveOpt;
- sal_Bool bChecked = m_aWarningOnBox.IsChecked();
+ sal_Bool bChecked = m_pWarningOnBox->IsChecked();
if ( aSaveOpt.IsWarnAlienFormat() != bChecked )
aSaveOpt.SetWarnAlienFormat( bChecked );
}
-// -----------------------------------------------------------------------
-
-void SfxAlienWarningDialog::InitSize()
-{
- const long nExtraButtonWidth = LogicToPixel(
Size(IMPL_EXTRA_BUTTON_WIDTH,1), MapMode(MAP_APPFONT) ).getWidth();
- const long nAwCol2 = LogicToPixel( Size(AW_COL_2,1), MapMode(MAP_APPFONT)
).getWidth();
- long nTxtW, nCtrlW;
-
- // layout calculations should be re-done, when More Info button is enabled
- m_aMoreInfoBtn.Hide();
-
- // recalculate the size and position of the buttons
- nTxtW = m_aKeepCurrentBtn.GetCtrlTextWidth( m_aKeepCurrentBtn.GetText() );
- nTxtW += nExtraButtonWidth;
- Size aNewSize = m_aKeepCurrentBtn.GetSizePixel();
- aNewSize.Width() = nTxtW;
- m_aKeepCurrentBtn.SetSizePixel( aNewSize );
- Point aPos = m_aSaveODFBtn.GetPosPixel();
- aPos.X() = nAwCol2 + nTxtW + nExtraButtonWidth;
- m_aSaveODFBtn.SetPosPixel( aPos );
- nTxtW = m_aSaveODFBtn.GetCtrlTextWidth( m_aSaveODFBtn.GetText() );
- nTxtW += nExtraButtonWidth;
- aNewSize = m_aSaveODFBtn.GetSizePixel();
- aNewSize.Width() = nTxtW;
- m_aSaveODFBtn.SetSizePixel( aNewSize );
- long nBtnsWidthSize = m_aKeepCurrentBtn.GetSizePixel().Width() +
m_aSaveODFBtn.GetSizePixel().Width() + nAwCol2 + 2*nExtraButtonWidth;
-
- // resize + text of checkbox too wide -> add new line
- aNewSize = m_aWarningOnBox.GetSizePixel();
- aNewSize.Width() = nBtnsWidthSize - 2*nExtraButtonWidth;
- m_aWarningOnBox.SetSizePixel( aNewSize );
- nTxtW = m_aWarningOnBox.GetCtrlTextWidth( m_aWarningOnBox.GetText() );
- nCtrlW = m_aWarningOnBox.GetSizePixel().Width();
- if ( nTxtW >= nCtrlW )
- {
- long nTextHeight = m_aWarningOnBox.GetTextHeight();
- aNewSize.Height() += nTextHeight;
- m_aWarningOnBox.SetSizePixel( aNewSize );
- aNewSize = GetSizePixel();
- aNewSize.Height() += nTextHeight;
- SetSizePixel( aNewSize );
- }
-
- // resize + align the size of the information text control (FixedText) to
its content
- aNewSize = m_aInfoText.GetSizePixel();
- aNewSize.Width() = nBtnsWidthSize - 2*nExtraButtonWidth;
- m_aInfoText.SetSizePixel( aNewSize );
- Size aMinSize = m_aInfoText.CalcMinimumSize(
m_aInfoText.GetSizePixel().Width() );
- long nTxtH = aMinSize.Height();
- long nCtrlH = m_aInfoText.GetSizePixel().Height();
- long nDelta = ( nCtrlH - nTxtH );
- aNewSize.Height() -= nDelta;
- m_aInfoText.SetSizePixel( aNewSize );
-
-
- // new position for the succeeding windows
- Window* pWins[] =
- {
- &m_aSaveODFBtn, &m_aKeepCurrentBtn, &m_aMoreInfoBtn, &m_aOptionLine,
&m_aWarningOnBox
- };
- Window** pCurrent = pWins;
- for ( sal_uInt32 i = 0; i < sizeof( pWins ) / sizeof( pWins[ 0 ] ); ++i,
++pCurrent )
- {
- Point aNewPos = (*pCurrent)->GetPosPixel();
- aNewPos.Y() -= nDelta;
- (*pCurrent)->SetPosPixel( aNewPos );
- }
-
- // new size of the dialog
- aNewSize = GetSizePixel();
- aNewSize.Height() -= nDelta;
- aNewSize.Width() = nBtnsWidthSize;
- SetSizePixel( aNewSize );
-
- // resize the FixedLine
- aNewSize = m_aOptionLine.GetSizePixel();
- aNewSize.Width() = GetSizePixel().Width();
- m_aOptionLine.SetSizePixel( aNewSize );
-
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/dialog/alienwarn.hrc b/sfx2/source/dialog/alienwarn.hrc
deleted file mode 100644
index 7c871e3..0000000
--- a/sfx2/source/dialog/alienwarn.hrc
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef _SFX_ALIENWARN_HRC
-#define _SFX_ALIENWARN_HRC
-
-#include <svtools/controldims.hrc>
-
-// dialog ids
-
-#define FI_QUERY 10
-#define FT_INFOTEXT 11
-#define PB_YES 12
-#define PB_NO 13
-#define PB_MOREINFO 14
-#define FL_OPTION 15
-#define CB_WARNING_OFF 16
-
-// --------- general metrics ---------
-
-#define SYMBOL_EDGE 20
-#define DIALOG_WIDTH 250
-#define INFO_TEXT_LINES 11
-
-#define AW_COL_1 (RSC_SP_DLG_INNERBORDER_LEFT)
-#define AW_COL_2 (AW_COL_1+SYMBOL_EDGE+RSC_SP_CTRL_DESC_X)
-#define AW_COL_3
(AW_COL_2+RSC_CD_PUSHBUTTON_WIDTH+RSC_SP_CTRL_DESC_X)
-#define AW_COL_4
(DIALOG_WIDTH-RSC_SP_DLG_INNERBORDER_RIGHT-RSC_CD_PUSHBUTTON_WIDTH)
-
-#define AW_ROW_1 (RSC_SP_DLG_INNERBORDER_TOP)
-#define AW_ROW_2
(AW_ROW_1+INFO_TEXT_LINES*RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_Y)
-#define AW_ROW_3
(AW_ROW_2+RSC_CD_PUSHBUTTON_HEIGHT+RSC_SP_CTRL_DESC_Y)
-#define AW_ROW_4
(AW_ROW_3+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_CTRL_DESC_Y)
-
-#define DIALOG_HEIGHT
(AW_ROW_4+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_DLG_INNERBORDER_BOTTOM)
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/dialog/alienwarn.src b/sfx2/source/dialog/alienwarn.src
deleted file mode 100644
index 88a6fc1..0000000
--- a/sfx2/source/dialog/alienwarn.src
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "alienwarn.hrc"
-#include "dialog.hrc"
-#include "helpid.hrc"
-
-ModalDialog RID_DLG_ALIEN_WARNING
-{
- HelpId = HID_WARNING_ALIENFORMAT;
- Size = MAP_APPFONT( DIALOG_WIDTH, DIALOG_HEIGHT );
- OutputSize = TRUE;
- Closeable = FALSE;
- Moveable = TRUE;
- SVLook = TRUE;
-
- Text [ en-US ] = "Confirm File Format";
-
- FixedImage FI_QUERY
- {
- Pos = MAP_APPFONT( AW_COL_1, AW_ROW_1 );
- Size = MAP_APPFONT( SYMBOL_EDGE, SYMBOL_EDGE );
- };
- FixedText FT_INFOTEXT
- {
- Pos = MAP_APPFONT( AW_COL_2, AW_ROW_1 );
- Size = MAP_APPFONT(
DIALOG_WIDTH-AW_COL_2-RSC_SP_DLG_INNERBORDER_RIGHT,
INFO_TEXT_LINES*RSC_CD_FIXEDTEXT_HEIGHT );
- NoLabel = TRUE;
- Wordbreak = TRUE;
- Text [ en-US ] = "This document may contain formatting or content that
cannot be saved in the currently selected file format \"%FORMATNAME\".\n\nUse
the default ODF file format to be sure that the document is saved correctly.";
- };
- OKButton PB_NO
- {
- Pos = MAP_APPFONT( AW_COL_2, AW_ROW_2 );
- Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT
);
- DefButton = TRUE ;
- Text [ en-US ] = "~Use %FORMATNAME Format";
- };
- CancelButton PB_YES
- {
- Pos = MAP_APPFONT( AW_COL_3, AW_ROW_2 );
- Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT
);
- Text [ en-US ] = "Use ~ODF Format";
- };
- HelpButton PB_MOREINFO
- {
- Pos = MAP_APPFONT( AW_COL_4, AW_ROW_2 );
- Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT
);
- Hide = TRUE ;
- Text [ en-US ] = "~More Information...";
- };
- FixedLine FL_OPTION
- {
- Pos = MAP_APPFONT( 0, AW_ROW_3 );
- Size = MAP_APPFONT( DIALOG_WIDTH, RSC_CD_FIXEDLINE_HEIGHT );
- };
- CheckBox CB_WARNING_OFF
- {
- HelpID = "sfx2:CheckBox:RID_DLG_ALIEN_WARNING:CB_WARNING_OFF";
- Pos = MAP_APPFONT( AW_COL_2, AW_ROW_4 );
- Size = MAP_APPFONT(
DIALOG_WIDTH-AW_COL_2-RSC_SP_DLG_INNERBORDER_RIGHT, RSC_CD_CHECKBOX_HEIGHT );
- WordBreak = TRUE ;
- Text [ en-US ] = "~Ask when not saving in ODF format";
- };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/inc/alienwarn.hxx b/sfx2/source/inc/alienwarn.hxx
index 7221158..4ad9768 100644
--- a/sfx2/source/inc/alienwarn.hxx
+++ b/sfx2/source/inc/alienwarn.hxx
@@ -20,25 +20,16 @@
#define INCLUDED_SFX2_SOURCE_INC_ALIENWARN_HXX
#include <vcl/button.hxx>
-#include <vcl/fixed.hxx>
+#include <vcl/layout.hxx>
-#include <sfx2/basedlgs.hxx>
-
-class SfxAlienWarningDialog : public SfxModalDialog
+class SfxAlienWarningDialog : public MessageDialog
{
private:
- OKButton m_aKeepCurrentBtn;
- CancelButton m_aSaveODFBtn;
- HelpButton m_aMoreInfoBtn;
- FixedLine m_aOptionLine;
- CheckBox m_aWarningOnBox;
- FixedImage m_aQueryImage;
- FixedText m_aInfoText;
-
- void InitSize();
+ PushButton* m_pKeepCurrentBtn;
+ CheckBox* m_pWarningOnBox;
public:
- SfxAlienWarningDialog( Window* pParent, const OUString&
_rFormatName );
+ SfxAlienWarningDialog(Window* pParent, const OUString& _rFormatName);
virtual ~SfxAlienWarningDialog();
};
diff --git a/sfx2/source/inc/helpid.hrc b/sfx2/source/inc/helpid.hrc
index 575579e..d26d3f4 100644
--- a/sfx2/source/inc/helpid.hrc
+++ b/sfx2/source/inc/helpid.hrc
@@ -128,7 +128,6 @@
#define HID_XMLSECDLG_MACROWARN
"SFX2_HID_XMLSECDLG_MACROWARN"
#define HID_XMLSEC_INFO_WRONGDOCFORMAT
"SFX2_HID_XMLSEC_INFO_WRONGDOCFORMAT"
#define HID_WARNING_MACROSDISABLED
"SFX2_HID_WARNING_MACROSDISABLED"
-#define HID_WARNING_ALIENFORMAT
"SFX2_HID_WARNING_ALIENFORMAT"
#define HID_HELP_ONSTARTUP_BOX
"SFX2_HID_HELP_ONSTARTUP_BOX"
#define HID_DLG_CHECKFORONLINEUPDATE
"SFX2_HID_DLG_CHECKFORONLINEUPDATE"
#define HID_CTRL_CUSTOMPROPS_YES_NO
"SFX2_HID_CTRL_CUSTOMPROPS_YES_NO"
diff --git a/sfx2/uiconfig/ui/alienwarndialog.ui
b/sfx2/uiconfig/ui/alienwarndialog.ui
new file mode 100644
index 0000000..02bbca3
--- /dev/null
+++ b/sfx2/uiconfig/ui/alienwarndialog.ui
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkMessageDialog" id="AlienWarnDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">12</property>
+ <property name="title" translatable="yes">Confirm File Format</property>
+ <property name="resizable">False</property>
+ <property name="modal">True</property>
+ <property name="type_hint">dialog</property>
+ <property name="skip_taskbar_hint">True</property>
+ <property name="message_type">question</property>
+ <property name="text" translatable="yes">This document may contain
formatting or content that cannot be saved in the currently selected file
format "%FORMATNAME".</property>
+ <property name="secondary_text" translatable="yes">Use the default ODF
file format to be sure that the document is saved correctly.</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="messagedialog-vbox">
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">24</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="messagedialog-action_area">
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="ok">
+ <property name="label" translatable="yes">_Use %FORMATNAME
Format</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ <property name="non_homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="cancel">
+ <property name="label">Use _ODF Format</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_underline">True</property>
+ <property name="image_position">bottom</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ <property name="non_homogeneous">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="ask">
+ <property name="label" translatable="yes">_Ask when not saving in
ODF format</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="1">ok</action-widget>
+ <action-widget response="0">cancel</action-widget>
+ </action-widgets>
+ </object>
+</interface>
commit 6019cd9bb5606e0d3c2dfd3acbf3a24eee85ea11
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Nov 18 12:50:51 2013 +0000
want to be able to support non homogeneous buttons in buttonboxes
Change-Id: I7ea4c093d6318a24106542f851cfd58230bc3ea3
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index e351fdd..a8d6883 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -1208,6 +1208,13 @@ public:
void set_secondary(bool bSecondary);
/*
+ * If true this child is exempted from homogenous sizing
+ * e.g. special button in a buttonbox
+ */
+ bool get_non_homogeneous() const;
+ void set_non_homogeneous(bool bNonHomogeneous);
+
+ /*
* Sets a widget property
*
* @return false if property is unknown
diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index 42998d0..87fb5aa 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -396,7 +396,8 @@ public:
mbVexpand:1,
mbExpand:1,
mbFill:1,
- mbSecondary:1;
+ mbSecondary:1,
+ mbNonHomogeneous:1;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
mxDNDListenerContainer;
};
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index f581f59..e2f306d 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -2706,6 +2706,10 @@ void VclBuilder::applyPackingProperty(Window *pCurrent,
{
pCurrent->set_secondary(toBool(sValue));
}
+ else if (sKey == "non-homogeneous")
+ {
+ pCurrent->set_non_homogeneous(toBool(sValue));
+ }
else
{
SAL_WARN("vcl.layout", "unknown packing: " << sKey.getStr());
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 9737829..1532ce9 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -377,16 +377,19 @@ static long getMaxNonOutlier(const std::vector<long> &rG,
long nAvgDimension)
}
static std::vector<long> setButtonSizes(const std::vector<long> &rG,
+ const std::vector<bool> &rNonHomogeneous,
long nAvgDimension, long nMaxNonOutlier, long nMinWidth)
{
std::vector<long> aVec;
//set everything < 1.5 times the average to the same width, leave the
//outliers un-touched
+ std::vector<bool>::const_iterator aJ = rNonHomogeneous.begin();
for (std::vector<long>::const_iterator aI = rG.begin(), aEnd = rG.end();
- aI != aEnd; ++aI)
+ aI != aEnd; ++aI, ++aJ)
{
long nPrimaryChildDimension = *aI;
- if (nPrimaryChildDimension < nAvgDimension * 1.5)
+ bool bNonHomogeneous = *aJ;
+ if (!bNonHomogeneous && nPrimaryChildDimension < nAvgDimension * 1.5)
{
aVec.push_back(std::max(nMaxNonOutlier, nMinWidth));
}
@@ -413,7 +416,9 @@ VclButtonBox::Requisition
VclButtonBox::calculatePrimarySecondaryRequisitions()
bool bIgnoreSecondaryPacking = (m_eLayoutStyle == VCL_BUTTONBOX_SPREAD ||
m_eLayoutStyle == VCL_BUTTONBOX_CENTER);
std::vector<long> aMainGroupSizes;
+ std::vector<bool> aMainGroupNonHomogeneous;
std::vector<long> aSubGroupSizes;
+ std::vector<bool> aSubGroupNonHomogeneous;
for (const Window *pChild = GetWindow(WINDOW_FIRSTCHILD); pChild; pChild =
pChild->GetWindow(WINDOW_NEXT))
{
@@ -426,11 +431,13 @@ VclButtonBox::Requisition
VclButtonBox::calculatePrimarySecondaryRequisitions()
nMainGroupSecondary = std::max(nMainGroupSecondary,
getSecondaryDimension(aChildSize));
//collect the primary dimensions
aMainGroupSizes.push_back(getPrimaryDimension(aChildSize));
+ aMainGroupNonHomogeneous.push_back(pChild->get_non_homogeneous());
}
else
{
nSubGroupSecondary = std::max(nSubGroupSecondary,
getSecondaryDimension(aChildSize));
aSubGroupSizes.push_back(getPrimaryDimension(aChildSize));
+ aSubGroupNonHomogeneous.push_back(pChild->get_non_homogeneous());
}
}
@@ -468,8 +475,10 @@ VclButtonBox::Requisition
VclButtonBox::calculatePrimarySecondaryRequisitions()
long nMaxNonOutlier = std::max(nMaxMainNonOutlier, nMaxSubNonOutlier);
aReq.m_aMainGroupDimensions = setButtonSizes(aMainGroupSizes,
+ aMainGroupNonHomogeneous,
nAvgDimension, nMaxNonOutlier, nMinMainGroupPrimary);
aReq.m_aSubGroupDimensions = setButtonSizes(aSubGroupSizes,
+ aSubGroupNonHomogeneous,
nAvgDimension, nMaxNonOutlier, nMinSubGroupPrimary);
}
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 24edbd1..64664b1 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -295,6 +295,7 @@ WindowImpl::WindowImpl( WindowType nType )
mbExpand = false;
mbFill = true;
mbSecondary = false;
+ mbNonHomogeneous = false;
}
WindowImpl::~WindowImpl()
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 49f7650..2a5f2e0 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -2336,6 +2336,18 @@ void Window::set_secondary(bool bSecondary)
pWindowImpl->mbSecondary = bSecondary;
}
+bool Window::get_non_homogeneous() const
+{
+ WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+ return pWindowImpl->mbNonHomogeneous;
+}
+
+void Window::set_non_homogeneous(bool bNonHomogeneous)
+{
+ WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+ pWindowImpl->mbNonHomogeneous = bNonHomogeneous;
+}
+
void Window::add_to_size_group(boost::shared_ptr< VclSizeGroup > xGroup)
{
WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ?
mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
commit 079852ce8fd9d45f3cc02829c03d0ca6ddd20aa7
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Nov 18 12:32:07 2013 +0000
scaling the width gives huge spaces at the end of long buttons
e.g. in the alien warn dialog
Change-Id: I2e3acddb67b480d4d63a3f4cc77252886e0c9a1c
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index a840735..085c932 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -1706,14 +1706,14 @@ Size PushButton::CalcMinimumSize( long nMaxWidth ) const
sal_uLong nDrawFlags = 0;
Size textSize = GetTextRect( Rectangle( Point(), Size( nMaxWidth ?
nMaxWidth : 0x7fffffff, 0x7fffffff ) ),
PushButton::GetText(), ImplGetTextStyle(
nDrawFlags ) ).GetSize();
- aSize.Width() += int( textSize.Width () * 1.15 );
- aSize.Height() = std::max( aSize.Height(), long( textSize.Height() *
1.15 ) );
+ aSize.Width() += textSize.Width();
+ aSize.Height() = std::max( aSize.Height(), long( textSize.Height() *
1.15 ) );
}
// cf. ImplDrawPushButton ...
if( (GetStyle() & WB_SMALLSTYLE) == 0 )
{
- aSize.Width() += 12;
+ aSize.Width() += 24;
aSize.Height() += 12;
}
commit 52f7dfefde8d989032ea056f4cdba11cddde1f7c
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Nov 18 12:12:32 2013 +0000
adjust sizes of primary and secondary areas
Change-Id: I47dffdabcbd0b321502478327f95e9e6bfba6f5b
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 111e41b..9737829 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -2001,11 +2001,11 @@ void MessageDialog::SetMessagesWidths(Window *pParent,
aFont.SetSize(Size(0, aFont.GetSize().Height() * 1.2));
aFont.SetWeight(WEIGHT_BOLD);
pPrimaryMessage->SetControlFont(aFont);
-
pPrimaryMessage->SetMaxTextWidth(pPrimaryMessage->approximate_char_width() *
60);
-
pSecondaryMessage->SetMaxTextWidth(pSecondaryMessage->approximate_char_width()
* 80);
+
pPrimaryMessage->SetMaxTextWidth(pPrimaryMessage->approximate_char_width() *
44);
+
pSecondaryMessage->SetMaxTextWidth(pSecondaryMessage->approximate_char_width()
* 60);
}
else
-
pPrimaryMessage->SetMaxTextWidth(pPrimaryMessage->approximate_char_width() *
80);
+
pPrimaryMessage->SetMaxTextWidth(pPrimaryMessage->approximate_char_width() *
60);
}
commit 7de38f78fe66b4c5c6d62c59cdd6a38359352998
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Nov 18 11:42:37 2013 +0000
HIG seperate primary and secondary text by 24pixels
"Add one line break at the standard font size below both the primary and
secondary text, or 24 pixels if you are using Glade"
Change-Id: I4bdb0eade4de1304a155fe4338c013d1576b8282
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 5c0264a..111e41b 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -2021,6 +2021,7 @@ short MessageDialog::Execute()
m_pGrid = new VclGrid(pContainer);
m_pGrid->reorderWithinParent(0);
m_pGrid->set_column_spacing(12);
+ m_pGrid->set_row_spacing(GetTextHeight());
m_pImage = new FixedImage(m_pGrid, WB_CENTER | WB_VCENTER | WB_3DLOOK);
switch (m_eMessageType)
commit b211b8b2e14bd961a7b32033468a94cbff52b5c4
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Nov 18 10:56:43 2013 +0000
Related: rhbz#1014990 valgrind reports yet another unint variable
Change-Id: Idf6a0a1e12fffee6c090add41247723f1d9cf576
diff --git a/sd/source/filter/eppt/text.hxx b/sd/source/filter/eppt/text.hxx
index 3c0614e..301842b 100644
--- a/sd/source/filter/eppt/text.hxx
+++ b/sd/source/filter/eppt/text.hxx
@@ -26,6 +26,7 @@
#include <rtl/textenc.h>
#include <com/sun/star/awt/FontDescriptor.hpp>
#include <com/sun/star/lang/Locale.hpp>
+#include <editeng/svxenum.hxx>
#include <boost/shared_ptr.hpp>
@@ -62,17 +63,24 @@ struct SOParagraph
sal_Bool bNumberingIsNumber;
SOParagraph()
+ : bExtendedParameters(false)
+ , nParaFlags(0)
+ , nBulletFlags(0)
+ , nNumberingType(SVX_NUM_NUMBER_NONE)
+ , nHorzAdjust(0)
+ , nBulletColor(0)
+ , nBulletOfs(0)
+ , nStartWith(0)
+ , nTextOfs(0)
+ , nBulletRealSize(0)
+ , nDepth(0)
+ , cBulletId(0)
+ , bExtendedBulletsUsed(false)
+ , nBulletId(0xffff)
+ , nMappedNumType(0)
+ , bNumberingIsNumber(true)
{
- nDepth = 0;
- bExtendedParameters = sal_False;
- nParaFlags = 0;
- nBulletFlags = 0;
- nBulletOfs = 0;
- nTextOfs = 0;
- bExtendedBulletsUsed = sal_False;
- nBulletId = 0xffff;
- bNumberingIsNumber = sal_True;
- };
+ }
};
class PropStateValue : public PropValue
commit e0840f70565062b712e544f952640ee35cfb6a27
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Nov 18 10:39:15 2013 +0000
Related: rhbz#1014990 valgrind reports yet another uninitialized variable
Change-Id: Idf15ee825a34aa7788c422475aa6cea8ff802581
diff --git a/sd/source/filter/eppt/pptx-stylesheet.cxx
b/sd/source/filter/eppt/pptx-stylesheet.cxx
index 8e9e704..f35762c 100644
--- a/sd/source/filter/eppt/pptx-stylesheet.cxx
+++ b/sd/source/filter/eppt/pptx-stylesheet.cxx
@@ -286,8 +286,8 @@ void PPTExParaSheet::SetStyleSheet( const
::com::sun::star::uno::Reference< ::co
if ( !nLevel )
{
- if ( ( aParagraphObj.meBullet ==
::com::sun::star::beans::PropertyState_DIRECT_VALUE )
- && aParagraphObj.bExtendedParameters )
+ if (aParagraphObj.bExtendedParameters &&
+ aParagraphObj.meBullet ==
::com::sun::star::beans::PropertyState_DIRECT_VALUE)
{
for ( sal_Int16 i = 0; i < 5; i++ )
{
diff --git a/sd/source/filter/eppt/pptx-text.cxx
b/sd/source/filter/eppt/pptx-text.cxx
index 0199ad0..1efc779 100644
--- a/sd/source/filter/eppt/pptx-text.cxx
+++ b/sd/source/filter/eppt/pptx-text.cxx
@@ -627,10 +627,21 @@ PortionObj& PortionObj::operator=( const PortionObj&
rPortionObj )
return *this;
}
-ParagraphObj::ParagraphObj( const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > & rXPropSet,
- PPTExBulletProvider& rProv ) :
- maMapModeSrc ( MAP_100TH_MM ),
- maMapModeDest ( MAP_INCH, Point(), Fraction( 1, 576 ), Fraction( 1,
576 ) )
+ParagraphObj::ParagraphObj(const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > & rXPropSet,
+ PPTExBulletProvider& rProv)
+ : maMapModeSrc(MAP_100TH_MM)
+ , maMapModeDest(MAP_INCH, Point(), Fraction( 1, 576 ), Fraction( 1, 576 ))
+ , mnTextSize(0)
+ , mbFirstParagraph(false)
+ , mbLastParagraph(false)
+ , mnTextAdjust(0)
+ , mnLineSpacing(0)
+ , mbFixedLineSpacing(false)
+ , mnLineSpacingTop(0)
+ , mnLineSpacingBottom(0)
+ , mbForbiddenRules(false)
+ , mbParagraphPunctation(false)
+ , mnBiDi(0)
{
mXPropSet = rXPropSet;
@@ -643,12 +654,22 @@ ParagraphObj::ParagraphObj( const
::com::sun::star::uno::Reference< ::com::sun::
ImplGetParagraphValues( rProv, sal_False );
}
- ParagraphObj::ParagraphObj( ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextContent > & rXTextContent,
- ParaFlags aParaFlags, FontCollection& rFontCollection,
PPTExBulletProvider& rProv ) :
- maMapModeSrc ( MAP_100TH_MM ),
- maMapModeDest ( MAP_INCH, Point(), Fraction( 1, 576 ), Fraction( 1,
576 ) ),
- mbFirstParagraph ( aParaFlags.bFirstParagraph ),
- mbLastParagraph ( aParaFlags.bLastParagraph )
+ParagraphObj::ParagraphObj(::com::sun::star::uno::Reference<
::com::sun::star::text::XTextContent > & rXTextContent,
+ ParaFlags aParaFlags, FontCollection& rFontCollection,
PPTExBulletProvider& rProv )
+ : maMapModeSrc(MAP_100TH_MM)
+ , maMapModeDest(MAP_INCH, Point(), Fraction( 1, 576 ), Fraction( 1, 576 ))
+ , mnTextSize(0)
+ , mbIsBullet(false)
+ , mbFirstParagraph( aParaFlags.bFirstParagraph )
+ , mbLastParagraph( aParaFlags.bLastParagraph )
+ , mnTextAdjust(0)
+ , mnLineSpacing(0)
+ , mbFixedLineSpacing(false)
+ , mnLineSpacingTop(0)
+ , mnLineSpacingBottom(0)
+ , mbForbiddenRules(false)
+ , mbParagraphPunctation(false)
+ , mnBiDi(0)
{
bExtendedParameters = sal_False;
commit 91e15fc645bd5492b6fe52f01f5bda50552e0c92
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Nov 18 10:20:38 2013 +0000
surely we don't want ANY string anymore
presumably a simple blank string makes a whole lot more
sense in these langtag days
Change-Id: Ib50f7aed782f04d5d1c1f84617061ba2f66153bc
diff --git a/external/languagetool/UnpackedTarball_languagetool.mk
b/external/languagetool/UnpackedTarball_languagetool.mk
index 317be40..efca850 100644
--- a/external/languagetool/UnpackedTarball_languagetool.mk
+++ b/external/languagetool/UnpackedTarball_languagetool.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,languagetool,\
external/languagetool/JLanguageTool-1.4.0-no-hc.patch \
external/languagetool/MessageBox-apichange.patch \
external/languagetool/english.ireland.patch \
+ external/languagetool/esperanto.territory.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/languagetool/esperanto.territory.patch
b/external/languagetool/esperanto.territory.patch
new file mode 100644
index 0000000..6037adc
--- /dev/null
+++ b/external/languagetool/esperanto.territory.patch
@@ -0,0 +1,12 @@
+---
misc/build/JLanguageTool-1.7.0/src/java/org/languagetool/language/Esperanto.java.orig
2013-11-18 10:18:49.111712785 +0000
++++
misc/build/JLanguageTool-1.7.0/src/java/org/languagetool/language/Esperanto.java
2013-11-18 10:18:59.254813036 +0000
+@@ -71,8 +71,7 @@
+
+ @Override
+ public String[] getCountryVariants() {
+- /* return "ANY" country code as a "country-less" placeholder for OOo: */
+- return new String[] {"ANY"};
++ return new String[] {""};
+ }
+
+ @Override
commit b7069ad07dc651f5326cd3a671588d8c1ecf2534
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Nov 18 10:18:04 2013 +0000
Related: rhbz#1014990 valgrind reports uninitialized another variable
Change-Id: I77f082ea145b0f20daa93c3ee04067ecb6c3b108
diff --git a/vcl/source/filter/wmf/emfwr.cxx b/vcl/source/filter/wmf/emfwr.cxx
index b628cd8..d71bdd8 100644
--- a/vcl/source/filter/wmf/emfwr.cxx
+++ b/vcl/source/filter/wmf/emfwr.cxx
@@ -287,21 +287,18 @@ sal_Bool EMFWriter::WriteEMF( const GDIMetaFile& rMtf,
FilterConfigItem* pFilter
{
const sal_uLong nHeaderPos = m_rStm.Tell();
- mpHandlesUsed = new sal_Bool[ MAXHANDLES ];
- memset( mpHandlesUsed, 0, MAXHANDLES * sizeof( sal_Bool ) );
- mnHorTextAlign = mnHandleCount = mnLastPercent = mnRecordPos =
mnRecordCount = 0;
- mnRecordPlusPos = 0;
- mnLineHandle = mnFillHandle = mnTextHandle = HANDLE_INVALID;
- mbRecordOpen = sal_False;
- mbRecordPlusOpen = false;
-
-
maVDev.EnableOutput( sal_False );
maVDev.SetMapMode( rMtf.GetPrefMapMode() );
- mpFilterConfigItem = pFilterConfigItem;
-
// don't work with pixel as destination map mode -> higher resolution
preferrable
maDestMapMode.SetMapUnit( MAP_100TH_MM );
+ mpFilterConfigItem = pFilterConfigItem;
+ mpHandlesUsed = new sal_Bool[ MAXHANDLES ];
+ memset( mpHandlesUsed, 0, MAXHANDLES * sizeof( sal_Bool ) );
+ mnHandleCount = mnLastPercent = mnRecordCount = mnRecordPos =
mnRecordPlusPos = 0;
+ mbRecordOpen = mbRecordPlusOpen = false;
+ mbLineChanged = mbFillChanged = mbTextChanged = false;
+ mnLineHandle = mnFillHandle = mnTextHandle = HANDLE_INVALID;
+ mnHorTextAlign = 0;
const Size aMtfSizePix( maVDev.LogicToPixel( rMtf.GetPrefSize(),
rMtf.GetPrefMapMode() ) );
const Size aMtfSizeLog( maVDev.LogicToLogic( rMtf.GetPrefSize(),
rMtf.GetPrefMapMode(), MAP_100TH_MM ) );
commit 92424bdb2d05934d8f31910e175b0df9f5fe8c77
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Nov 18 10:17:24 2013 +0000
support en-IE as well
Change-Id: Ibf92c0044cdbea8c85a7a73258d883bd28d619e9
diff --git a/external/languagetool/UnpackedTarball_languagetool.mk
b/external/languagetool/UnpackedTarball_languagetool.mk
index 05f9e00..317be40 100644
--- a/external/languagetool/UnpackedTarball_languagetool.mk
+++ b/external/languagetool/UnpackedTarball_languagetool.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,languagetool,\
external/languagetool/JLanguageTool-1.7.0.patch \
external/languagetool/JLanguageTool-1.4.0-no-hc.patch \
external/languagetool/MessageBox-apichange.patch \
+ external/languagetool/english.ireland.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/languagetool/english.ireland.patch
b/external/languagetool/english.ireland.patch
new file mode 100644
index 0000000..2e47d32
--- /dev/null
+++ b/external/languagetool/english.ireland.patch
@@ -0,0 +1,11 @@
+---
misc/build/JLanguageTool-1.7.0/src/java/org/languagetool/language/English.java.orig
2013-11-18 09:41:10.625421948 +0000
++++
misc/build/JLanguageTool-1.7.0/src/java/org/languagetool/language/English.java
2013-11-18 09:41:25.736570684 +0000
+@@ -67,7 +67,7 @@
+
+ @Override
+ public final String[] getCountryVariants() {
+- return new String[]{"GB", "US", "AU", "CA", "NZ", "ZA"};
++ return new String[]{"GB", "US", "AU", "CA", "IE", "NZ", "ZA"};
+ }
+
+ @Override
commit f3660062ce8a2c65d483b83c2800d9b958d12f08
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Nov 15 17:06:21 2013 +0000
Related: rhbz#1014990 valgrind reports uninitialized variable
Change-Id: Ibaa2ed0ee2f1f3f00bceec91ccced968e4913e47
diff --git a/sd/source/filter/eppt/epptbase.hxx
b/sd/source/filter/eppt/epptbase.hxx
index e8c4066..f593b74 100644
--- a/sd/source/filter/eppt/epptbase.hxx
+++ b/sd/source/filter/eppt/epptbase.hxx
@@ -158,6 +158,7 @@ struct FontCollectionEntry
Scaling ( 1.0 ),
Family ( 0 ),
Pitch ( 0 ),
+ CharSet ( 0 ),
Original( rName )
{
ImplInit( rName );
commit 0ee16bf9c30c1ed98024f12bb1bea173d62a9eb8
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Nov 15 17:03:54 2013 +0000
sad little semi-colon dangling in space
Change-Id: I297fb09996c694b920b4ae56e6da2f7a009c9386
diff --git a/sd/source/filter/eppt/epptbase.hxx
b/sd/source/filter/eppt/epptbase.hxx
index 3860ce1..e8c4066 100644
--- a/sd/source/filter/eppt/epptbase.hxx
+++ b/sd/source/filter/eppt/epptbase.hxx
@@ -166,7 +166,7 @@ struct FontCollectionEntry
private :
- FontCollectionEntry() {};
+ FontCollectionEntry() {}
void ImplInit( const OUString& rName );
};
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
