[Libreoffice-commits] core.git: 2 commits - libxmlsec/ExternalProject_xmlsec.mk libxmlsec/xmlsec1-configure.patch sw/AllLangResTarget_sw.mk sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk vcl/inc vcl/source
Caolán McNamara
caolanm at redhat.com
Sat Apr 27 12:59:00 PDT 2013
libxmlsec/ExternalProject_xmlsec.mk | 1
libxmlsec/xmlsec1-configure.patch | 49 ++++---
sw/AllLangResTarget_sw.mk | 1
sw/UIConfig_swriter.mk | 1
sw/inc/fldui.hrc | 2
sw/inc/helpid.h | 1
sw/inc/swabstdlg.hxx | 5
sw/source/ui/dialog/swdlgfact.cxx | 19 ---
sw/source/ui/dialog/swdlgfact.hxx | 5
sw/source/ui/fldui/inpdlg.cxx | 65 +++-------
sw/source/ui/fldui/inpdlg.hrc | 28 ----
sw/source/ui/fldui/inpdlg.src | 95 ---------------
sw/source/ui/inc/inpdlg.hxx | 24 +--
sw/source/ui/wrtsh/wrtsh2.cxx | 3
sw/uiconfig/swriter/ui/inputfielddialog.ui | 178 +++++++++++++++++++++++++++++
vcl/inc/svids.hrc | 1
vcl/source/src/btntext.src | 5
vcl/source/window/builder.cxx | 2
18 files changed, 260 insertions(+), 225 deletions(-)
New commits:
commit b3c1497867740e61deb3ceb38fa4cf9ac4b44f06
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Apr 27 19:05:17 2013 +0100
convert input field dialog to .ui format
Change-Id: I1c6c43b73b22120b2f2985256896af214012f0ad
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index 451a743..8a53f1a 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -117,7 +117,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
sw/source/ui/fldui/fldtdlg.src \
sw/source/ui/fldui/fldui.src \
sw/source/ui/fldui/fldvar.src \
- sw/source/ui/fldui/inpdlg.src \
sw/source/ui/fmtui/tmpdlg.src \
sw/source/ui/frmdlg/frmpage.src \
sw/source/ui/frmdlg/frmui.src \
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 2486c93..bfee0da 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -80,6 +80,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/footnotepage \
sw/uiconfig/swriter/ui/footnoteareapage \
sw/uiconfig/swriter/ui/indexentry \
+ sw/uiconfig/swriter/ui/inputfielddialog \
sw/uiconfig/swriter/ui/insertbookmark \
sw/uiconfig/swriter/ui/insertbreak \
sw/uiconfig/swriter/ui/insertcaption \
diff --git a/sw/inc/fldui.hrc b/sw/inc/fldui.hrc
index 099b5d0..655bf2e 100644
--- a/sw/inc/fldui.hrc
+++ b/sw/inc/fldui.hrc
@@ -21,8 +21,6 @@
#include "rcid.hrc"
-#define DLG_FLD_INPUT (RC_FLDDLG_BEGIN + 5)
-
#define DLG_FLD_INSERT (RC_FLDDLG_BEGIN + 11)
#define DLG_FLD_DROPDOWN (RC_FLDDLG_BEGIN + 12)
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 4a3473c..4fca677 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -21,7 +21,6 @@
#include <sfx2/sfxcommands.h>
#define HID_MERGE_PRINTMONITOR "SW_HID_MERGE_PRINTMONITOR"
-#define HID_FLD_INPUT "SW_HID_FLD_INPUT"
#define HID_DOCINFO_EDT "SW_HID_DOCINFO_EDT"
#define HID_PASSWD "SW_HID_PASSWD"
#define HID_CONFIG_SAVE "SW_HID_CONFIG_SAVE"
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index 19cb943..8a4c45e 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -410,9 +410,8 @@ public:
virtual AbstractGlossaryDlg* CreateGlossaryDlg(SfxViewFrame* pViewFrame,
SwGlossaryHdl* pGlosHdl,
SwWrtShell *pWrtShell) = 0; //add for SwGlossaryDlg
- virtual AbstractFldInputDlg* CreateFldInputDlg( int nResId,
- Window *pParent, SwWrtShell &rSh,
- SwField* pField, sal_Bool bNextButton = sal_False ) = 0; //add for SwFldInputDlg
+ virtual AbstractFldInputDlg* CreateFldInputDlg(Window *pParent,
+ SwWrtShell &rSh, SwField* pField, bool bNextButton = false) = 0; //add for SwFldInputDlg
virtual AbstractInsFootNoteDlg* CreateInsFootNoteDlg(Window * pParent,
SwWrtShell &rSh, sal_Bool bEd = sal_False) = 0; //add for SwInsFootNoteDlg
virtual VclAbstractDialog* CreateTitlePageDlg ( Window * pParent ) = 0;
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index fb7a53c..3fc1ef0 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -1069,22 +1069,11 @@ AbstractGlossaryDlg* SwAbstractDialogFactory_Impl::CreateGlossaryDlg(SfxViewFram
return new AbstractGlossaryDlg_Impl( pDlg );
}
-AbstractFldInputDlg* SwAbstractDialogFactory_Impl::CreateFldInputDlg( int nResId,
- Window *pParent, SwWrtShell &rSh,
- SwField* pField, sal_Bool bNextButton ) //add for SwFldInputDlg
+AbstractFldInputDlg* SwAbstractDialogFactory_Impl::CreateFldInputDlg(Window *pParent,
+ SwWrtShell &rSh, SwField* pField, bool bNextButton) //add for SwFldInputDlg
{
- SwFldInputDlg* pDlg=NULL;
- switch ( nResId )
- {
- case DLG_FLD_INPUT :
- pDlg = new SwFldInputDlg( pParent, rSh, pField, bNextButton );
- break;
- default:
- break;
- }
- if ( pDlg )
- return new AbstractFldInputDlg_Impl( pDlg );
- return 0;
+ SwFldInputDlg* pDlg = new SwFldInputDlg( pParent, rSh, pField, bNextButton );
+ return new AbstractFldInputDlg_Impl( pDlg );
}
AbstractInsFootNoteDlg* SwAbstractDialogFactory_Impl::CreateInsFootNoteDlg(
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index 9b68100..cf74c83 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -509,9 +509,8 @@ public:
virtual AbstractGlossaryDlg* CreateGlossaryDlg(SfxViewFrame* pViewFrame,
SwGlossaryHdl* pGlosHdl,
SwWrtShell *pWrtShell); //add for SwGlossaryDlg
- virtual AbstractFldInputDlg* CreateFldInputDlg( int nResId,
- Window *pParent, SwWrtShell &rSh,
- SwField* pField, sal_Bool bNextButton = sal_False ); //add for SwFldInputDlg
+ virtual AbstractFldInputDlg* CreateFldInputDlg(Window *pParent,
+ SwWrtShell &rSh, SwField* pField, bool bNextButton = false); //add for SwFldInputDlg
virtual AbstractInsFootNoteDlg* CreateInsFootNoteDlg(
Window * pParent, SwWrtShell &rSh, sal_Bool bEd = sal_False); //add for SwInsFootNoteDlg
virtual VclAbstractDialog * CreateTitlePageDlg ( Window * pParent );
diff --git a/sw/source/ui/fldui/inpdlg.cxx b/sw/source/ui/fldui/inpdlg.cxx
index 1b4dbe0..c6e6340 100644
--- a/sw/source/ui/fldui/inpdlg.cxx
+++ b/sw/source/ui/fldui/inpdlg.cxx
@@ -29,48 +29,34 @@
#include <fldmgr.hxx>
#include <fldui.hrc>
-#include <inpdlg.hrc>
-
/*--------------------------------------------------------------------
Description: edit field-insert
--------------------------------------------------------------------*/
SwFldInputDlg::SwFldInputDlg( Window *pParent, SwWrtShell &rS,
- SwField* pField, sal_Bool bNextButton ) :
-
- SvxStandardDialog(pParent, SW_RES(DLG_FLD_INPUT)),
-
- rSh( rS ),
- pInpFld(0),
- pSetFld(0),
- pUsrType(0),
-
- aLabelED (this, SW_RES(ED_LABEL )),
- aEditED (this, SW_RES(ED_EDIT )),
- aEditFL (this, SW_RES(FL_EDIT )),
-
- aOKBT (this, SW_RES(BT_OK )),
- aCancelBT (this, SW_RES(BT_CANCEL )),
- aNextBT (this, SW_RES(PB_NEXT )),
- aHelpBT (this, SW_RES(PB_HELP ))
+ SwField* pField, sal_Bool bNextButton )
+ : SvxStandardDialog( pParent, "InputFieldDialog",
+ "modules/swriter/ui/inputfielddialog.ui")
+ , rSh( rS )
+ , pInpFld(0)
+ , pSetFld(0)
+ , pUsrType(0)
{
+ get(m_pLabelED, "name");
+ get(m_pEditED, "text");
+ m_pEditED->set_height_request(m_pEditED->GetTextHeight() * 9);
+ get(m_pNextBT, "next");
+ get(m_pOKBT, "ok");
// switch font for Edit
- Font aFont(aEditED.GetFont());
+ Font aFont(m_pEditED->GetFont());
aFont.SetWeight(WEIGHT_LIGHT);
- aEditED.SetFont(aFont);
+ m_pEditED->SetFont(aFont);
if( bNextButton )
{
- aNextBT.Show();
- aNextBT.SetClickHdl(LINK(this, SwFldInputDlg, NextHdl));
- }
- else
- {
- long nDiff = aCancelBT.GetPosPixel().Y() - aOKBT.GetPosPixel().Y();
- Point aPos = aHelpBT.GetPosPixel();
- aPos.Y() -= nDiff;
- aHelpBT.SetPosPixel(aPos);
+ m_pNextBT->Show();
+ m_pNextBT->SetClickHdl(LINK(this, SwFldInputDlg, NextHdl));
}
// evaluation here
@@ -79,7 +65,7 @@ SwFldInputDlg::SwFldInputDlg( Window *pParent, SwWrtShell &rS,
{ // it is an input field
//
pInpFld = (SwInputField*)pField;
- aLabelED.SetText( pInpFld->GetPar2() );
+ m_pLabelED->SetText( pInpFld->GetPar2() );
sal_uInt16 nSubType = pInpFld->GetSubType();
switch(nSubType & 0xff)
@@ -109,29 +95,24 @@ SwFldInputDlg::SwFldInputDlg( Window *pParent, SwWrtShell &rS,
}
else
aStr = sFormula;
- aLabelED.SetText( pSetFld->GetPromptText() );
+ m_pLabelED->SetText( pSetFld->GetPromptText() );
}
// JP 31.3.00: Inputfields in readonly regions must be allowed to
// input any content. - 74639
sal_Bool bEnable = !rSh.IsCrsrReadonly();
- aOKBT.Enable( bEnable );
- aEditED.SetReadOnly( !bEnable );
+ m_pOKBT->Enable( bEnable );
+ m_pEditED->SetReadOnly( !bEnable );
if( aStr.Len() )
- aEditED.SetText(convertLineEnd(aStr, GetSystemLineEnd()));
- FreeResource();
-}
-
-SwFldInputDlg::~SwFldInputDlg()
-{
+ m_pEditED->SetText(convertLineEnd(aStr, GetSystemLineEnd()));
}
void SwFldInputDlg::StateChanged( StateChangedType nType )
{
if ( nType == STATE_CHANGE_INITSHOW )
- aEditED.GrabFocus();
+ m_pEditED->GrabFocus();
SvxStandardDialog::StateChanged( nType );
}
@@ -141,7 +122,7 @@ void SwFldInputDlg::StateChanged( StateChangedType nType )
void SwFldInputDlg::Apply()
{
- OUString aTmp(comphelper::string::remove(aEditED.GetText(), '\r'));
+ OUString aTmp(comphelper::string::remove(m_pEditED->GetText(), '\r'));
rSh.StartAllAction();
bool bModified = false;
diff --git a/sw/source/ui/fldui/inpdlg.hrc b/sw/source/ui/fldui/inpdlg.hrc
deleted file mode 100644
index c5e52c9..0000000
--- a/sw/source/ui/fldui/inpdlg.hrc
+++ /dev/null
@@ -1,28 +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 .
- */
-#define FT_LABEL 1
-#define ED_EDIT 3
-#define FL_EDIT 4
-#define BT_OK 5
-#define BT_CANCEL 6
-#define ED_LABEL 7
-#define PB_NEXT 8
-#define PB_HELP 9
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/fldui/inpdlg.src b/sw/source/ui/fldui/inpdlg.src
deleted file mode 100644
index 4a816c0..0000000
--- a/sw/source/ui/fldui/inpdlg.src
+++ /dev/null
@@ -1,95 +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 "fldui.hrc"
-#include "inpdlg.hrc"
-#include "helpid.h"
-ModalDialog DLG_FLD_INPUT
-{
- HelpID = HID_FLD_INPUT ;
- OutputSize = TRUE ;
- Hide = TRUE ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( 194 , 119 ) ;
- Text [ en-US ] = "Input Field" ;
- Moveable = TRUE ;
- /* FixedText FT_LABEL
- {
- Pos = MAP_APPFONT ( 12 , 14 ) ;
- Size = MAP_APPFONT ( 115 , 8 ) ;
- Text [ en-US ] = "Input" ;
- Left = TRUE ;
- };*/
- Edit ED_LABEL
- {
- HelpID = "sw:Edit:DLG_FLD_INPUT:ED_LABEL";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 12 , 14 ) ;
- Size = MAP_APPFONT ( 115 , 12 ) ;
- TabStop = TRUE ;
- Left = TRUE ;
- Text [ en-US ] = "Input" ;
- Readonly = TRUE ;
- };
- MultiLineEdit ED_EDIT
- {
- HelpID = "sw:MultiLineEdit:DLG_FLD_INPUT:ED_EDIT";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 12 , 32 ) ;
- Size = MAP_APPFONT ( 115 , 72 ) ;
- TabStop = TRUE ;
- Left = TRUE ;
- };
- FixedLine FL_EDIT
- {
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 127 , 8 ) ;
- Text [ en-US ] = "Edit" ;
- };
- OKButton BT_OK
- {
- Pos = MAP_APPFONT ( 139 , 6 ) ;
- Size = MAP_APPFONT ( 50 , 15 ) ;
- TabStop = TRUE ;
- DefButton = TRUE ;
- };
- CancelButton BT_CANCEL
- {
- Pos = MAP_APPFONT ( 139 , 23 ) ;
- Size = MAP_APPFONT ( 50 , 15 ) ;
- TabStop = TRUE ;
- };
- PushButton PB_NEXT
- {
- HelpID = "sw:PushButton:DLG_FLD_INPUT:PB_NEXT";
- Pos = MAP_APPFONT ( 139 , 40 ) ;
- Size = MAP_APPFONT ( 50 , 15 ) ;
- TabStop = TRUE ;
- Hide = TRUE ;
- Text [ en-US ] = "~Next" ;
- };
- HelpButton PB_HELP
- {
- Pos = MAP_APPFONT ( 139 , 60 ) ;
- Size = MAP_APPFONT ( 50 , 15 ) ;
- TabStop = TRUE ;
- };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/inc/inpdlg.hxx b/sw/source/ui/inc/inpdlg.hxx
index 7fd995c..09ec01c 100644
--- a/sw/source/ui/inc/inpdlg.hxx
+++ b/sw/source/ui/inc/inpdlg.hxx
@@ -21,9 +21,9 @@
#include <svx/stddlg.hxx>
-#include <svtools/svmedit.hxx>
-#include <vcl/fixed.hxx>
#include <vcl/button.hxx>
+#include <vcl/fixed.hxx>
+#include <vcl/vclmedit.hxx>
class SwInputField;
class SwSetExpField;
@@ -40,26 +40,22 @@ class SwFldInputDlg: public SvxStandardDialog
virtual void Apply();
virtual void StateChanged( StateChangedType );
- SwWrtShell &rSh;
- SwInputField* pInpFld;
- SwSetExpField* pSetFld;
- SwUserFieldType* pUsrType;
+ SwWrtShell& rSh;
+ SwInputField* pInpFld;
+ SwSetExpField* pSetFld;
+ SwUserFieldType* pUsrType;
- Edit aLabelED;
+ Edit* m_pLabelED;
- MultiLineEdit aEditED;
- FixedLine aEditFL;
+ VclMultiLineEdit* m_pEditED;
- OKButton aOKBT;
- CancelButton aCancelBT;
- PushButton aNextBT;
- HelpButton aHelpBT;
+ OKButton* m_pOKBT;
+ PushButton* m_pNextBT;
DECL_LINK(NextHdl, void *);
public:
SwFldInputDlg( Window *pParent, SwWrtShell &rSh,
SwField* pField, sal_Bool bNextButton = sal_False );
- ~SwFldInputDlg();
};
diff --git a/sw/source/ui/wrtsh/wrtsh2.cxx b/sw/source/ui/wrtsh/wrtsh2.cxx
index 9aa908f..0b63e13 100644
--- a/sw/source/ui/wrtsh/wrtsh2.cxx
+++ b/sw/source/ui/wrtsh/wrtsh2.cxx
@@ -142,8 +142,7 @@ sal_Bool SwWrtShell::StartInputFldDlg( SwField* pFld, sal_Bool bNextButton,
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialogdiet fail!");
- AbstractFldInputDlg* pDlg = pFact->CreateFldInputDlg( DLG_FLD_INPUT,
- pParentWin, *this, pFld, bNextButton);
+ AbstractFldInputDlg* pDlg = pFact->CreateFldInputDlg(pParentWin, *this, pFld, bNextButton);
OSL_ENSURE(pDlg, "Dialogdiet fail!");
if(pWindowState && !pWindowState->isEmpty())
pDlg->SetWindowState(*pWindowState);
diff --git a/sw/uiconfig/swriter/ui/inputfielddialog.ui b/sw/uiconfig/swriter/ui/inputfielddialog.ui
new file mode 100644
index 0000000..a60c272
--- /dev/null
+++ b/sw/uiconfig/swriter/ui/inputfielddialog.ui
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkDialog" id="InputFieldDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">Input Field</property>
+ <property name="type_hint">dialog</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox1">
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="layout_style">start</property>
+ <child>
+ <object class="GtkButton" id="ok">
+ <property name="label">gtk-ok</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_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="cancel">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="next">
+ <property name="label">gtk-media-next</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="no_show_all">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="help">
+ <property name="label">gtk-help</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</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="GtkFrame" id="frame1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkEntry" id="name">
+ <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="hexpand">True</property>
+ <property name="editable">False</property>
+ <property name="invisible_char">â—</property>
+ <property name="width_chars">32</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTextView" id="text">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Edit</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="0">ok</action-widget>
+ <action-widget response="0">cancel</action-widget>
+ <action-widget response="0">next</action-widget>
+ <action-widget response="0">help</action-widget>
+ </action-widgets>
+ </object>
+</interface>
diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc
index ff6fb4e..f6433d7 100644
--- a/vcl/inc/svids.hrc
+++ b/vcl/inc/svids.hrc
@@ -162,6 +162,7 @@
#define SV_BUTTONTEXT_CANCEL_NOMNEMONIC 10120
#define SV_BUTTONTEXT_UNDO 10121
#define SV_BUTTONTEXT_PASTE 10122
+#define SV_BUTTONTEXT_NEXT 10123
#define SV_STDTEXT_FIRST SV_STDTEXT_SERVICENOTAVAILABLE
#define SV_STDTEXT_SERVICENOTAVAILABLE 10210
diff --git a/vcl/source/src/btntext.src b/vcl/source/src/btntext.src
index 86d6612..3340fdd 100644
--- a/vcl/source/src/btntext.src
+++ b/vcl/source/src/btntext.src
@@ -136,4 +136,9 @@ String SV_BUTTONTEXT_PASTE
Text [ en-US ] = "~Paste" ;
};
+String SV_BUTTONTEXT_NEXT
+{
+ Text [ en-US ] = "~Next" ;
+};
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 7a79190..0833a35 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -582,6 +582,8 @@ namespace
return (VclResId(SV_BUTTONTEXT_UNDO).toString());
else if (rType == "gtk-paste")
return (VclResId(SV_BUTTONTEXT_PASTE).toString());
+ else if (rType == "gtk-media-next")
+ return (VclResId(SV_BUTTONTEXT_NEXT).toString());
SAL_WARN("vcl.layout", "unknown stock type: " << rType.getStr());
return OUString();
}
commit 84cc07d24b7ceb8ba1f711918baa553dcfadb35f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Apr 27 10:15:54 2013 +0100
for internal xml2 make libxmlsec use that, not the system one
Change-Id: I971616f3741d5d4f2c30624e28d6a3ae45e9e5c8
diff --git a/libxmlsec/ExternalProject_xmlsec.mk b/libxmlsec/ExternalProject_xmlsec.mk
index 14925d0..cefa967 100644
--- a/libxmlsec/ExternalProject_xmlsec.mk
+++ b/libxmlsec/ExternalProject_xmlsec.mk
@@ -59,6 +59,7 @@ $(call gb_ExternalProject_get_state_target,xmlsec,build) :
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
$(if $(filter NO,$(SYSTEM_NSS))$(filter MACOSX,$(OS)),--disable-pkgconfig) \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+ $(if $(filter NO,$(SYSTEM_LIBXML)),LIBXML_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,xml2)/include" LIBXML_LIBS="-L$(gb_Helper_OUTDIRLIBDIR) -lxml2")\
$(if $(SYSBASE),CFLAGS="-I$(SYSBASE)/usr/include" \
LDFLAGS="-L$(SYSBASE)/usr/lib $(if $(filter-out LINUX FREEBSD,$(OS)),,-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib)) \
&& $(MAKE) \
diff --git a/libxmlsec/xmlsec1-configure.patch b/libxmlsec/xmlsec1-configure.patch
index 2db0426..1f6b718 100644
--- a/libxmlsec/xmlsec1-configure.patch
+++ b/libxmlsec/xmlsec1-configure.patch
@@ -28,22 +28,35 @@
pkgconfig_DATA = xmlsec1.pc @XMLSEC_CRYPTO_PC_FILES_LIST@
--- misc/xmlsec1-1.2.14/configure.in 2009-06-25 22:53:18.000000000 +0200
+++ misc/build/xmlsec1-1.2.14/configure.in 2009-10-01 10:28:50.990755126 +0200
-@@ -190,8 +190,14 @@
+@@ -192,8 +192,8 @@
dnl ==========================================================================
- dnl find libxml
- dnl ==========================================================================
--LIBXML_MIN_VERSION="2.7.4"
+ LIBXML_MIN_VERSION="2.7.4"
LIBXML_CONFIG="xml2-config"
-+if test -f "$SOLARVERSION/$INPATH/bin$UPDMINOREXT/xml2-config" ; then
-+ LIBXML_CONFIG="$SOLARVERSION/$INPATH/bin$UPDMINOREXT/xml2-config"
-+elif test -n "$MINGW_SYSROOT" -a -x "$MINGW_SYSROOT/bin/xml2-config" ; then
-+ LIBXML_CONFIG="$MINGW_SYSROOT/bin/xml2-config"
-+else
-+ LIBXML_CONFIG="xml2-config"
-+fi
- LIBXML_CFLAGS=""
- LIBXML_LIBS=""
+-LIBXML_CFLAGS=""
+-LIBXML_LIBS=""
++LIBXML_CFLAGS="$LIBXML_CFLAGS"
++LIBXML_LIBS="$LIBXML_LIBS"
LIBXML_FOUND="no"
+ AC_ARG_WITH(libxml,
+ [ --with-libxml=[PFX] libxml2 location]
+@@ -202,6 +202,8 @@
+ [ --with-libxml-src=[PFX] not installed yet libxml2 location]
+ )
+
++if test "z$LIBXML_CFLAGS" = "z" -o "z$LIBXML_LIBS" = "z"; then
++
+ if test "z$with_libxml" = "zno" -o "z$with_libxml_src" = "zno"; then
+ AC_MSG_CHECKING(for libxml2 libraries >= $LIBXML_MIN_VERSION)
+ AC_MSG_ERROR(libxml2 >= $LIBXML_MIN_VERSION is required for $XMLSEC_PACKAGE)
+@@ -245,6 +247,8 @@
+ fi
+ fi
+
++fi
++
+ AC_SUBST(LIBXML_CFLAGS)
+ AC_SUBST(LIBXML_LIBS)
+ AC_SUBST(LIBXML_CONFIG)
@@ -555,12 +559,26 @@
XMLSEC_NO_NSS="1"
@@ -90,7 +103,7 @@
PKG_CHECK_MODULES(NSS, mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION,
[NSS_FOUND=yes NSPR_PACKAGE=mozilla-nspr NSS_PACKAGE=mozilla-nss],
[NSS_FOUND=no])
-@@ -612,8 +635,8 @@
+@@ -612,8 +640,8 @@
ac_mozilla_name=mozilla-$MOZILLA_MIN_VERSION
fi
@@ -101,7 +114,7 @@
AC_MSG_CHECKING(for nspr libraries >= $NSPR_MIN_VERSION)
NSPR_INCLUDES_FOUND="no"
-@@ -637,15 +660,15 @@
+@@ -634,21 +662,21 @@
NSPR_PRINIT_H="$with_nspr/include/prinit.h"
else
for dir in $ac_nss_inc_dir ; do
@@ -120,8 +133,6 @@
break
fi
done
-@@ -648,7 +671,7 @@
- done
for dir in $ac_nss_lib_dir ; do
- if test -f $dir/libnspr4$shrext ; then
@@ -129,7 +140,7 @@
dnl do not add -L/usr/lib because compiler does it anyway
if test "z$dir" = "z/usr/lib" ; then
NSPR_LIBS="$NSPR_LIBS_LIST"
-@@ -719,7 +742,7 @@
+@@ -719,7 +747,7 @@
done
for dir in $ac_nss_lib_dir ; do
@@ -138,7 +149,7 @@
dnl do not add -L/usr/lib because compiler does it anyway
if test "z$dir" = "z/usr/lib" ; then
NSS_LIBS="$NSS_LIBS_LIST"
-@@ -738,7 +761,7 @@
+@@ -738,7 +766,7 @@
if test "z$NSS_INCLUDES_FOUND" = "zyes" -a "z$NSS_LIBS_FOUND" = "zyes" ; then
OLD_CPPFLAGS=$CPPFLAGS
More information about the Libreoffice-commits
mailing list