fpicker/Library_fps.mk | 2
fpicker/Module_fpicker.mk | 1
fpicker/WinResTarget_fps.mk | 14 --
fpicker/source/win32/Fps.rc | 275 ----------------------------------------
fpicker/source/win32/afxres.h | 8 -
fpicker/source/win32/resource.h | 38 -----
6 files changed, 338 deletions(-)
New commits:
commit d312d02cf43928361be34207a0cdd2d95b3ec5fd
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Wed Nov 20 20:37:43 2019 +0100
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Thu Nov 21 22:21:30 2019 +0100
Remove some obsolete fpicker/win part
Change-Id: I7c602068e34b904559c0cbe3f869618c9149705a
Reviewed-on: https://gerrit.libreoffice.org/83352
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/fpicker/Library_fps.mk b/fpicker/Library_fps.mk
index 208540db17a3..31dd47e88b30 100644
--- a/fpicker/Library_fps.mk
+++ b/fpicker/Library_fps.mk
@@ -14,8 +14,6 @@ $(eval $(call gb_Library_use_custom_headers,fps,\
officecfg/registry \
))
-$(eval $(call gb_Library_add_nativeres,fps,fps/Fps))
-
$(eval $(call gb_Library_set_componentfile,fps,fpicker/source/win32/fps))
$(eval $(call gb_Library_set_include,fps,\
diff --git a/fpicker/Module_fpicker.mk b/fpicker/Module_fpicker.mk
index 5f4ee86c9c6c..d05b4b20da10 100644
--- a/fpicker/Module_fpicker.mk
+++ b/fpicker/Module_fpicker.mk
@@ -28,7 +28,6 @@ endif
ifeq ($(OS),WNT)
$(eval $(call gb_Module_add_targets,fpicker,\
Library_fps \
- WinResTarget_fps \
))
endif
diff --git a/fpicker/WinResTarget_fps.mk b/fpicker/WinResTarget_fps.mk
deleted file mode 100644
index 07fe66bcca35..000000000000
--- a/fpicker/WinResTarget_fps.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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/.
-#
-
-$(eval $(call gb_WinResTarget_WinResTarget,fps/Fps))
-
-$(eval $(call gb_WinResTarget_set_rcfile,fps/Fps,fpicker/source/win32/Fps))
-
-# vim: set ts=4 sw=4 et:
diff --git a/fpicker/source/win32/Fps.rc b/fpicker/source/win32/Fps.rc
deleted file mode 100644
index 6cab1a5f426c..000000000000
--- a/fpicker/source/win32/Fps.rc
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * 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 .
- */
-
-//Microsoft Developer Studio generated resource script.
-
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-
-
-// Generated from the TEXTINCLUDE 2 resource.
-
-#include "afxres.h"
-
-
-#undef APSTUDIO_READONLY_SYMBOLS
-
-
-// German (Germany) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU)
-#ifdef _WIN32
-LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-
-
-// TEXTINCLUDE
-
-
-1 TEXTINCLUDE DISCARDABLE
-BEGIN
- "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE
-BEGIN
- "#include ""afxres.h""\r\n"
- "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE
-BEGIN
- "\r\n"
- "\0"
-END
-
-#endif // APSTUDIO_INVOKED
-
-
-
-
-// Dialog
-
-
-1001 DIALOG DISCARDABLE 0, 0, 338, 67
-STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS
-FONT 8, "MS Shell Dlg"
-BEGIN
- CONTROL "Mit Schreibschutz \366ffnen",103,"Button",BS_AUTOCHECKBOX
| WS_TABSTOP,
- 130,51,161,14
- COMBOBOX 107,130,35,164,52,CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP
- LTEXT "Version:",207,68,37,56,11
- LTEXT "",1119,0,0,336,35
-END
-
-2001 DIALOG DISCARDABLE 0, 0, 280, 72
-STYLE DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS
-FONT 8, "MS Shell Dlg"
-BEGIN
- CONTROL "Vorschau",105,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
- 130,58,144,16
- CONTROL "Als Link einf\374gen",104,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,
- 130,45,144,14
- COMBOBOX 109,130,28,164,62,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
- LTEXT "Bildvorlage:",209,67,30,47,11
- LTEXT "",1119,0,0,281,28
-END
-
-3001 DIALOG DISCARDABLE 0, 0, 296, 72
-STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS
-FONT 8, "MS Shell Dlg"
-BEGIN
- CONTROL "Automatische Dateinamenserweiterung",100,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,130,58,157,14
- COMBOBOX 108,130,41,164,100,CBS_DROPDOWNLIST | WS_VSCROLL |
- WS_TABSTOP
- LTEXT "Vorlagen:",208,67,42,58,8
- LTEXT "",1119,0,0,293,41
-END
-
-4001 DIALOG DISCARDABLE 0, 0, 278, 67
-STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS
-FONT 8, "MS Shell Dlg"
-BEGIN
- CONTROL "Mit Kennwort speichern",101,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,130,51,144,16
- CONTROL "Automatische Dateinamenserweiterung",100,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,130,38,144,14
- LTEXT "",1119,0,0,277,38
-END
-
-5001 DIALOG DISCARDABLE 0, 0, 278, 79
-STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS
-FONT 8, "MS Shell Dlg"
-BEGIN
- CONTROL "Filtereinstellungen bearbeiten",102,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,130,66,144,13
- CONTROL "Mit Kennwort speichern",101,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,130,52,144,13
- CONTROL "Automatische Dateinamenserweiterung",100,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,130,38,144,14
- LTEXT "",1119,0,0,277,38
-END
-
-6001 DIALOG DISCARDABLE 0, 0, 366, 40
-STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS
-FONT 8, "MS Shell Dlg"
-BEGIN
- LTEXT "",1119,0,0,364,18,NOT WS_VISIBLE
- PUSHBUTTON "Abspielen",106,316,18,50,14
-END
-
-7001 DIALOG DISCARDABLE 0, 0, 278, 65
-STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS
-FONT 8, "MS Shell Dlg"
-BEGIN
- CONTROL "Selektion",110,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
- 130,51,144,16
- CONTROL "Automatische Dateinamenserweiterung",100,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,130,38,144,14
- LTEXT "",1119,0,0,277,38
-END
-
-8001 DIALOG DISCARDABLE 0, 0, 278, 65
-STYLE DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS
-FONT 8, "MS Shell Dlg"
-BEGIN
- CONTROL "Vorschau",105,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,130,
- 51,144,16
- CONTROL "Als Link einf\374gen",104,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,130,38,144,14
- LTEXT "",1119,0,0,277,38
-END
-
-9001 DIALOG DISCARDABLE 0, 0, 278, 54
-STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS
-FONT 8, "MS Shell Dlg"
-BEGIN
- CONTROL "Automatische Dateinamenserweiterung",100,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,130,38,144,14
- LTEXT "",1119,0,0,277,38
-END
-
-
-
-
-// DESIGNINFO
-
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE
-BEGIN
- 1001, DIALOG
- BEGIN
- RIGHTMARGIN, 336
- VERTGUIDE, 124
- VERTGUIDE, 130
- HORZGUIDE, 37
- END
-
- 3001, DIALOG
- BEGIN
- RIGHTMARGIN, 294
- VERTGUIDE, 67
- HORZGUIDE, 41
- END
-
- 4001, DIALOG
- BEGIN
- RIGHTMARGIN, 277
- VERTGUIDE, 76
- HORZGUIDE, 52
- END
-
- 5001, DIALOG
- BEGIN
- RIGHTMARGIN, 277
- VERTGUIDE, 76
- HORZGUIDE, 52
- END
-
- 6001, DIALOG
- BEGIN
- RIGHTMARGIN, 361
- BOTTOMMARGIN, 36
- HORZGUIDE, 20
- END
-
- 7001, DIALOG
- BEGIN
- RIGHTMARGIN, 277
- VERTGUIDE, 76
- HORZGUIDE, 52
- END
-
- 9001, DIALOG
- BEGIN
- RIGHTMARGIN, 277
- VERTGUIDE, 76
- HORZGUIDE, 52
- END
-END
-#endif // APSTUDIO_INVOKED
-
-
-
-
-// Dialog Info
-
-
-1001 DLGINIT
-BEGIN
- 107, 0x403, 15, 0,
-0x7453, 0x7261, 0x7257, 0x7469, 0x7265, 0x3520, 0x322e, "\000",
- 107, 0x403, 15, 0,
-0x7453, 0x7261, 0x7257, 0x7469, 0x7265, 0x3420, 0x302e, "\000",
- 107, 0x403, 15, 0,
-0x7453, 0x7261, 0x7257, 0x7469, 0x7265, 0x3320, 0x302e, "\000",
- 0
-END
-
-3001 DLGINIT
-BEGIN
- 108, 0x403, 15, 0,
-0x7453, 0x7261, 0x7257, 0x7469, 0x7265, 0x3520, 0x322e, "\000",
- 108, 0x403, 15, 0,
-0x7453, 0x7261, 0x7257, 0x7469, 0x7265, 0x3420, 0x302e, "\000",
- 108, 0x403, 15, 0,
-0x7453, 0x7261, 0x7257, 0x7469, 0x7265, 0x3320, 0x302e, "\000",
- 0
-END
-
-#endif // German (Germany) resources
-
-
-
-
-#ifndef APSTUDIO_INVOKED
-
-
-// Generated from the TEXTINCLUDE 3 resource.
-
-
-
-
-#endif // not APSTUDIO_INVOKED
-
diff --git a/fpicker/source/win32/afxres.h b/fpicker/source/win32/afxres.h
deleted file mode 100644
index 6b84f154296e..000000000000
--- a/fpicker/source/win32/afxres.h
+++ /dev/null
@@ -1,8 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#if !defined WIN32_LEAN_AND_MEAN
-# define WIN32_LEAN_AND_MEAN
-#endif
-#include <windows.h>
-#include <dlgs.h>
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/win32/resource.h b/fpicker/source/win32/resource.h
deleted file mode 100644
index 9cd716c20507..000000000000
--- a/fpicker/source/win32/resource.h
+++ /dev/null
@@ -1,38 +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 .
- */
-
-//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by Fps.rc
-
-#define stc32 -1
-#define IDC_STATIC -1
-
-// Next default values for new objects
-
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 119
-#define _APS_NEXT_COMMAND_VALUE 40001
-#define _APS_NEXT_CONTROL_VALUE 1014
-#define _APS_NEXT_SYMED_VALUE 101
-#endif
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
