[Libreoffice-commits] core.git: 6 commits - bin/count-todo-dialogs include/tools include/vcl rsc/inc rsc/source svtools/source tools/source vcl/source
Caolán McNamara
caolanm at redhat.com
Tue Aug 26 09:01:01 PDT 2014
bin/count-todo-dialogs | 33 ++++++++++++++++-----------------
include/tools/rcid.h | 2 --
include/vcl/dialog.hxx | 3 ---
include/vcl/fixedhyper.hxx | 1 -
rsc/inc/rscdb.hxx | 1 -
rsc/source/parser/rscicpx.cxx | 16 ----------------
rsc/source/parser/rscinit.cxx | 12 ------------
svtools/source/misc/sampletext.cxx | 2 +-
tools/source/rc/resmgr.cxx | 2 --
vcl/source/control/fixedhyper.cxx | 7 -------
vcl/source/font/PhysicalFontFamily.cxx | 2 +-
vcl/source/window/dialog.cxx | 19 -------------------
12 files changed, 18 insertions(+), 82 deletions(-)
New commits:
commit 69638beaba0dbb0a7bc6ad66bbf940325f34900b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 26 16:55:03 2014 +0100
Related: fdo#82259 possible solution to 'GB18030 Bitmap' detected as Japanese
Change-Id: Ibcf9c02c341aecc747b8b5a1ee347f7ded173e27
diff --git a/svtools/source/misc/sampletext.cxx b/svtools/source/misc/sampletext.cxx
index b099960..b7e416d 100644
--- a/svtools/source/misc/sampletext.cxx
+++ b/svtools/source/misc/sampletext.cxx
@@ -1164,7 +1164,7 @@ namespace
if (bKore && !bJpan && !bHans)
eScript = USCRIPT_KOREAN;
- else if (bJpan && !bKore && !bHant)
+ else if (bJpan && !bKore && !bHans)
eScript = USCRIPT_JAPANESE;
else if (bHant && !bHans && !bKore && !bJpan)
eScript = USCRIPT_TRADITIONAL_HAN;
commit 5282daadfec077a28a0a304d0488e06ae24555d3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 26 16:28:39 2014 +0100
my 'Cleanvertising ' font has a space at its end
Change-Id: I750f188b749c4c589adc15b60692559cb4e3010c
diff --git a/vcl/source/font/PhysicalFontFamily.cxx b/vcl/source/font/PhysicalFontFamily.cxx
index 6307ac0..fea492f 100644
--- a/vcl/source/font/PhysicalFontFamily.cxx
+++ b/vcl/source/font/PhysicalFontFamily.cxx
@@ -294,7 +294,7 @@ void PhysicalFontFamily::UpdateCloneFontList( PhysicalFontCollection& rFontColle
PhysicalFontFace* pClonedFace = pFace->Clone();
- assert( pClonedFace->GetFamilyName() == GetFamilyName() );
+ assert( pClonedFace->GetFamilyName().trim() == GetFamilyName().trim() );
assert( rFontCollection.FindOrCreateFamily( GetEnglishSearchFontName( pClonedFace->GetFamilyName() ) ) == pFamily );
if (! pFamily->AddFontFace( pClonedFace ) )
commit 046cd2c4d25854eb57d978cab9962b8d9b530b0d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 26 16:04:26 2014 +0100
FixedHyperlink no longer loaded from resource files
Change-Id: Ie2943e7b19d8d8d5bd2e3e5ccb466512af31cc24
diff --git a/include/vcl/fixedhyper.hxx b/include/vcl/fixedhyper.hxx
index 9ad244c..8181dbc 100644
--- a/include/vcl/fixedhyper.hxx
+++ b/include/vcl/fixedhyper.hxx
@@ -64,7 +64,6 @@ class VCL_DLLPUBLIC FixedHyperlink : public FixedText
With ResId or WinBits.
*/
- FixedHyperlink( Window* pParent, const ResId& rId );
FixedHyperlink( Window* pParent, WinBits nWinStyle = 0 );
/** dtor
diff --git a/vcl/source/control/fixedhyper.cxx b/vcl/source/control/fixedhyper.cxx
index 9762cda..ce16866 100644
--- a/vcl/source/control/fixedhyper.cxx
+++ b/vcl/source/control/fixedhyper.cxx
@@ -19,13 +19,6 @@
#include <vcl/fixedhyper.hxx>
-FixedHyperlink::FixedHyperlink(Window* pParent, const ResId& rResId)
- : FixedText(pParent, rResId)
- , m_nTextLen(0)
-{
- Initialize();
-}
-
FixedHyperlink::FixedHyperlink(Window* pParent, WinBits nWinStyle)
: FixedText(pParent, nWinStyle)
, m_nTextLen(0)
commit 52b871b833c66dc3cdffc9692c31fb77ed5afeb0
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 26 16:02:02 2014 +0100
track FloatingWindows in need of conversion
Change-Id: Idf4ef59721872165c51ebb2e728b4c6e3f3d90ec
diff --git a/bin/count-todo-dialogs b/bin/count-todo-dialogs
index 722e029..340fd56 100755
--- a/bin/count-todo-dialogs
+++ b/bin/count-todo-dialogs
@@ -13,28 +13,27 @@
converted=`ls */uiconfig/ui/*.ui */uiconfig/*/ui/*.ui|wc -l`
echo $converted .ui files currently exist
-dialogs=`git grep -h Dialog -- *.src|grep -v DialogControl|grep -v HelpID|grep -v define|grep -v String|grep -v QuickHelpText|grep -v "Text \[ en-US \]"|grep -v HelpId|grep -v "Cancel-Button"|grep -v \"Dialog\"|grep -v "Dialog Controls" |grep -v .uno:|grep -v "//"|grep -v "*/"|grep -v include|grep -v "paste region"|grep -v "Tabpage-Dialog"|sed -e 's/^ *//g' -e 's/ *$//g'|cut -d' ' -f2- |sort|uniq|wc -l`
-
-tabpages=`git grep -h TabPage -- *.src|grep -v DialogControl|grep -v HelpID|grep -v define|grep -v String|grep -v QuickHelpText|grep -v "Text \[ en-US \]"|grep -v HelpId|grep -v "Cancel-Button"|grep -v \"Dialog\"|grep -v "Dialog Controls" |grep -v .uno:|grep -v "//"|grep -v "*/"|grep -v include|grep -v "paste region"|grep -v "Tabpage-Dialog"|sed -e 's/^ *//g' -e 's/ *$//g'|cut -d' ' -f2- |sort|uniq|wc -l`
+dialogs=0
+tabpages=0
+errorboxes=0
+infoboxes=0
+queryboxes=0
+warningboxes=0
+msgboxes=0
+floatingwindows=`git grep -h FloatingWindow -- *.src|grep -v HelpID|cut -d' ' -f2- |sort|uniq|wc -l`
echo There are $dialogs unconverted dialogs
echo There are $tabpages unconverted tabpages
-
-num=$(($dialogs + $tabpages))
+echo There are $errorboxes unconverted errorboxes
+echo There are $infoboxes unconverted infoboxes
+echo There are $queryboxes unconverted queryboxes
+echo There are $warningboxes unconverted warningboxes
+echo There are $msgboxes unconverted msgboxes
+echo There are $floatingwindows unconverted floatingwindows
+
+num=$(($floatingwindows))
echo An estimated additional $num .ui are required
percent=$(($converted * 100 / ($num + $converted)))
echo We are $percent% of the way through the .ui conversion.
-errorboxes=`git grep -h ErrorBox -- *.src|cut -d' ' -f2- |sort|uniq|wc -l`
-infoboxes=`git grep -h InfoBox -- *.src|cut -d' ' -f2- |sort|uniq|wc -l`
-queryboxes=`git grep -h QueryBox -- *.src|cut -d' ' -f2- |sort|uniq|wc -l`
-warningboxes=`git grep -h WarningBox -- *.src|cut -d' ' -f2- |sort|uniq|wc -l`
-msgboxes=`git grep -h MessBox -- *.src|cut -d' ' -f2- |sort|uniq|wc -l`
-
-echo
-echo We need to reduce $errorboxes ErrorBox to basic strings as arguments to MessageDialog
-echo We need to reduce $infoboxes InfoBox to basic strings as arguments to MessageDialog
-echo We need to reduce $queryboxes QueryBox to basic strings as arguments to MessageDialog
-echo We need to reduce $warningboxes WarningBox to basic strings as arguments to MessageDialog
-echo We need to reduce $msgboxes MessBox to basic strings as arguments to MessageDialog
commit 6802dc06de83c665f63b5086f354a961f326c081
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 26 15:56:30 2014 +0100
Dialogs no longer loaded from resource files
Change-Id: I55295009f474dbac15be792049fa5c6c95c1ec07
diff --git a/include/tools/rcid.h b/include/tools/rcid.h
index aecaef4..5ac6a99 100644
--- a/include/tools/rcid.h
+++ b/include/tools/rcid.h
@@ -52,7 +52,6 @@
#define RSC_WORKWIN (RSC_NOTYPE + 0x37)
#define RSC_FLOATINGWINDOW (RSC_NOTYPE + 0x39)
-#define RSC_DIALOG (RSC_NOTYPE + 0x3a)
#define RSC_CONTROL (RSC_NOTYPE + 0x44)
#define RSC_BUTTON (RSC_NOTYPE + 0x45)
diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx
index 3e191da..361c860 100644
--- a/include/vcl/dialog.hxx
+++ b/include/vcl/dialog.hxx
@@ -70,8 +70,6 @@ private:
protected:
using Window::ImplInit;
SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle );
- SAL_DLLPRIVATE void ImplDialogRes( const ResId& rResId );
- SAL_DLLPRIVATE WinBits init(Window *pParent, const ResId& rResId);
SAL_DLLPRIVATE void setPosSizeOnContainee(Size aSize, VclContainer &rBox);
public:
diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx
index e5cd051..c8ebfbf 100644
--- a/rsc/source/parser/rscinit.cxx
+++ b/rsc/source/parser/rscinit.cxx
@@ -69,7 +69,6 @@ void RscTypCont::Init()
RscTop * pClassWindow;
RscTop * pClassSystemWindow;
RscTop * pClassWorkWindow;
- RscTop * pClassDialog;
RscTop * pClassControl;
RscTop * pClassButton;
RscTop * pClassCheckBox;
@@ -348,12 +347,6 @@ void RscTypCont::Init()
pClassWorkWindow = InitClassWorkWindow( pClassSystemWindow );
pRoot->Insert( pClassWorkWindow );
-
- // Klasse anlegen
- pClassDialog = new RscClass( pHS->getID( "Dialog" ),
- RSC_DIALOG, pClassSystemWindow );
- pClassDialog->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
- aBaseLst.push_back( pClassDialog );
}
{
pClassControl = InitClassControl( pClassWindow );
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index cb6ae13..f8afa9f 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -521,23 +521,11 @@ Dialog::Dialog( Window* pParent, WinBits nStyle )
ImplInit( pParent, nStyle );
}
-WinBits Dialog::init(Window *pParent, const ResId& rResId)
-{
- WinBits nStyle = ImplInitRes( rResId );
-
- ImplInit( pParent, nStyle );
- ImplLoadRes( rResId );
-
- return nStyle;
-}
-
-
void Dialog::set_action_area(VclButtonBox* pActionArea)
{
mpActionArea = pActionArea;
}
-
void Dialog::set_content_area(VclBox* pContentArea)
{
mpContentArea = pContentArea;
commit ca68971f0af83f1db52e8e06981d30a509926541
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 26 15:42:18 2014 +0100
ModalDialogs no longer loaded from resource files
Change-Id: I2d208c7cc5ff9bf26bff5ab2aa40e0bf57373342
diff --git a/include/tools/rcid.h b/include/tools/rcid.h
index 04ae924..aecaef4 100644
--- a/include/tools/rcid.h
+++ b/include/tools/rcid.h
@@ -54,7 +54,6 @@
#define RSC_FLOATINGWINDOW (RSC_NOTYPE + 0x39)
#define RSC_DIALOG (RSC_NOTYPE + 0x3a)
-#define RSC_MODALDIALOG (RSC_NOTYPE + 0x3c)
#define RSC_CONTROL (RSC_NOTYPE + 0x44)
#define RSC_BUTTON (RSC_NOTYPE + 0x45)
#define RSC_PUSHBUTTON (RSC_NOTYPE + 0x46)
diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx
index 2b653f8..3e191da 100644
--- a/include/vcl/dialog.hxx
+++ b/include/vcl/dialog.hxx
@@ -161,7 +161,6 @@ class VCL_DLLPUBLIC ModalDialog : public Dialog
public:
explicit ModalDialog( Window* pParent, WinBits nStyle = WB_STDMODAL );
explicit ModalDialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription );
- explicit ModalDialog( Window* pParent, const ResId& rResId );
protected:
using Window::Show;
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index f5dac31..456c82d 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -170,7 +170,6 @@ class RscTypCont
RscArray * pLangGeo );
RscTop * InitClassSystemWindow( RscTop * pSuper );
RscTop * InitClassWorkWindow( RscTop * pSuper );
- RscTop * InitClassModalDialog( RscTop * pSuper );
RscTop * InitClassControl( RscTop * pSuper );
RscTop * InitClassCheckBox( RscTop * pSuper );
RscTop * InitClassPushButton( RscTop * pSuper );
diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx
index 25dec34..8b79d82 100644
--- a/rsc/source/parser/rscicpx.cxx
+++ b/rsc/source/parser/rscicpx.cxx
@@ -357,22 +357,6 @@ RscTop * RscTypCont::InitClassWorkWindow( RscTop * pSuper )
return pClassWorkWindow;
}
-RscTop * RscTypCont::InitClassModalDialog( RscTop * pSuper )
-{
- Atom nId;
- RscTop * pClassDialog;
-
- // Klasse anlegen
- nId = pHS->getID( "ModalDialog" );
- pClassDialog = new RscClass( nId, RSC_MODALDIALOG, pSuper );
- pClassDialog->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
- aNmTb.Put( nId, CLASSNAME, pClassDialog );
-
- InsWinBit( pClassDialog, "SysModal", nSysmodalId );
-
- return pClassDialog;
-}
-
RscTop * RscTypCont::InitClassControl( RscTop * pSuper )
{
Atom nId;
diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx
index 22c79ae..e5cd051 100644
--- a/rsc/source/parser/rscinit.cxx
+++ b/rsc/source/parser/rscinit.cxx
@@ -70,7 +70,6 @@ void RscTypCont::Init()
RscTop * pClassSystemWindow;
RscTop * pClassWorkWindow;
RscTop * pClassDialog;
- RscTop * pClassModalDialog;
RscTop * pClassControl;
RscTop * pClassButton;
RscTop * pClassCheckBox;
@@ -355,10 +354,6 @@ void RscTypCont::Init()
RSC_DIALOG, pClassSystemWindow );
pClassDialog->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
aBaseLst.push_back( pClassDialog );
-
- // Klasse anlegen
- pClassModalDialog = InitClassModalDialog( pClassDialog );
- pRoot->Insert( pClassModalDialog );
}
{
pClassControl = InitClassControl( pClassWindow );
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index 13f8423..73194cf 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -1461,7 +1461,6 @@ OString ResMgr::GetAutoHelpId()
case RSC_DOCKINGWINDOW: aHID.append( "DockingWindow" ); break;
case RSC_WORKWIN: aHID.append( "WorkWindow" ); break;
case RSC_FLOATINGWINDOW: aHID.append( "FloatingWindow" ); break;
- case RSC_MODALDIALOG: aHID.append( "ModalDialog" ); break;
default: return OString();
}
}
@@ -1473,7 +1472,6 @@ OString ResMgr::GetAutoHelpId()
case RSC_DOCKINGWINDOW:
case RSC_WORKWIN:
case RSC_FLOATINGWINDOW:
- case RSC_MODALDIALOG:
// intentionally no breaks!
// auto help ids for controls
switch( pRC->pResource->GetRT() ) {
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 4909b95..cb6ae13 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -1291,13 +1291,6 @@ ModalDialog::ModalDialog( Window* pParent, WinBits nStyle ) :
ImplInit( pParent, nStyle );
}
-ModalDialog::ModalDialog( Window* pParent, const ResId& rResId ) :
- Dialog( WINDOW_MODALDIALOG )
-{
- rResId.SetRT( RSC_MODALDIALOG );
- init( pParent, rResId );
-}
-
ModalDialog::ModalDialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ) :
Dialog(pParent, rID, rUIXMLDescription, WINDOW_MODALDIALOG)
{
More information about the Libreoffice-commits
mailing list