sw/AllLangResTarget_sw.mk | 1
sw/inc/chrdlg.hrc | 1
sw/source/ui/chrdlg/chardlg.src | 46 ----------------------------------------
sw/source/ui/envelp/envfmt.cxx | 2 -
4 files changed, 1 insertion(+), 49 deletions(-)
New commits:
commit 817b0cfde4b9f6d36d4b14916c3a3adb12581448
Author: Zolnai Tamás <zolnaitamas2...@gmail.com>
Date: Fri Jun 21 20:10:31 2013 +0200
Remove obsolete draw character tab dialog resource
See also:
70467371485ada5a30b88968607b93dd62b3383c
This commit convert the resource based GUI to the new
widget (using *.ui) Before this commit were two type
of character dialog (DLG_CHAR, DLG_DRAWCHAR (chrdlg.hrc))
but only the DLG_CHAR was used (swdlgfact.cxx)) and
maybe thats the reason why this code remained.
Note: the character dialog in Draw is the same as in Writer
that's the reason this resource is unused.
Change-Id: I8e6a9f3faf3936a48fe343a4fdd03bb902baa6e2
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index ceeb41b..0d5f707 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -68,7 +68,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
sw/source/ui/app/error.src \
sw/source/ui/app/mn.src \
sw/source/ui/chrdlg/ccoll.src \
- sw/source/ui/chrdlg/chardlg.src \
sw/source/ui/chrdlg/chrdlg.src \
sw/source/ui/chrdlg/drpcps.src \
sw/source/ui/chrdlg/paradlg.src \
diff --git a/sw/inc/chrdlg.hrc b/sw/inc/chrdlg.hrc
index 2100675..c9c5c36 100644
--- a/sw/inc/chrdlg.hrc
+++ b/sw/inc/chrdlg.hrc
@@ -24,7 +24,6 @@
#define DLG_PARA (RC_CHRDLG_BEGIN + 2)
#define DLG_DROPCAPS (RC_CHRDLG_BEGIN + 8)
-#define DLG_DRAWCHAR (RC_CHRDLG_BEGIN + 9)
#define DLG_DRAWPARA (RC_CHRDLG_BEGIN + 10)
// Tabpages -> now in globals.hrc
diff --git a/sw/source/ui/chrdlg/chardlg.src b/sw/source/ui/chrdlg/chardlg.src
deleted file mode 100644
index bdad1b2..0000000
--- a/sw/source/ui/chrdlg/chardlg.src
+++ /dev/null
@@ -1,46 +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 "globals.hrc"
-#include "chrdlg.hrc"
-#include "helpid.h"
-
-TabDialog DLG_DRAWCHAR
-{
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Text [ en-US ] = "Font" ;
- Moveable = TRUE ;
- Closeable = TRUE ;
- TabControl 1
- {
- OutputSize = TRUE ;
- PageList =
- {
- PageItem
- {
- Identifier = TP_CHAR_STD ;
- Text [ en-US ] = "Font" ;
- PageResID = TP_CHAR_STD ;
- };
- };
- };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 507f23fcdf863a3b003669c0de8698bffbd73c27
Author: Zolnai Tamás <zolnaitamas2...@gmail.com>
Date: Fri Jun 21 19:44:51 2013 +0200
Fix include: use just the really needed file
Change-Id: I25590647065d7046b9afa7cbf4b1fdb1b3ca88fc
diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx
index 9fd782c..18632d3 100644
--- a/sw/source/ui/envelp/envfmt.cxx
+++ b/sw/source/ui/envelp/envfmt.cxx
@@ -35,7 +35,7 @@
#include <drpcps.hxx>
#include <envfmt.hxx>
#include <fmtcol.hxx>
-#include "swuipardlg.hxx"
+#include <pardlg.hxx>
#include <pattern.hxx>
#include <poolfmt.hxx>
#include <uitool.hxx>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
