#include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include /* For the moment */ #include #include /* * This guards the refcounted line discipline lists. The lock * must be taken with irqs off because there are hangup path * callers who will do ldisc lookups and cannot sleep. */ static DEFINE_SPINLOCK(tty_ldisc_lock); static DECLARE_WAIT_QUEUE_HEAD(tty_ldisc_wait); static DECLARE_WAIT_QUEUE_HEAD(tty_ldisc_idle); /* Line disc dispatch table */ static struct tty_ldisc_ops *tty_ldiscs[NR_LDISCS]; static inline struct tty_ldisc *get_ldisc(struct tty_ldisc *ld) { if (ld) atomic_inc(&ld->users); return ld; } static void put_ldisc(struct tty_ldisc *ld) { unsigned long flags; if (WARN_ON_ONCE(!ld)) return; /* * If this is the last user, free the ldisc, and * release the ldisc ops. * * We really want an "atomic_dec_and_lock_irqsave()", * but we don't have it, so this does it by hand. */ local_irq_save(flags); if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) { struct tty_ldisc_ops *ldo = ld->ops; ldo->refcount--; module_put(ldo->owner); spin_unlock_irqrestore(&tty_ldisc_lock, flags); kfree(ld); return; } local_irq_restore(flags); wake_up(&tty_ldisc_idle); } /** * tty_register_ldisc - install a line discipline * @disc: ldisc number * @new_ldisc: pointer to the ldisc object * * Installs a new line discipline into the kernel. The discipline * is set up as unreferenced and then made available to the kernel * from this point onwards. * * Locking: * takes tty_ldisc_lock to guard against ldisc races */ int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc) { unsigned long flags; int ret = 0; if (disc < N_TTY || disc >= NR_LDISCS) return -EINVAL; spin_lock_irqsave(&tty_ldisc_lock, flags); tty_ldiscs[disc] = new_ldisc; new_ldisc->num = disc; new_ldisc->refcount = 0; spin_unlock_irqrestore(&tty_ldisc_lock, flags); return ret; } EXPORT_SYMBOL(tty_register_ldisc); /** * tty_unregister_ldisc - unload a line discipline * @disc: ldisc number * @new_ldisc: pointer to the ldisc object * * Remove a line discipline from the kernel providing it is not * currently in use. * * Locking: * takes tty_ldisc_lock to guard against ldisc races */ int tty_unregister_ldisc(int disc) { unsigned long flags; int ret = 0; if (disc < N_TTY || disc >= NR_LDISCS) return -EINVAL; spin_lock_irqsave(&tty_ldisc_lock, flags); if (tty_ldiscs[disc]->refcount) ret = -EBUSY; else tty_ldiscs[disc] = NULL; spin_unlock_irqrestore(&tty_ldisc_lock, flags); return ret; } EXPORT_SYMBOL(tty_unregister_ldisc); static struct tty_ldisc_ops *get_ldops(int disc) { unsigned long flags; struct tty_ldisc_ops *ldops, *ret; spin_lock_irqsave(&tty_ldisc_lock, flags); ret = ERR_PTR(-EINVAL); ldops = tty_ldiscs[disc]; if (ldops) { ret = ERR_PTR(-EAGAIN); if (try_module_get(ldops->owner)) { ldops->refcount++; ret = ldops; } } spin_unlock_irqrestore(&tty_ldisc_lock, flags); return ret; } static void put_ldops(struct tty_ldisc_ops *ldops) { unsigned long flags; spin_lock_irqsave(&tty_ldisc_lock, flags); ldops->refcount--; module_put(ldops->owner); spin_unlock_irqrestore(&tty_ldisc_lock, flags); } /** * tty_ldisc_get - take a reference to an ldisc * @disc: ldisc number * * Takes a reference to a line discipline. Deals with refcounts and * module locking counts. Returns NULL if the discipline is not available. * Returns a pointer to the discipline and bumps the ref count if it is * available * * Locking: * takes tty_ldisc_lock to guard against ldisc races */ static struct tty_ldisc *tty_ldisc_get(int disc) { struct tty_ldisc *ld; struct tty_ldisc_ops *ldops; if (disc < N_TTY || disc >= NR_LDISCS) return ERR_PTR(-EINVAL); /* * Get the ldisc ops - we may need to request them to be loaded * dynamically and try again. */ ldops = get_ldops(disc); if (IS_ERR(ldops)) { request_module("tty-ldisc-%d", disc); ldops = get_ldops(disc); if (IS_ERR(ldops)) return ERR_CAST(ldops); } ld = kmalloc(sizeof(struct tty_ldisc), GFP_KERNEL); if (ld == NULL) { put_ldops(ldops); return ERR_PTR(-ENOMEM); } ld->ops = ldops; atomic_set(&ld->users, 1); return ld; } static void *tty_ldiscs_seq_start(struct seq_file *m, loff_t *pos) { return (*pos < NR_LDISCS) ? pos : NULL; } static void *tty_ldiscs_seq_next(struct seq_file *m, void *v, loff_t *pos) { (*pos)++; return (*pos < NR_LDISCS) ? pos : NULL; } static void tty_ldiscs_seq_stop(struct seq_file *m, void *v) { } static int tty_ldiscs_seq_show(struct seq_file *m, void *v) { int i = *(loff_t *)v; struct tty_ldisc_ops *ldops; ldops = get_ldops(i); if (IS_ERR(ldops)) return 0; seq_printf(m, "%-10s %2d\n", ldops->name ? ldops->name : "???", i); put_ldops(ldops); return 0; } static const struct seq_operations tty_ldiscs_seq_ops = { .start = tty_ldiscs_seq_start, .next = tty_ldiscs_seq_next, .stop = tty_ldiscs_seq_stop, .show = tty_ldiscs_seq_show, }; static int proc_tty_ldiscs_open(struct inode *inode, struct file *file) { return seq_open(file, &tty_ldiscs_seq_ops); } const struct file_operations tty_ldiscs_proc_fops = { .owner = THIS_MODULE, .open = proc_tty_ldiscs_open, .read = seq_read, .llseek = seq_lseek, .release = seq_release, }; /** * tty_ldisc_assign - set ldisc on a tty * @tty: tty to assign * @ld: line discipline * * Install an instance of a line discipline into a tty structure. The * ldisc must have a reference count above zero to ensure it remains. * The tty instance refcount starts at zero. * * Locking: * Caller must hold references */ static void tty_ldisc_assign(struct tty_struct *tty, struct tty_ldisc *ld) { tty->ldisc = ld; } /** * tty_ldisc_try - internal helper * @tty: the tty * * Make a single attempt to grab and bump the refcount on * the tty ldisc. Return 0 on failure or 1 on success. This is * used to implement both the waiting and non waiting versions * of tty_ldisc_ref * * Locking: takes tty_ldisc_lock */ static struct tty_ldisc *tty_ldisc_try(struct tty_struct *tty) { unsigned long flags; struct tty_ldisc *ld; spin_lock_irqsave(&tty_ldisc_lock, flags); ld = NULL; if (test_bit(TTY_LDISC, &tty->flags)) ld = get_ldisc(tty->ldisc); spin_unlock_irqrestore(&tty_ldisc_lock, flags); return ld; } /** * tty_ldisc_ref_wait - wait for the tty ldisc * @tty: tty device * * Dereference the line discipline for the terminal and take a * reference to it. If the line discipline is in flux then * wait patiently until it changes. * * Note: Must not be called from an IRQ/timer context. The caller * must also be careful not to hold other locks that will deadlock * against a discipline change, such as an existing ldisc reference * (which we check for) * * Locking: call functions take tty_ldisc_lock */ struct tty_ldisc *tty_ldisc_ref_wait(struct tty_struct *tty) { struct tty_ldisc *ld; /* wait_event is a macro */ wait_event(tty_ldisc_wait, (ld = tty_ldisc_try(tty)) != NULL); return ld; } EXPORT_SYMBOL_GPL(tty_ldisc_ref_wait); /** * tty_ldisc_ref - get the tty ldisc * @tty: tty device * * Dereference the line discipline for the terminal and take a * reference to it. If the line discipline is in flux then * return NULL. Can be called from IRQ and timer functions. * * Locking: called functions take tty_ldisc_lock */ struct tty_ldisc *tty_ldisc_ref(struct tty_struct *tty) { return tty_ldisc_try(tty); } EXPORT_SYMBOL_GPL(tty_ldisc_ref); /** * tty_ldisc_deref - free a tty ldisc reference * @ld: reference to free up * * Undoes the effect of tty_ldisc_ref or tty_ldisc_ref_wait. May * be called in IRQ context. * * Locking: takes tty_ldisc_lock */ void tty_ldisc_deref(struct tty_ldisc *ld) { put_ldisc(ld); } EXPORT_SYMBOL_GPL(tty_ldisc_deref); static inline void tty_ldisc_put(struct tty_ldisc *ld) { put_ldisc(ld); } /** * tty_ldisc_enable - allow ldisc use * @tty: terminal to activate ldisc on * * Set the TTY_LDISC flag when the line discipline can be called * again. Do necessary wakeups for existing sleepers. Clear the LDISC * changing flag to indicate any ldisc change is now over. * * Note: nobody should set the TTY_LDISC bit except via this function. * Clearing directly is allowed. */ void tty_ldisc_enable(struct tty_struct *tty) { set_bit(TTY_LDISC, &tty->flags); clear_bit(TTY_LDISC_CHANGING, &tty->flags); wake_up(&tty_ldisc_wait); } /** * tty_ldisc_flush - flush line discipline queue * @tty: tty * * Flush the line discipline queue (if any) for this tty. If there * is no line discipline active this is a no-op. */ void tty_ldisc_flush(struct tty_struct *tty) { struct tty_ldisc *ld = tty_ldisc_ref(tty); if (ld) { if (ld->ops->flush_buffer) ld->ops->flush_buffer(tty); tty_ldisc_deref(ld); } tty_buffer_flush(tty); } EXPORT_SYMBOL_GPL(tty_ldisc_flush); /** * tty_set_termios_ldisc - set ldisc field * @tty: tty structure * @num: line discipline number * * This is probably overkill for real world processors but * they are not on hot paths so a little discipline won't do * any harm. * * Locking: takes termios_mutex */ static void tty_set_termios_ldisc(struct tty_struct *tty, int num) { mutex_lock(&tty->termios_mutex); tty->termios->c_line = num; mutex_unlock(&tty->termios_mutex); } /** * tty_ldisc_open - open a line discipline * @tty: tty we are opening the ldisc on * @ld: discipline to open * * A helper opening method. Also a convenient debugging and check * point. * * Locking: always called with BTM already held. */ static int tty_ldisc_open(struct tty_struct *tty, struct tty_ldisc *ld) { WARN_ON(test_and_set_bit(TTY_LDISC_OPEN, &tty->flags)); if (ld->ops->open) { int ret; /* BTM here locks versus a hangup event */ WARN_ON(!tty_locked()); ret = ld->ops->open(tty); return ret; } return 0; } /** * tty_ldisc_close - close a line discipline * @tty: tty we are opening the ldisc on * @ld: discipline to close * * A helper close method. Also a convenient debugging and check * point. */ static void tty_ldisc_close(struct tty_struct *tty, struct tty_ldisc *ld) { WARN_ON(!test_bit(TTY_LDISC_OPEN, &tty->flags)); clear_bit(TTY_LDISC_OPEN, &tty->flags); if (ld->ops->close) ld->ops->close(tty); } /** * tty_ldisc_restore - helper for tty ldisc change * @tty: tty to recover * @old: previous ldisc * * Restore the previous line discipline or N_TTY when a line discipline * change fails due to an open error */ static void tty_ldisc_restore(struct tty_struct *tty, struct tty_ldisc *old) { char buf[64]; struct tty_ldisc *new_ldisc; int r; /* There is an outstanding reference here so this is safe */ old = tty_ldisc_get(old->ops->num); WARN_ON(IS_ERR(old)); tty_ldisc_assign(tty, old); tty_set_termios_ldisc(tty, old->ops->num); if (tty_ldisc_open(tty, old) < 0) { tty_ldisc_put(old); /* This driver is always present */ new_ldisc = tty_ldisc_get(N_TTY); if (IS_ERR(new_ldisc)) panic("n_tty: get"); tty_ldisc_assign(tty, new_ldisc); tty_set_termios_ldisc(tty, N_TTY); r = tty_ldisc_open(tty, new_ldisc); if (r < 0) panic("Couldn't open N_TTY ldisc for " "%s --- error %d.", tty_name(tty, buf), r); } } /** * tty_ldisc_halt - shut down the line discipline * @tty: tty device * * Shut down the line discipline and work queue for this tty device. * The TTY_LDISC flag being cleared ensures no further references can * be obtained while the delayed work queue halt ensures that no more * data is fed to the ldisc. * * You need to do a 'flush_scheduled_work()' (outside the ldisc_mutex) * in order to make sure any currently executing ldisc work is also * flushed. */ static int tty_ldisc_halt(struct tty_struct *tty) { clear_bit(TTY_LDISC, &tty->flags); return cancel_delayed_work_sync(&tty->buf.work); } /** * tty_ldisc_wait_idle - wait for the ldisc to become idle * @tty: tty to wait for * * Wait for the line discipline to become idle. The discipline must * have been halted for this to guarantee it remains idle. */ static int tty_ldisc_wait_idle(struct tty_struct *tty) { int ret; ret = wait_event_interruptible_timeout(tty_ldisc_idle, atomic_read(&tty->ldisc->users) == 1, 5 * HZ); if (ret < 0) return ret; return ret > 0 ? 0 : -EBUSY; } /** * tty_set_ldisc - set line discipline * @tty: the terminal to set * @ldisc: the line discipline * * Set the discipline of a tty line. Must be called from a process * context. The ldisc change logic has to protect itself against any * overlapping ldisc change (including on the other end of pty pairs), * the close of one side of a tty/pty pair, and eventually hangup. * * Locking: takes tty_ldisc_lock, termios_mutex */ int tty_set_ldisc(struct tty_struct *tty, int ldisc) { int retval; struct tty_ldisc *o_ldisc, *new_ldisc; int work, o_work = 0; struct tty_struct *o_tty; new_ldisc = tty_ldisc_get(ldisc); if (IS_ERR(new_ldisc)) return PTR_ERR(new_ldisc); tty_lock(); /* * We need to look at the tty locking here for pty/tty pairs * when both sides try to change in parallel. */ o_tty = tty->link; /* o_tty is the pty side or NULL */ /* * Check the no-op case */ if (tty->ldisc->ops->num == ldisc) { tty_unlock(); tty_ldisc_put(new_ldisc); return 0; } tty_unlock(); /* * Problem: What do we do if this blocks ? * We could deadlock here */ tty_wait_until_sent(tty, 0); tty_lock(); mutex_lock(&tty->ldisc_mutex); /* * We could be midstream of another ldisc change which has * dropped the lock during processing. If so we need to wait. */ while (test_bit(TTY_LDISC_CHANGING, &tty->flags)) { mutex_unlock(&tty->ldisc_mutex); tty_unlock(); wait_event(tty_ldisc_wait, test_bit(TTY_LDISC_CHANGING, &tty->flags) == 0); tty_lock(); mutex_lock(&tty->ldisc_mutex); } set_bit(TTY_LDISC_CHANGING, &tty->flags); /* * No more input please, we are switching. The new ldisc * will update this value in the ldisc open function */ tty->receive_room = 0; o_ldisc = tty->ldisc; tty_unlock(); /* * Make sure we don't change while someone holds a * reference to the line discipline. The TTY_LDISC bit * prevents anyone taking a reference once it is clear. * We need the lock to avoid racing reference takers. * * We must clear the TTY_LDISC bit here to avoid a livelock * with a userspace app continually trying to use the tty in * parallel to the change and re-referencing the tty. */ work = tty_ldisc_halt(tty); if (o_tty) o_work = tty_ldisc_halt(o_tty); /* * Wait for ->hangup_work and ->buf.work handlers to terminate. * We must drop the mutex here in case a hangup is also in process. */ mutex_unlock(&tty->ldisc_mutex); flush_scheduled_work(); retval = tty_ldisc_wait_idle(tty); tty_lock(); mutex_lock(&tty->ldisc_mutex); /* handle wait idle failure locked */ if (retval) { tty_ldisc_put(new_ldisc); goto enable; } if (test_bit(TTY_HUPPED, &tty->flags)) { /* We were raced by the hangup method. It will have stomped the ldisc data and closed the ldisc down */ clear_bit(TTY_LDISC_CHANGING, &tty->flags); mutex_unlock(&tty->ldisc_mutex); tty_ldisc_put(new_ldisc); tty_unlock(); return -EIO; } /* Shutdown the current discipline. */ tty_ldisc_close(tty, o_ldisc); /* Now set up the new line discipline. */ tty_ldisc_assign(tty, new_ldisc); tty_set_termios_ldisc(tty, ldisc); retval = tty_ldisc_open(tty, new_ldisc); if (retval < 0) { /* Back to the old one or N_TTY if we can't */ tty_ldisc_put(new_ldisc); tty_ldisc_restore(tty, o_ldisc); } /* At this point we hold a reference to the new ldisc and a a reference to the old ldisc. If we ended up flipping back to the existing ldisc we have two references to it */ if (tty->ldisc->ops->num != o_ldisc->ops->num && tty->ops->set_ldisc) tty->ops->set_ldisc(tty); tty_ldisc_put(o_ldisc); enable: /* * Allow ldisc referencing to occur again */ tty_ldisc_enable(tty); if (o_tty) tty_ldisc_enable(o_tty); /* Restart the work queue in case no characters kick it off. Safe if already running */ if (work) schedule_delayed_work(&tty->buf.work, 1); if (o_work) schedule_delayed_work(&o_tty->buf.work, 1); mutex_unlock(&tty->ldisc_mutex); tty_unlock(); return retval; } /** * tty_reset_termios - reset terminal state * @tty: tty to reset * * Restore a terminal to the driver default state. */ static void tty_reset_termios(struct tty_struct *tty) { mutex_lock(&tty->termios_mutex); *tty->termios = tty->driver->init_termios; tty->termios->c_ispeed = tty_termios_input_baud_rate(tty->termios); tty->termios->c_ospeed = tty_termios_baud_rate(tty->termios); mutex_unlock(&tty->termios_mutex); } /** * tty_ldisc_reinit - reinitialise the tty ldisc * @tty: tty to reinit * @ldisc: line discipline to reinitialize * * Switch the tty to a line discipline and leave the ldisc * state closed */ static int tty_ldisc_reinit(struct tty_struct *tty, int ldisc) { struct tty_ldisc *ld = tty_ldisc_get(ldisc); if (IS_ERR(ld)) return -1; tty_ldisc_close(tty, tty->ldisc); tty_ldisc_put(tty->ldisc); tty->ldisc = NULL; /* * Switch the line discipline back */ tty_ldisc_assign(tty, ld); tty_set_termios_ldisc(tty, ldisc); return 0; } /** * tty_ldisc_hangup - hangup ldisc reset * @tty: tty being hung up * * Some tty devices reset their termios when they receive a hangup * event. In that situation we must also switch back to N_TTY properly * before we reset the termios data. * * Locking: We can take the ldisc mutex as the rest of the code is * careful to allow for this. * * In the pty pair case this occurs in the close() path of the * tty itself so we must be careful about locking rules. */ void tty_ldisc_hangup(struct tty_struct *tty) { struct tty_ldisc *ld; int reset = tty->driver->flags & TTY_DRIVER_RESET_TERMIOS; int err = 0; /* * FIXME! What are the locking issues here? This may me overdoing * things... This question is especially important now that we've * removed the irqlock. */ ld = tty_ldisc_ref(tty); if (ld != NULL) { /* We may have no line discipline at this point */ if (ld->ops->flush_buffer) ld->ops->flush_buffer(tty); tty_driver_flush_buffer(tty); if ((test_bit(TTY_DO_WRITE_WAKEUP, &tty->flags)) && ld->ops->write_wakeup) ld->ops->write_wakeup(tty); if (ld->ops->hangup) ld->ops->hangup(tty); tty_ldisc_deref(ld); } /* * FIXME: Once we trust the LDISC code better we can wait here for * ldisc completion and fix the driver call race */ wake_up_interruptible_poll(&tty->write_wait, POLLOUT); wake_up_interruptible_poll(&tty->read_wait, POLLIN); /* * Shutdown the current line discipline, and reset it to * N_TTY if need be. * * Avoid racing set_ldisc or tty_ldisc_release */ mutex_lock(&tty->ldisc_mutex); /* * this is like tty_ldisc_halt, but we need to give up * the BTM before calling cancel_delayed_work_sync, * which may need to wait for another function taking the BTM */ clear_bit(TTY_LDISC, &tty->flags); tty_unlock(); cancel_delayed_work_sync(&tty->buf.work); mutex_unlock(&tty->ldisc_mutex); tty_lock(); mutex_lock(&tty->ldisc_mutex); /* At this point we have a closed ldisc and we want to reopen it. We could defer this to the next open but it means auditing a lot of other paths so this is a FIXME */ if (tty->ldisc) { /* Not yet closed */ if (reset == 0) { if (!tty_ldisc_reinit(tty, tty->termios->c_line)) err = tty_ldisc_open(tty, tty->ldisc); else err = 1; } /* If the re-open fails or we reset then go to N_TTY. The N_TTY open cannot fail */ if (reset || err) { BUG_ON(tty_ldisc_reinit(tty, N_TTY)); WARN_ON(tty_ldisc_open(tty, tty->ldisc)); } tty_ldisc_enable(tty); } mutex_unlock(&tty->ldisc_mutex); if (reset) tty_reset_termios(tty); } /** * tty_ldisc_setup - open line discipline * @tty: tty being shut down * @o_tty: pair tty for pty/tty pairs * * Called during the initial open of a tty/pty pair in order to set up the * line disciplines and bind them to the tty. This has no locking issues * as the device isn't yet active. */ int tty_ldisc_setup(struct tty_struct *tty, struct tty_struct *o_tty) { struct tty_ldisc *ld = tty->ldisc; int retval; retval = tty_ldisc_open(tty, ld); if (retval) return retval; if (o_tty) { retval = tty_ldisc_open(o_tty, o_tty->ldisc); if (retval) { tty_ldisc_close(tty, ld); return retval; } tty_ldisc_enable(o_tty); } tty_ldisc_enable(tty); return 0; } /** * tty_ldisc_release - release line discipline * @tty: tty being shut down * @o_tty: pair tty for pty/tty pairs * * Called during the final close of a tty/pty pair in order to shut down * the line discpline layer. On exit the ldisc assigned is N_TTY and the * ldisc has not been opened. */ void tty_ldisc_release(struct tty_struct *tty, struct tty_struct *o_tty) { /* * Prevent flush_to_ldisc() from rescheduling the work for later. Then * kill any delayed work. As this is the final close it does not * race with the set_ldisc code path. */ tty_unlock(); tty_ldisc_halt(tty); flush_scheduled_work(); tty_lock(); mutex_lock(&tty->ldisc_mutex); /* * Now kill off the ldisc */ tty_ldisc_close(tty, tty->ldisc); tty_ldisc_put(tty->ldisc); /* Force an oops if we mess this up */ tty->ldisc = NULL; /* Ensure the next open requests the N_TTY ldisc */ tty_set_termios_ldisc(tty, N_TTY); mutex_unlock(&tty->ldisc_mutex); /* This will need doing differently if we need to lock */ if (o_tty) tty_ldisc_release(o_tty, NULL); /* And the memory resources remaining (buffers, termios) will be disposed of when the kref hits zero */ } /** * tty_ldisc_init - ldisc setup for new tty * @tty: tty being allocated * * Set up the line discipline objects for a newly allocated tty. Note that * the tty structure is not completely set up when this call is made. */ void tty_ldisc_init(struct tty_struct *tty) { struct tty_ldisc *ld = tty_ldisc_get(N_TTY); if (IS_ERR(ld)) panic("n_tty: init_tty"); tty_ldisc_assign(tty, ld); } void tty_ldisc_begin(void) { /* Setup the default TTY line discipline. */ (void) tty_register_ldisc(N_TTY, &tty_ldisc_N_TTY); } ndercontext main, development code repositoryroot
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-07-16 15:05:04 +0100
committerCaolán McNamara <caolanm@redhat.com>2017-07-21 08:20:51 +0100
commit182a74d937088f0f08850014a7b918719e106b7d (patch)
tree0a286f4a6a5adcd32fd32a26b61b247d247c93d2
parent00657aef09d854c74fb426a935a3e8b1fc390bb0 (diff)
de-hrc various things
e.g. helpid[s].hrc -> helpids.h and insert include guards where missing move "ordinary" defines into .hxx files remove .hrc entries that are used as arguments to dialog factory when a dedicated method can be added instead Change-Id: I792fb8eb0adfaa63cf354e6e57401fc943e9196e
-rw-r--r--avmedia/inc/helpids.h (renamed from avmedia/inc/helpids.hrc)4
-rw-r--r--avmedia/source/framework/MediaControlBase.cxx2
-rw-r--r--avmedia/source/framework/mediacontrol.cxx2
-rw-r--r--avmedia/source/framework/mediaplayer.cxx2
-rw-r--r--avmedia/source/viewer/mediawindow_impl.cxx2
-rw-r--r--basctl/inc/helpids.h (renamed from basctl/inc/helpid.hrc)4
-rw-r--r--basctl/sdi/basslots.hrc2
-rw-r--r--basctl/source/basicide/basdoc.cxx2
-rw-r--r--basctl/source/basicide/baside2.cxx2
-rw-r--r--basctl/source/basicide/baside2b.cxx2
-rw-r--r--basctl/source/basicide/baside3.cxx2
-rw-r--r--basctl/source/basicide/basides1.cxx2
-rw-r--r--basctl/source/basicide/bastypes.cxx2
-rw-r--r--basctl/source/basicide/objdlg.cxx2
-rw-r--r--basctl/source/dlged/managelang.cxx2
-rw-r--r--chart2/source/controller/dialogs/ChartTypeDialogController.cxx2
-rw-r--r--chart2/source/controller/dialogs/DataBrowser.cxx2
-rw-r--r--chart2/source/controller/dialogs/TabPageIds.h (renamed from chart2/source/controller/dialogs/ResourceIds.hrc)7
-rw-r--r--chart2/source/controller/dialogs/dlg_ChartType.cxx2
-rw-r--r--chart2/source/controller/dialogs/dlg_CreationWizard.cxx2
-rw-r--r--chart2/source/controller/dialogs/dlg_DataSource.cxx2
-rw-r--r--chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx2
-rw-r--r--chart2/source/controller/dialogs/dlg_ObjectProperties.cxx2
-rw-r--r--chart2/source/controller/dialogs/dlg_ShapeFont.cxx2
-rw-r--r--chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx2
-rw-r--r--chart2/source/controller/dialogs/dlg_View3D.cxx2
-rw-r--r--chart2/source/controller/dialogs/res_ErrorBar.cxx2
-rw-r--r--chart2/source/controller/dialogs/tp_AxisLabel.cxx2
-rw-r--r--chart2/source/controller/dialogs/tp_AxisPositions.cxx2
-rw-r--r--chart2/source/controller/dialogs/tp_DataLabel.cxx2
-rw-r--r--chart2/source/controller/dialogs/tp_ErrorBars.cxx2
-rw-r--r--chart2/source/controller/dialogs/tp_LegendPosition.cxx2
-rw-r--r--chart2/source/controller/dialogs/tp_PointGeometry.cxx2
-rw-r--r--chart2/source/controller/dialogs/tp_TitleRotation.cxx4
-rw-r--r--chart2/source/controller/dialogs/tp_Trendline.cxx2
-rw-r--r--chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx2
-rw-r--r--chart2/source/controller/inc/ShapeController.h (renamed from chart2/source/controller/inc/ShapeController.hrc)4
-rw-r--r--chart2/source/controller/inc/helpids.h (renamed from chart2/source/controller/inc/HelpIds.hrc)5
-rw-r--r--chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx2
-rw-r--r--chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx2
-rw-r--r--chart2/source/controller/main/ChartWindow.cxx2
-rw-r--r--chart2/source/controller/main/DrawCommandDispatch.cxx2
-rw-r--r--chart2/source/controller/main/DrawCommandDispatch.h (renamed from chart2/source/controller/main/DrawCommandDispatch.hrc)0
-rw-r--r--chart2/source/controller/main/ShapeController.cxx2
-rw-r--r--connectivity/source/drivers/jdbc/DatabaseMetaData.cxx1
-rw-r--r--connectivity/source/drivers/jdbc/JBigDecimal.cxx1
-rw-r--r--connectivity/source/drivers/jdbc/JConnection.cxx1
-rw-r--r--connectivity/source/drivers/jdbc/JDriver.cxx1
-rw-r--r--connectivity/source/drivers/jdbc/JStatement.cxx1
-rw-r--r--connectivity/source/drivers/jdbc/Object.cxx1
-rw-r--r--connectivity/source/drivers/jdbc/PreparedStatement.cxx1
-rw-r--r--connectivity/source/inc/resource/conn_shared_res.hrc65
-rw-r--r--connectivity/source/inc/resource/jdbc_log.hrc27
-rw-r--r--connectivity/source/inc/resource/kab_res.hrc35
-rw-r--r--cui/inc/treeopt.hrc3
-rw-r--r--cui/source/customize/SvxMenuConfigPage.cxx3
-rw-r--r--cui/source/customize/acccfg.cxx1
-rw-r--r--cui/source/customize/cfg.cxx3
-rw-r--r--cui/source/customize/cfgutil.cxx3
-rw-r--r--cui/source/customize/eventdlg.cxx3
-rw-r--r--cui/source/customize/macropg.cxx3
-rw-r--r--cui/source/dialogs/SpellDialog.cxx1
-rw-r--r--cui/source/dialogs/cuicharmap.cxx2
-rw-r--r--cui/source/dialogs/cuifmsearch.cxx1
-rw-r--r--cui/source/dialogs/cuigaldlg.cxx2
-rw-r--r--cui/source/dialogs/cuigrfflt.cxx1
-rw-r--r--cui/source/dialogs/cuihyperdlg.cxx28
-rw-r--r--cui/source/dialogs/cuiimapwnd.cxx1
-rw-r--r--cui/source/dialogs/cuitbxform.cxx1
-rw-r--r--cui/source/dialogs/dlgname.cxx3
-rw-r--r--cui/source/dialogs/hangulhanjadlg.cxx3
-rw-r--r--cui/source/dialogs/hlmarkwn.cxx1
-rw-r--r--cui/source/dialogs/hltpbase.cxx2
-rw-r--r--cui/source/dialogs/hyphen.cxx1
-rw-r--r--cui/source/dialogs/iconcdlg.cxx3
-rw-r--r--cui/source/dialogs/insdlg.cxx1
-rw-r--r--cui/source/dialogs/insrc.cxx1
-rw-r--r--cui/source/dialogs/linkdlg.cxx2
-rw-r--r--cui/source/dialogs/multipat.cxx1
-rw-r--r--cui/source/dialogs/newtabledlg.cxx1
-rw-r--r--cui/source/dialogs/passwdomdlg.cxx1
-rw-r--r--cui/source/dialogs/postdlg.cxx3
-rw-r--r--cui/source/dialogs/screenshotannotationdlg.cxx1
-rw-r--r--cui/source/dialogs/scriptdlg.cxx1
-rw-r--r--cui/source/dialogs/sdrcelldlg.cxx1
-rw-r--r--cui/source/dialogs/splitcelldlg.cxx1
-rw-r--r--cui/source/dialogs/srchxtra.cxx1
-rw-r--r--cui/source/dialogs/thesdlg.cxx1
-rw-r--r--cui/source/dialogs/zoom.cxx3
-rw-r--r--cui/source/factory/dlgfact.cxx6
-rw-r--r--cui/source/inc/cuihyperdlg.hxx9
-rw-r--r--cui/source/inc/helpids.h (renamed from cui/source/inc/helpid.hrc)0
-rw-r--r--cui/source/inc/hltpbase.hxx3
-rw-r--r--cui/source/inc/numpages.hxx2
-rw-r--r--cui/source/options/certpath.cxx1
-rw-r--r--cui/source/options/cfgchart.cxx1
-rw-r--r--cui/source/options/connpooloptions.cxx3
-rw-r--r--cui/source/options/cuisrchdlg.cxx2
-rw-r--r--cui/source/options/dbregister.cxx3
-rw-r--r--cui/source/options/doclinkdialog.cxx1
-rw-r--r--cui/source/options/fontsubs.cxx3
-rw-r--r--cui/source/options/optaccessibility.cxx1
-rw-r--r--cui/source/options/optasian.cxx1
-rw-r--r--cui/source/options/optbasic.cxx1
-rw-r--r--cui/source/options/optchart.cxx1
-rw-r--r--cui/source/options/optcolor.cxx3
-rw-r--r--cui/source/options/optctl.cxx1
-rw-r--r--cui/source/options/optdict.cxx1
-rw-r--r--cui/source/options/optfltr.cxx3
-rw-r--r--cui/source/options/optgdlg.cxx1
-rw-r--r--cui/source/options/optgenrl.cxx1
-rw-r--r--cui/source/options/opthtml.cxx3
-rw-r--r--cui/source/options/optinet2.cxx3
-rw-r--r--cui/source/options/optjava.cxx3
-rw-r--r--cui/source/options/optjsearch.cxx1
-rw-r--r--cui/source/options/optlingu.cxx3
-rw-r--r--cui/source/options/optmemory.cxx3
-rw-r--r--cui/source/options/optopencl.cxx1
-rw-r--r--cui/source/options/optpath.cxx3
-rw-r--r--cui/source/options/optsave.cxx5
-rw-r--r--cui/source/options/optsave.hrc35
-rw-r--r--cui/source/options/optsave.hxx9
-rw-r--r--cui/source/options/optupdt.cxx1
-rw-r--r--cui/source/options/personalization.cxx1
-rw-r--r--cui/source/options/securityoptions.cxx1
-rw-r--r--cui/source/options/treeopt.cxx3
-rw-r--r--cui/source/options/tsaurls.cxx1
-rw-r--r--cui/source/options/webconninfo.cxx1
-rw-r--r--cui/source/tabpages/align.cxx1
-rw-r--r--cui/source/tabpages/autocdlg.cxx3
-rw-r--r--cui/source/tabpages/backgrnd.cxx3
-rw-r--r--cui/source/tabpages/border.cxx3
-rw-r--r--cui/source/tabpages/chardlg.cxx1
-rw-r--r--cui/source/tabpages/connect.cxx1
-rw-r--r--cui/source/tabpages/dstribut.cxx1
-rw-r--r--cui/source/tabpages/grfpage.cxx1
-rw-r--r--cui/source/tabpages/labdlg.cxx1
-rw-r--r--cui/source/tabpages/macroass.cxx1
-rw-r--r--cui/source/tabpages/measure.cxx1
-rw-r--r--cui/source/tabpages/numfmt.cxx1
-rw-r--r--cui/source/tabpages/numpages.cxx4
-rw-r--r--cui/source/tabpages/numpages.hrc22
-rw-r--r--cui/source/tabpages/page.cxx3
-rw-r--r--cui/source/tabpages/paragrph.cxx1
-rw-r--r--cui/source/tabpages/swpossizetabpage.cxx1
-rw-r--r--cui/source/tabpages/tabarea.cxx1
-rw-r--r--cui/source/tabpages/tabline.cxx3
-rw-r--r--cui/source/tabpages/tabstpge.cxx1
-rw-r--r--cui/source/tabpages/textanim.cxx1
-rw-r--r--cui/source/tabpages/textattr.cxx1
-rw-r--r--cui/source/tabpages/tparea.cxx1
-rw-r--r--cui/source/tabpages/tpbitmap.cxx1
-rw-r--r--cui/source/tabpages/tpcolor.cxx3
-rw-r--r--cui/source/tabpages/tpgradnt.cxx3
-rw-r--r--cui/source/tabpages/tphatch.cxx3
-rw-r--r--cui/source/tabpages/tpline.cxx1
-rw-r--r--cui/source/tabpages/tplnedef.cxx3
-rw-r--r--cui/source/tabpages/tplneend.cxx3
-rw-r--r--cui/source/tabpages/tppattern.cxx3
-rw-r--r--cui/source/tabpages/tpshadow.cxx1
-rw-r--r--cui/source/tabpages/tptrans.cxx1
-rw-r--r--cui/source/tabpages/transfrm.cxx1
-rw-r--r--dbaccess/inc/helpids.h (renamed from dbaccess/inc/dbaccess_helpid.hrc)4
-rw-r--r--dbaccess/source/ext/macromigration/macromigrationpages.cxx2
-rw-r--r--dbaccess/source/ui/app/AppController.cxx2
-rw-r--r--dbaccess/source/ui/app/AppDetailPageHelper.cxx2
-rw-r--r--dbaccess/source/ui/app/AppDetailView.cxx2
-rw-r--r--dbaccess/source/ui/app/AppIconControl.cxx2
-rw-r--r--dbaccess/source/ui/app/AppSwapWindow.cxx2
-rw-r--r--dbaccess/source/ui/app/AppView.cxx2
-rw-r--r--dbaccess/source/ui/browser/brwctrlr.cxx1
-rw-r--r--dbaccess/source/ui/browser/dataview.cxx1
-rw-r--r--dbaccess/source/ui/browser/dbtreeview.cxx2
-rw-r--r--dbaccess/source/ui/browser/sbagrid.cxx2
-rw-r--r--dbaccess/source/ui/browser/unodatbr.cxx2
-rw-r--r--dbaccess/source/ui/control/FieldDescControl.cxx2
-rw-r--r--dbaccess/source/ui/control/RelationControl.cxx2
-rw-r--r--dbaccess/source/ui/control/sqledit.cxx2
-rw-r--r--dbaccess/source/ui/dlg/ConnectionHelper.cxx2
-rw-r--r--dbaccess/source/ui/dlg/ConnectionPage.cxx2
-rw-r--r--dbaccess/source/ui/dlg/ConnectionPageSetup.cxx2
-rw-r--r--dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx2
-rw-r--r--dbaccess/source/ui/dlg/RelationDlg.cxx2
-rw-r--r--dbaccess/source/ui/dlg/TextConnectionHelper.cxx2
-rw-r--r--dbaccess/source/ui/dlg/adtabdlg.cxx2
-rw-r--r--dbaccess/source/ui/dlg/dbwiz.cxx2
-rw-r--r--dbaccess/source/ui/dlg/dbwizsetup.cxx2
-rw-r--r--dbaccess/source/ui/dlg/detailpages.cxx2
-rw-r--r--dbaccess/source/ui/dlg/dlgsave.cxx2
-rw-r--r--dbaccess/source/ui/dlg/indexdialog.cxx2
-rw-r--r--dbaccess/source/ui/dlg/indexfieldscontrol.cxx2
-rw-r--r--dbaccess/source/ui/dlg/sqlmessage.cxx2
-rw-r--r--dbaccess/source/ui/dlg/tablespage.cxx2
-rw-r--r--dbaccess/source/ui/misc/UITools.cxx2
-rw-r--r--dbaccess/source/ui/misc/WCPage.cxx2
-rw-r--r--dbaccess/source/ui/misc/WNameMatch.cxx2
-rw-r--r--dbaccess/source/ui/misc/WTypeSelect.cxx2
-rw-r--r--dbaccess/source/ui/querydesign/QTableWindow.cxx2
-rw-r--r--dbaccess/source/ui/querydesign/QueryTableView.cxx2
-rw-r--r--dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx2
-rw-r--r--dbaccess/source/ui/relationdesign/RelationTableView.cxx2
-rw-r--r--dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx2
-rw-r--r--dbaccess/source/ui/tabledesign/TEditControl.cxx2
-rw-r--r--dbaccess/source/ui/tabledesign/TableDesignControl.cxx2
-rw-r--r--dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx2
-rw-r--r--dbaccess/source/ui/tabledesign/TableDesignView.cxx2
-rw-r--r--dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx2
-rw-r--r--desktop/source/app/app.cxx2
-rw-r--r--desktop/source/deployment/gui/dp_gui_dialog2.cxx4
-rw-r--r--desktop/source/inc/helpids.h (renamed from desktop/source/inc/helpid.hrc)4
-rw-r--r--editeng/inc/helpids.h (renamed from editeng/inc/helpid.hrc)4
-rw-r--r--editeng/source/editeng/editview.cxx2
-rw-r--r--editeng/source/items/frmitems.cxx4
-rw-r--r--editeng/source/items/justifyitem.cxx2
-rw-r--r--editeng/source/items/paraitem.cxx3
-rw-r--r--editeng/source/items/textitem.cxx3
-rw-r--r--editeng/source/misc/svxacorr.cxx2
-rw-r--r--editeng/source/uno/unofdesc.cxx2
-rw-r--r--extensions/inc/abpilot.hrc32
-rw-r--r--extensions/inc/bibliography.hrc58
-rw-r--r--extensions/inc/dbpilots.hrc38
-rw-r--r--extensions/inc/extensio.hrc42
-rw-r--r--extensions/inc/helpids.h (renamed from extensions/inc/propctrlr.hrc)125
-rw-r--r--extensions/inc/propctrlr.h84
-rw-r--r--extensions/inc/update.hrc36
-rw-r--r--extensions/source/abpilot/abspilot.cxx2
-rw-r--r--extensions/source/bibliography/bibbeam.cxx2
-rw-r--r--extensions/source/bibliography/bibmod.cxx2
-rw-r--r--extensions/source/bibliography/bibprop.hxx (renamed from extensions/source/bibliography/bibprop.hrc)4
-rw-r--r--extensions/source/bibliography/datman.cxx4
-rw-r--r--extensions/source/bibliography/framectr.cxx2
-rw-r--r--extensions/source/bibliography/general.cxx4
-rw-r--r--extensions/source/dbpilots/gridwizard.cxx2
-rw-r--r--extensions/source/dbpilots/groupboxwiz.cxx2
-rw-r--r--extensions/source/dbpilots/listcombowizard.cxx2
-rw-r--r--extensions/source/propctrlr/browserview.cxx3
-rw-r--r--extensions/source/propctrlr/defaultforminspection.cxx3
-rw-r--r--extensions/source/propctrlr/eformspropertyhandler.cxx2
-rw-r--r--extensions/source/propctrlr/eventhandler.cxx3
-rw-r--r--extensions/source/propctrlr/formcomponenthandler.cxx3
-rw-r--r--extensions/source/propctrlr/formcontroller.cxx2
-rw-r--r--extensions/source/propctrlr/formmetadata.cxx3
-rw-r--r--extensions/source/propctrlr/listselectiondlg.hrc29
-rw-r--r--extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx2
-rw-r--r--extensions/source/update/check/updatehdl.cxx2
-rw-r--r--extensions/source/update/ui/updatecheckui.cxx1
-rw-r--r--filter/inc/filter.hrc36
-rw-r--r--forms/source/component/CheckBox.cxx1
-rw-r--r--forms/source/component/Columns.cxx1
-rw-r--r--forms/source/component/ComboBox.cxx1
-rw-r--r--forms/source/component/DatabaseForm.cxx1
-rw-r--r--forms/source/component/EditBase.cxx1
-rw-r--r--forms/source/component/File.cxx1
-rw-r--r--forms/source/component/Filter.cxx1
-rw-r--r--forms/source/component/FixedText.cxx1
-rw-r--r--forms/source/component/FormComponent.cxx1
-rw-r--r--forms/source/component/FormattedField.cxx1
-rw-r--r--forms/source/component/Grid.cxx1
-rw-r--r--forms/source/component/GroupBox.cxx1
-rw-r--r--forms/source/component/GroupManager.cxx2
-rw-r--r--forms/source/component/Hidden.cxx1
-rw-r--r--forms/source/component/ImageControl.cxx1
-rw-r--r--forms/source/component/ListBox.cxx1
-rw-r--r--forms/source/component/RadioButton.cxx1
-rw-r--r--forms/source/component/formcontrolfont.cxx2
-rw-r--r--forms/source/inc/FormComponent.hxx1
-rw-r--r--forms/source/inc/property.hrc304
-rw-r--r--forms/source/inc/property.hxx272
-rw-r--r--forms/source/misc/InterfaceContainer.cxx1
-rw-r--r--forms/source/misc/property.cxx2
-rw-r--r--forms/source/richtext/richtextcontrol.cxx1
-rw-r--r--forms/source/xforms/datatyperepository.cxx2
-rw-r--r--forms/source/xforms/datatypes.cxx3
-rw-r--r--formula/inc/core_resource.hrc2
-rw-r--r--formula/source/core/api/token.cxx2
-rw-r--r--formula/source/ui/dlg/formdlgs.hrc24
-rw-r--r--formula/source/ui/dlg/formula.cxx5
-rw-r--r--fpicker/source/aqua/resourceprovider.mm2
-rw-r--r--fpicker/source/office/RemoteFilesDialog.hxx2
-rw-r--r--fpicker/source/office/iodlg.cxx4
-rw-r--r--fpicker/source/win32/misc/resourceprovider.cxx2
-rw-r--r--include/basic/sbxdef.hxx8
-rw-r--r--include/editeng/memberids.h (renamed from include/editeng/memberids.hrc)6
-rw-r--r--include/editeng/unotext.hxx2
-rw-r--r--include/formula/compiler.hxx (renamed from include/formula/compiler.hrc)4
-rw-r--r--include/formula/opcode.hxx2
-rw-r--r--include/fpicker/strings.hrc (renamed from include/fpicker/fpicker.hrc)0
-rw-r--r--include/i18nlangtag/lang.h6
-rw-r--r--include/rtl/textenc.h8
-rw-r--r--include/sfx2/dialogs.hrc26
-rw-r--r--include/sfx2/event.hxx13
-rw-r--r--include/sfx2/groupid.hxx40
-rw-r--r--include/sfx2/objface.hxx26
-rw-r--r--include/sfx2/pageids.hxx (renamed from cui/source/inc/cuires.hrc)33
-rw-r--r--include/sfx2/sfx.hrc162
-rw-r--r--include/sfx2/sfxsids.hrc2
-rw-r--r--include/svl/memberid.h (renamed from include/svl/memberid.hrc)22
-rw-r--r--include/svl/solar.hrc104
-rw-r--r--include/svtools/addresstemplate.hxx2
-rw-r--r--include/svtools/ehdl.hxx4
-rw-r--r--include/svtools/helpids.h (renamed from include/svtools/helpid.hrc)4
-rw-r--r--include/svtools/imagemgr.hxx53
-rw-r--r--include/svtools/soerr.hxx4
-rw-r--r--include/svx/dialogs.hrc3
-rw-r--r--include/svx/exthelpid.hrc34
-rw-r--r--include/svx/float3d.hxx23
-rw-r--r--include/svx/imapdlg.hxx22
-rw-r--r--include/svx/strings.hrc275
-rw-r--r--include/svx/svxerr.hxx4
-rw-r--r--include/svx/svxids.hrc4
-rw-r--r--include/svx/svxitems.hrc8
-rw-r--r--include/svx/ucsubset.hrc307
-rw-r--r--include/svx/ucsubset.hxx1
-rw-r--r--include/vcl/errcode.hxx8
-rw-r--r--include/vcl/errinf.hxx3
-rw-r--r--reportdesign/inc/helpids.h (renamed from reportdesign/inc/helpids.hrc)4
-rw-r--r--reportdesign/source/ui/dlg/AddField.cxx2
-rw-r--r--reportdesign/source/ui/dlg/CondFormat.cxx2
-rw-r--r--reportdesign/source/ui/dlg/Condition.cxx2
-rw-r--r--reportdesign/source/ui/dlg/DateTime.cxx2
-rw-r--r--reportdesign/source/ui/dlg/Formula.cxx2
-rw-r--r--reportdesign/source/ui/dlg/GroupsSorting.cxx2
-rw-r--r--reportdesign/source/ui/dlg/Navigator.cxx2
-rw-r--r--reportdesign/source/ui/dlg/PageNumber.cxx2
-rw-r--r--reportdesign/source/ui/inspection/DataProviderHandler.cxx2
-rw-r--r--reportdesign/source/ui/inspection/DefaultInspection.cxx2
-rw-r--r--reportdesign/source/ui/inspection/GeometryHandler.cxx2
-rw-r--r--reportdesign/source/ui/inspection/metadata.cxx2
-rw-r--r--reportdesign/source/ui/report/DesignView.cxx2
-rw-r--r--reportdesign/source/ui/report/EndMarker.cxx2
-rw-r--r--reportdesign/source/ui/report/ReportController.cxx4
-rw-r--r--reportdesign/source/ui/report/ReportSection.cxx2
-rw-r--r--reportdesign/source/ui/report/ReportWindow.cxx2
-rw-r--r--reportdesign/source/ui/report/SectionWindow.cxx2
-rw-r--r--reportdesign/source/ui/report/StartMarker.cxx2
-rw-r--r--reportdesign/source/ui/report/ViewsWindow.cxx2
-rw-r--r--sc/inc/cfgids.hxx32
-rw-r--r--sc/inc/helpids.h5
-rw-r--r--sc/inc/mid.h (renamed from sc/inc/mid.hrc)4
-rw-r--r--sc/inc/sc.hrc2
-rw-r--r--sc/inc/scres.hrc2
-rw-r--r--sc/sdi/scslots.hrc5
-rw-r--r--sc/source/core/data/attrib.cxx2
-rw-r--r--sc/source/core/data/funcdesc.cxx2
-rw-r--r--sc/source/core/tool/appoptio.cxx3
-rw-r--r--sc/source/core/tool/docoptio.cxx1
-rw-r--r--sc/source/core/tool/inputopt.cxx1
-rw-r--r--sc/source/core/tool/token.cxx2
-rw-r--r--sc/source/core/tool/viewopti.cxx1
-rw-r--r--sc/source/filter/excel/xlchart.cxx2
-rw-r--r--sc/source/filter/xml/editattributemap.cxx2
-rw-r--r--sc/source/ui/app/inputwin.cxx2
-rw-r--r--sc/source/ui/app/scdll.cxx1
-rw-r--r--sc/source/ui/app/scmod.cxx3
-rw-r--r--sc/source/ui/app/typemap.cxx4
-rw-r--r--sc/source/ui/docshell/docsh.cxx1
-rw-r--r--sc/source/ui/unoobj/afmtuno.cxx2
-rw-r--r--sc/source/ui/unoobj/defltuno.cxx2
-rw-r--r--sc/source/ui/unoobj/styleuno.cxx2
-rw-r--r--scripting/source/dlgprov/dlgevtatt.cxx1
-rw-r--r--sd/inc/app.hrc2
-rw-r--r--sd/inc/errhdl.hrc1
-rw-r--r--sd/inc/family.hrc1
-rw-r--r--sd/inc/glob.hrc32
-rw-r--r--sd/inc/helpids.h6
-rw-r--r--sd/inc/sdabstdlg.hxx2
-rw-r--r--sd/inc/sdattr.hrc2
-rw-r--r--sd/inc/sdattr.hxx1
-rw-r--r--sd/qa/unit/dialogs-test.cxx3
-rw-r--r--sd/sdi/sdslots.hrc3
-rw-r--r--sd/source/core/drawdoc2.cxx1
-rw-r--r--sd/source/core/drawdoc3.cxx1
-rw-r--r--sd/source/core/typemap.cxx2
-rw-r--r--sd/source/filter/grf/sdgrffilter.cxx1
-rw-r--r--sd/source/filter/html/sdhtmlfilter.cxx1
-rw-r--r--sd/source/ui/app/optsitem.cxx108
-rw-r--r--sd/source/ui/app/sddll.cxx1
-rw-r--r--sd/source/ui/app/sdmod.cxx9
-rw-r--r--sd/source/ui/dlg/prltempl.cxx5
-rw-r--r--sd/source/ui/dlg/sddlgfact.cxx4
-rw-r--r--sd/source/ui/dlg/sddlgfact.hxx2
-rw-r--r--sd/source/ui/func/fuprobjs.cxx3
-rw-r--r--sd/source/ui/func/futempl.cxx13
-rw-r--r--sd/source/ui/inc/ViewShell.hxx1
-rw-r--r--sd/source/ui/inc/cfgids.hxx34
-rw-r--r--sd/source/ui/inc/optsitem.hxx24
-rw-r--r--sd/source/ui/inc/prltempl.hrc24
-rw-r--r--sd/source/ui/inc/prltempl.hxx2
-rw-r--r--sd/source/ui/unoidl/unoobj.cxx1
-rw-r--r--sd/source/ui/view/drviewsf.cxx1
-rw-r--r--sdext/source/minimizer/optimizerdialog.hrc30
-rw-r--r--sdext/source/minimizer/optimizerdialog.hxx6
-rw-r--r--sfx2/sdi/sfxslots.sdi2
-rw-r--r--sfx2/source/appl/appmisc.cxx5
-rw-r--r--sfx2/source/appl/appserv.cxx5
-rw-r--r--sfx2/source/appl/module.cxx1
-rw-r--r--sfx2/source/appl/newhelp.cxx3
-rw-r--r--sfx2/source/appl/newhelp.hrc31
-rw-r--r--sfx2/source/appl/newhelp.hxx5
-rw-r--r--sfx2/source/appl/sfxpicklist.cxx1
-rw-r--r--sfx2/source/appl/workwin.cxx14
-rw-r--r--sfx2/source/bastyp/frmhtml.cxx2
-rw-r--r--sfx2/source/bastyp/frmhtmlw.cxx1
-rw-r--r--sfx2/source/control/bindings.cxx1
-rw-r--r--sfx2/source/control/dispatch.cxx14
-rw-r--r--sfx2/source/control/msgpool.cxx1
-rw-r--r--sfx2/source/control/objface.cxx14
-rw-r--r--sfx2/source/control/recentdocsview.cxx1
-rw-r--r--sfx2/source/dialog/backingcomp.cxx2
-rw-r--r--sfx2/source/dialog/dinfdlg.cxx1
-rw-r--r--sfx2/source/dialog/filedlghelper.cxx4
-rw-r--r--sfx2/source/dialog/filtergrouping.cxx1
-rw-r--r--sfx2/source/dialog/infobar.cxx2
-rw-r--r--sfx2/source/dialog/mgetempl.cxx1
-rw-r--r--sfx2/source/dialog/navigat.cxx3
-rw-r--r--sfx2/source/dialog/securitypage.cxx1
-rw-r--r--sfx2/source/dialog/tabdlg.cxx2
-rw-r--r--sfx2/source/dialog/templdlg.cxx3
-rw-r--r--sfx2/source/dialog/tplcitem.cxx1
-rw-r--r--sfx2/source/doc/docfac.cxx1
-rw-r--r--sfx2/source/doc/objembed.cxx1
-rw-r--r--sfx2/source/doc/objmisc.cxx3
-rw-r--r--sfx2/source/doc/objserv.cxx2
-rw-r--r--sfx2/source/doc/objxtor.cxx2
-rw-r--r--sfx2/source/doc/querytemplate.cxx2
-rw-r--r--sfx2/source/doc/sfxbasemodel.cxx1
-rw-r--r--sfx2/source/doc/zoomitem.cxx1
-rw-r--r--sfx2/source/inc/helpids.h (renamed from sfx2/source/inc/helpid.hrc)4
-rw-r--r--sfx2/source/inc/workwin.hxx10
-rw-r--r--sfx2/source/inet/inettbc.cxx1
-rw-r--r--sfx2/source/sidebar/SidebarChildWindow.cxx2
-rw-r--r--sfx2/source/statbar/stbitem.cxx1
-rw-r--r--sfx2/source/toolbox/tbxitem.cxx3
-rw-r--r--sfx2/source/view/classificationcontroller.cxx1
-rw-r--r--sfx2/source/view/classificationhelper.cxx1
-rw-r--r--sfx2/source/view/frmload.cxx1
-rw-r--r--sfx2/source/view/sfxbasecontroller.cxx1
-rw-r--r--sfx2/source/view/viewfrm.cxx1
-rw-r--r--sfx2/source/view/viewprn.cxx2
-rw-r--r--solenv/bin/concat-deps.c5
-rw-r--r--solenv/doc/gbuild/solenv/gbuild/types.mk9
-rw-r--r--solenv/gbuild/TargetLocations.mk7
-rw-r--r--solenv/gbuild/platform/com_GCC_class.mk12
-rw-r--r--solenv/gbuild/platform/com_MSC_class.mk21
-rw-r--r--starmath/inc/starmath.hrc5
-rw-r--r--starmath/source/dialog.cxx1
-rw-r--r--starmath/source/document.cxx1
-rw-r--r--starmath/source/smmod.cxx3
-rw-r--r--starmath/source/view.cxx1
-rw-r--r--svl/source/items/ptitem.cxx2
-rw-r--r--svl/source/items/rectitem.cxx2
-rw-r--r--svl/source/items/srchitem.cxx2
-rw-r--r--svl/source/items/szitem.cxx2
-rw-r--r--svtools/source/dialogs/addresstemplate.cxx3
-rw-r--r--svtools/source/dialogs/addresstemplate.hrc28
-rw-r--r--svtools/source/dialogs/wizardmachine.cxx2
-rw-r--r--svtools/source/misc/imagemgr.cxx1
-rw-r--r--svtools/source/misc/imagemgr.hrc77
-rw-r--r--svx/inc/float3d.hrc44
-rw-r--r--svx/inc/fmhelp.hrc38
-rw-r--r--svx/inc/helpids.h (renamed from svx/inc/helpid.hrc)23
-rw-r--r--svx/inc/ucsubsetstruct.hrc312
-rw-r--r--svx/sdi/svxslots.hrc3
-rw-r--r--svx/source/dialog/_bmpmask.cxx2
-rw-r--r--svx/source/dialog/charmap.cxx554
-rw-r--r--svx/source/dialog/ctredlin.cxx2
-rw-r--r--svx/source/dialog/dlgctl3d.cxx2
-rw-r--r--svx/source/dialog/imapdlg.cxx1
-rw-r--r--svx/source/dialog/imapdlg.hrc48
-rw-r--r--svx/source/dialog/imapwnd.cxx1
-rw-r--r--svx/source/dialog/svxbmpnumvalueset.cxx2
-rw-r--r--svx/source/engine3d/float3d.cxx1
-rw-r--r--svx/source/fmcomp/dbaexchange.cxx2
-rw-r--r--svx/source/fmcomp/dbaobjectex.cxx2
-rw-r--r--svx/source/fmcomp/fmgridcl.cxx2
-rw-r--r--svx/source/fmcomp/fmgridif.cxx2
-rw-r--r--svx/source/fmcomp/gridcell.cxx2
-rw-r--r--svx/source/fmcomp/gridctrl.cxx4
-rw-r--r--svx/source/form/datanavi.cxx4
-rw-r--r--svx/source/form/filtnav.cxx4
-rw-r--r--svx/source/form/fmPropBrw.cxx4
-rw-r--r--svx/source/form/fmcontrolbordermanager.cxx2
-rw-r--r--svx/source/form/fmcontrollayout.cxx2
-rw-r--r--svx/source/form/fmexpl.cxx4
-rw-r--r--svx/source/form/fmobj.cxx2
-rw-r--r--svx/source/form/fmobjfac.cxx2
-rw-r--r--svx/source/form/fmpage.cxx2
-rw-r--r--svx/source/form/fmpgeimp.cxx2
-rw-r--r--svx/source/form/fmshell.cxx2
-rw-r--r--svx/source/form/fmshimp.cxx2
-rw-r--r--svx/source/form/fmsrcimp.cxx2
-rw-r--r--svx/source/form/fmtextcontrolshell.cxx2
-rw-r--r--svx/source/form/fmtools.cxx2
-rw-r--r--svx/source/form/fmundo.cxx3
-rw-r--r--svx/source/form/fmview.cxx2
-rw-r--r--svx/source/form/fmvwimp.cxx2
-rw-r--r--svx/source/form/formcontrolfactory.cxx2
-rw-r--r--svx/source/form/formcontroller.cxx2
-rw-r--r--svx/source/form/formcontrolling.cxx2
-rw-r--r--svx/source/form/navigatortree.cxx4
-rw-r--r--svx/source/form/navigatortreemodel.cxx4
-rw-r--r--svx/source/form/tabwin.cxx4
-rw-r--r--svx/source/form/tbxform.cxx2
-rw-r--r--svx/source/form/typemap.cxx2
-rw-r--r--svx/source/gallery2/galbrws1.cxx2
-rw-r--r--svx/source/gallery2/galbrws2.cxx2
-rw-r--r--svx/source/gallery2/galctrl.cxx2
-rw-r--r--svx/source/inc/fmprop.hxx (renamed from svx/source/inc/fmprop.hrc)4
-rw-r--r--svx/source/items/hlnkitem.cxx4
-rw-r--r--svx/source/sidebar/area/AreaPropertyPanel.cxx2
-rw-r--r--svx/source/sidebar/area/AreaPropertyPanelBase.cxx2
-rw-r--r--svx/source/sidebar/text/TextCharacterSpacingControl.cxx3
-rw-r--r--svx/source/sidebar/text/TextPropertyPanel.hrc25
-rw-r--r--svx/source/sidebar/text/TextUnderlineControl.cxx4
-rw-r--r--svx/source/tbxctrls/colrctrl.cxx2
-rw-r--r--svx/source/tbxctrls/extrusioncontrols.cxx2
-rw-r--r--svx/source/tbxctrls/fillctrl.cxx2
-rw-r--r--svx/source/tbxctrls/fontworkgallery.cxx2
-rw-r--r--svx/source/tbxctrls/linectrl.cxx2
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx2
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx2
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx2
-rw-r--r--svx/source/unodraw/unobtabl.cxx2
-rw-r--r--svx/source/unodraw/unomod.cxx2
-rw-r--r--svx/source/xoutdev/xattr.cxx2
-rw-r--r--svx/source/xoutdev/xattrbmp.cxx2
-rw-r--r--sw/inc/app.hrc1
-rw-r--r--sw/inc/chrdlg.hrc29
-rw-r--r--sw/inc/cmdid.h2
-rw-r--r--sw/inc/comcore.hxx (renamed from sw/inc/comcore.hrc)6
-rw-r--r--sw/inc/dialog.hrc31
-rw-r--r--sw/inc/fldui.hrc107
-rw-r--r--sw/inc/globals.hrc5
-rw-r--r--sw/inc/helpids.h (renamed from sw/inc/helpid.h)5
-rw-r--r--sw/inc/index.hrc33
-rw-r--r--sw/inc/pch/precompiled_sw.hxx2
-rw-r--r--sw/inc/pch/precompiled_swui.hxx2
-rw-r--r--sw/inc/rcid.hrc231
-rw-r--r--sw/inc/swabstdlg.hxx25
-rw-r--r--sw/inc/swevent.hxx2
-rw-r--r--sw/sdi/swslots.hrc2
-rw-r--r--sw/source/core/access/accpara.cxx1
-rw-r--r--sw/source/core/doc/DocumentStylePoolManager.cxx1
-rw-r--r--sw/source/core/doc/SwStyleNameMapper.cxx1
-rw-r--r--sw/source/core/doc/textboxhelper.cxx2
-rw-r--r--sw/source/core/edit/autofmt.cxx2
-rw-r--r--sw/source/core/undo/docundo.cxx1
-rw-r--r--sw/source/core/undo/rolbck.cxx1
-rw-r--r--sw/source/core/undo/undel.cxx1
-rw-r--r--sw/source/core/undo/undo.hrc24
-rw-r--r--sw/source/core/undo/undobj.cxx1
-rw-r--r--sw/source/core/undo/unins.cxx1
-rw-r--r--sw/source/core/undo/unovwr.cxx1
-rw-r--r--sw/source/core/unocore/swunohelper.cxx2
-rw-r--r--sw/source/core/unocore/unocoll.cxx1
-rw-r--r--sw/source/core/unocore/unoframe.cxx2
-rw-r--r--sw/source/core/unocore/unomap.cxx2
-rw-r--r--sw/source/core/unocore/unomap1.cxx2
-rw-r--r--sw/source/core/unocore/unosett.cxx2
-rw-r--r--sw/source/core/unocore/unostyle.cxx2
-rw-r--r--sw/source/core/unocore/unotbl.cxx2
-rw-r--r--sw/source/filter/html/htmlatr.cxx2
-rw-r--r--sw/source/filter/html/htmlbas.cxx1
-rw-r--r--sw/source/filter/html/htmlflywriter.cxx1
-rw-r--r--sw/source/filter/html/htmlgrin.cxx2
-rw-r--r--sw/source/filter/html/swhtml.cxx2
-rw-r--r--sw/source/filter/xml/xmlbrsh.cxx2
-rw-r--r--sw/source/filter/xml/xmlexpit.cxx2
-rw-r--r--sw/source/filter/xml/xmlimpit.cxx2
-rw-r--r--sw/source/filter/xml/xmliteme.cxx2
-rw-r--r--sw/source/filter/xml/xmlitemi.cxx2
-rw-r--r--sw/source/filter/xml/xmlitemm.cxx2
-rw-r--r--sw/source/ui/chrdlg/break.cxx1
-rw-r--r--sw/source/ui/chrdlg/chardlg.cxx3
-rw-r--r--sw/source/ui/chrdlg/drpcps.cxx2
-rw-r--r--sw/source/ui/chrdlg/numpara.cxx2
-rw-r--r--sw/source/ui/chrdlg/pardlg.cxx1
-rw-r--r--sw/source/ui/chrdlg/swuiccoll.cxx3
-rw-r--r--sw/source/ui/chrdlg/tblnumfm.cxx2
-rw-r--r--sw/source/ui/config/mailconfigpage.cxx2
-rw-r--r--sw/source/ui/config/optload.cxx2
-rw-r--r--sw/source/ui/dbui/addresslistdialog.cxx2
-rw-r--r--sw/source/ui/dbui/createaddresslistdialog.cxx2
-rw-r--r--sw/source/ui/dbui/customizeaddresslistdialog.cxx2
-rw-r--r--sw/source/ui/dbui/dbinsdlg.cxx4
-rw-r--r--sw/source/ui/dbui/mailmergewizard.cxx2
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.cxx2
-rw-r--r--sw/source/ui/dbui/mmgreetingspage.cxx2
-rw-r--r--sw/source/ui/dbui/mmoutputtypepage.cxx2
-rw-r--r--sw/source/ui/dbui/mmresultdialogs.cxx2
-rw-r--r--sw/source/ui/dbui/selectdbtabledialog.cxx2
-rw-r--r--sw/source/ui/dialog/abstract.cxx1
-rw-r--r--sw/source/ui/dialog/addrdlg.cxx2
-rw-r--r--sw/source/ui/dialog/ascfldlg.cxx3
-rw-r--r--sw/source/ui/dialog/swdlgfact.cxx130
-rw-r--r--sw/source/ui/dialog/swdlgfact.hxx21
-rw-r--r--sw/source/ui/dialog/uiregionsw.cxx2
-rw-r--r--sw/source/ui/dialog/wordcountdialog.cxx1
-rw-r--r--sw/source/ui/envelp/envfmt.cxx1
-rw-r--r--sw/source/ui/envelp/envlop1.cxx2
-rw-r--r--sw/source/ui/envelp/label1.cxx3
-rw-r--r--sw/source/ui/envelp/mailmrge.cxx2
-rw-r--r--sw/source/ui/fldui/DropDownFieldDialog.cxx1
-rw-r--r--sw/source/ui/fldui/FldRefTreeListBox.cxx2
-rw-r--r--sw/source/ui/fldui/changedb.cxx1
-rw-r--r--sw/source/ui/fldui/flddb.cxx1
-rw-r--r--sw/source/ui/fldui/flddinf.cxx4
-rw-r--r--sw/source/ui/fldui/flddok.cxx3
-rw-r--r--sw/source/ui/fldui/fldedt.cxx12
-rw-r--r--sw/source/ui/fldui/fldfunc.cxx1
-rw-r--r--sw/source/ui/fldui/fldref.cxx1
-rw-r--r--sw/source/ui/fldui/fldtdlg.cxx3
-rw-r--r--sw/source/ui/fldui/fldvar.cxx1
-rw-r--r--sw/source/ui/fldui/inpdlg.cxx2
-rw-r--r--sw/source/ui/fldui/javaedit.cxx1
-rw-r--r--sw/source/ui/fmtui/tmpdlg.cxx2
-rw-r--r--sw/source/ui/frmdlg/column.cxx3
-rw-r--r--sw/source/ui/frmdlg/cption.cxx1
-rw-r--r--sw/source/ui/frmdlg/frmdlg.cxx1
-rw-r--r--sw/source/ui/frmdlg/frmpage.cxx3
-rw-r--r--sw/source/ui/frmdlg/pattern.cxx1
-rw-r--r--sw/source/ui/frmdlg/uiborder.cxx1
-rw-r--r--sw/source/ui/frmdlg/wrap.cxx1
-rw-r--r--sw/source/ui/index/cntex.cxx1
-rw-r--r--sw/source/ui/index/cnttab.cxx3
-rw-r--r--sw/source/ui/index/multmrk.cxx2
-rw-r--r--sw/source/ui/index/swuiidxmrk.cxx3
-rw-r--r--sw/source/ui/misc/docfnote.cxx4
-rw-r--r--sw/source/ui/misc/glosbib.cxx1
-rw-r--r--sw/source/ui/misc/glossary.cxx3
-rw-r--r--sw/source/ui/misc/insfnote.cxx1
-rw-r--r--sw/source/ui/misc/num.cxx4
-rw-r--r--sw/source/ui/misc/outline.cxx3
-rw-r--r--sw/source/ui/misc/pgfnote.cxx1
-rw-r--r--sw/source/ui/misc/srtdlg.cxx1
-rw-r--r--sw/source/ui/misc/swmodalredlineacceptdlg.cxx3
-rw-r--r--sw/source/ui/table/colwd.cxx1
-rw-r--r--sw/source/ui/table/convert.cxx1
-rw-r--r--sw/source/ui/table/instable.cxx2
-rw-r--r--sw/source/ui/table/rowht.cxx1
-rw-r--r--sw/source/ui/table/splittbl.cxx1
-rw-r--r--sw/source/ui/table/tabledlg.cxx1
-rw-r--r--sw/source/uibase/app/apphdl.cxx3
-rw-r--r--sw/source/uibase/app/applab.cxx1
-rw-r--r--sw/source/uibase/app/docsh.cxx3
-rw-r--r--sw/source/uibase/app/docsh2.cxx8
-rw-r--r--sw/source/uibase/app/swdll.cxx1
-rw-r--r--sw/source/uibase/app/swmodul1.cxx2
-rw-r--r--sw/source/uibase/chrdlg/ccoll.cxx3
-rw-r--r--sw/source/uibase/dbui/dbtree.cxx2
-rw-r--r--sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx1
-rw-r--r--sw/source/uibase/dialog/regionsw.cxx2
-rw-r--r--sw/source/uibase/dialog/wordcountwrapper.cxx1
-rw-r--r--sw/source/uibase/dochdl/gloshdl.cxx1
-rw-r--r--sw/source/uibase/docvw/edtwin.cxx2
-rw-r--r--sw/source/uibase/docvw/romenu.cxx2
-rw-r--r--sw/source/uibase/docvw/srcedtw.cxx2
-rw-r--r--sw/source/uibase/envelp/labimg.cxx1
-rw-r--r--sw/source/uibase/fldui/fldmgr.cxx2
-rw-r--r--sw/source/uibase/fldui/fldwrap.cxx3
-rw-r--r--sw/source/uibase/globdoc/globdoc.cxx1
-rw-r--r--sw/source/uibase/inc/cfgid.h28
-rw-r--r--sw/source/uibase/inc/frmui.hrc32
-rw-r--r--sw/source/uibase/inc/misc.hrc31
-rw-r--r--sw/source/uibase/inc/olmenu.hxx38
-rw-r--r--sw/source/uibase/inc/table.hrc30
-rw-r--r--sw/source/uibase/index/idxmrk.cxx3
-rw-r--r--sw/source/uibase/lingu/hhcwrp.cxx2
-rw-r--r--sw/source/uibase/lingu/hyp.cxx2
-rw-r--r--sw/source/uibase/lingu/olmenu.cxx4
-rw-r--r--sw/source/uibase/lingu/olmenu.hrc65
-rw-r--r--sw/source/uibase/misc/glshell.cxx1
-rw-r--r--sw/source/uibase/misc/numberingtypelistbox.cxx1
-rw-r--r--sw/source/uibase/misc/redlndlg.cxx3
-rw-r--r--sw/source/uibase/misc/swruler.cxx1
-rw-r--r--sw/source/uibase/ribbar/inputwin.cxx3
-rw-r--r--sw/source/uibase/ribbar/workctrl.cxx3
-rw-r--r--sw/source/uibase/shells/annotsh.cxx2
-rw-r--r--sw/source/uibase/shells/basesh.cxx23
-rw-r--r--sw/source/uibase/shells/beziersh.cxx2
-rw-r--r--sw/source/uibase/shells/drawsh.cxx3
-rw-r--r--sw/source/uibase/shells/drformsh.cxx2
-rw-r--r--sw/source/uibase/shells/drwbassh.cxx3
-rw-r--r--sw/source/uibase/shells/drwtxtex.cxx2
-rw-r--r--sw/source/uibase/shells/drwtxtsh.cxx3
-rw-r--r--sw/source/uibase/shells/frmsh.cxx3
-rw-r--r--sw/source/uibase/shells/listsh.cxx2
-rw-r--r--sw/source/uibase/shells/navsh.cxx2
-rw-r--r--sw/source/uibase/shells/olesh.cxx2
-rw-r--r--sw/source/uibase/shells/slotadd.cxx2
-rw-r--r--sw/source/uibase/shells/tabsh.cxx20
-rw-r--r--sw/source/uibase/shells/textfld.cxx2
-rw-r--r--sw/source/uibase/shells/textglos.cxx1
-rw-r--r--sw/source/uibase/shells/textidx.cxx7
-rw-r--r--sw/source/uibase/shells/textsh.cxx9
-rw-r--r--sw/source/uibase/shells/textsh1.cxx6
-rw-r--r--sw/source/uibase/shells/txtattr.cxx9
-rw-r--r--sw/source/uibase/shells/txtnum.cxx7
-rw-r--r--sw/source/uibase/table/swtablerep.cxx1
-rw-r--r--sw/source/uibase/table/tablemgr.cxx1
-rw-r--r--sw/source/uibase/uiview/pview.cxx2
-rw-r--r--sw/source/uibase/uiview/srcview.cxx2
-rw-r--r--sw/source/uibase/uiview/view.cxx6
-rw-r--r--sw/source/uibase/uiview/view0.cxx9
-rw-r--r--sw/source/uibase/uiview/view2.cxx2
-rw-r--r--sw/source/uibase/uiview/viewdlg2.cxx2
-rw-r--r--sw/source/uibase/uiview/viewmdi.cxx2
-rw-r--r--sw/source/uibase/uno/SwXFilterOptions.cxx1
-rw-r--r--sw/source/uibase/utlui/content.cxx3
-rw-r--r--sw/source/uibase/utlui/glbltree.cxx2
-rw-r--r--sw/source/uibase/utlui/initui.cxx2
-rw-r--r--sw/source/uibase/utlui/navipi.cxx2
-rw-r--r--sw/source/uibase/utlui/numfmtlb.cxx10
-rw-r--r--sw/source/uibase/utlui/unotools.cxx1
-rw-r--r--sw/source/uibase/web/wdocsh.cxx1
-rw-r--r--sw/source/uibase/web/wolesh.cxx2
-rw-r--r--sw/source/uibase/web/wtabsh.cxx3
-rw-r--r--sw/source/uibase/wrtsh/wrtsh.hrc32
-rw-r--r--sw/source/uibase/wrtsh/wrtsh1.cxx1
-rw-r--r--sw/source/uibase/wrtsh/wrtsh2.cxx2
-rw-r--r--sw/source/uibase/wrtsh/wrtsh3.cxx1
-rw-r--r--sw/source/uibase/wrtsh/wrtundo.cxx2
-rw-r--r--vcl/unx/kde4/KDE4FilePicker.cxx2
-rw-r--r--writerfilter/source/rtftok/rtfdocumentimpl.cxx1
724 files changed, 1990 insertions, 4396 deletions
diff --git a/avmedia/inc/helpids.hrc b/avmedia/inc/helpids.h
index f7152de0621f..3d9a8c782369 100644
--- a/avmedia/inc/helpids.hrc
+++ b/avmedia/inc/helpids.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_AVMEDIA_INC_HELPIDS_HRC
-#define INCLUDED_AVMEDIA_INC_HELPIDS_HRC
+#ifndef INCLUDED_AVMEDIA_INC_HELPIDS_H
+#define INCLUDED_AVMEDIA_INC_HELPIDS_H
#define HID_AVMEDIA_TOOLBOXITEM_PLAY "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_PLAY"
#define HID_AVMEDIA_TOOLBOXITEM_PAUSE "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_PAUSE"
diff --git a/avmedia/source/framework/MediaControlBase.cxx b/avmedia/source/framework/MediaControlBase.cxx
index ba848c050915..09bd5bf146af 100644
--- a/avmedia/source/framework/MediaControlBase.cxx
+++ b/avmedia/source/framework/MediaControlBase.cxx
@@ -28,7 +28,7 @@
#include <vcl/lstbox.hxx>
#include "bitmaps.hlst"
#include "strings.hrc"
-#include "helpids.hrc"
+#include "helpids.h"
#include "mediamisc.hxx"
using ::rtl::OUString;
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx
index c5695c4f185a..614430a325ae 100644
--- a/avmedia/source/framework/mediacontrol.cxx
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -22,7 +22,7 @@
#include "mediamisc.hxx"
#include <avmedia/mediawindow.hxx>
#include <avmedia/mediaplayer.hxx>
-#include "helpids.hrc"
+#include "helpids.h"
#include <tools/time.hxx>
#include <svtools/miscopt.hxx>
#include <vcl/svapp.hxx>
diff --git a/avmedia/source/framework/mediaplayer.cxx b/avmedia/source/framework/mediaplayer.cxx
index 6cce70f2e026..a544d5103fc0 100644
--- a/avmedia/source/framework/mediaplayer.cxx
+++ b/avmedia/source/framework/mediaplayer.cxx
@@ -22,7 +22,7 @@
#include <avmedia/mediaitem.hxx>
#include "mediamisc.hxx"
#include "strings.hrc"
-#include "helpids.hrc"
+#include "helpids.h"
#include <svl/stritem.hxx>
#include <sfx2/app.hxx>
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index 13eb6626774f..78f709850861 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -25,7 +25,7 @@
#include "mediamisc.hxx"
#include "strings.hrc"
#include "bitmaps.hlst"
-#include "helpids.hrc"
+#include "helpids.h"
#include <algorithm>
#include <cmath>
diff --git a/basctl/inc/helpid.hrc b/basctl/inc/helpids.h
index 3bafa9769a10..1753df0a9ab5 100644
--- a/basctl/inc/helpid.hrc
+++ b/basctl/inc/helpids.h
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASCTL_INC_HELPID_HRC
-#define INCLUDED_BASCTL_INC_HELPID_HRC
+#ifndef INCLUDED_BASCTL_INC_HELPIDS_H
+#define INCLUDED_BASCTL_INC_HELPIDS_H
#define HID_BASICIDE_OBJECTCAT "BASCTL_HID_BASICIDE_OBJECTCAT"
diff --git a/basctl/sdi/basslots.hrc b/basctl/sdi/basslots.hrc
index 4d3b2341c6cc..3056ec844a14 100644
--- a/basctl/sdi/basslots.hrc
+++ b/basctl/sdi/basslots.hrc
@@ -18,6 +18,6 @@
*/
#include <svx/svxids.hrc>
-#include <editeng/memberids.hrc>
+#include <editeng/memberids.h>
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/basdoc.cxx b/basctl/source/basicide/basdoc.cxx
index 7d9f76f9305a..54560793133d 100644
--- a/basctl/source/basicide/basdoc.cxx
+++ b/basctl/source/basicide/basdoc.cxx
@@ -44,7 +44,7 @@ SFX_IMPL_SUPERCLASS_INTERFACE(basctl_DocShell, SfxObjectShell)
void basctl_DocShell::InitInterface_Impl()
{
- GetStaticInterface()->RegisterStatusBar(SID_BASICIDE_STATUSBAR);
+ GetStaticInterface()->RegisterStatusBar(StatusBarId::BasicIdeStatusBar);
}
DocShell::DocShell()
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index b8bfd80a0970..b3b3c44e23e2 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -25,7 +25,7 @@
#include "docsignature.hxx"
#include "officecfg/Office/BasicIDE.hxx"
-#include "helpid.hrc"
+#include "helpids.h"
#include <strings.hrc>
#include <basic/basmgr.hxx>
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 330feefdfd8c..631ab8a576e8 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -21,7 +21,7 @@
#include <cassert>
-#include "helpid.hrc"
+#include "helpids.h"
#include <strings.hrc>
#include "bitmaps.hlst"
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index 4fe135056e02..29b47d78739b 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -18,7 +18,7 @@
*/
#include "strings.hrc"
-#include "helpid.hrc"
+#include "helpids.h"
#include "accessibledialogwindow.hxx"
#include "baside3.hxx"
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index 000a43cdeecc..d1083a607380 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -19,7 +19,7 @@
#include <memory>
#include "strings.hrc"
-#include "helpid.hrc"
+#include "helpids.h"
#include "baside2.hxx"
#include "baside3.hxx"
diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx
index 27f852cd7b46..4873d8663b34 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -18,7 +18,7 @@
*/
#include "strings.hrc"
-#include "helpid.hrc"
+#include "helpids.h"
#include "baside2.hxx"
#include "baside3.hxx"
diff --git a/basctl/source/basicide/objdlg.cxx b/basctl/source/basicide/objdlg.cxx
index 292ff3bf000c..45c6353678d2 100644
--- a/basctl/source/basicide/objdlg.cxx
+++ b/basctl/source/basicide/objdlg.cxx
@@ -20,7 +20,7 @@
#include "strings.hrc"
#include "objdlg.hxx"
-#include "helpid.hrc"
+#include "helpids.h"
#include <svl/itemset.hxx>
#include <vcl/taskpanelist.hxx>
diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx
index ba6912605404..b603bf41781c 100644
--- a/basctl/source/dlged/managelang.cxx
+++ b/basctl/source/dlged/managelang.cxx
@@ -24,7 +24,7 @@
#include "localizationmgr.hxx"
#include "managelang.hxx"
-#include "helpid.hrc"
+#include "helpids.h"
#include "strings.hrc"
#include <com/sun/star/i18n/Boundary.hpp>
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index 9fa2399a1695..58b28cd88c81 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -19,7 +19,7 @@
#include "ChartTypeDialogController.hxx"
#include "ResId.hxx"
-#include "HelpIds.hrc"
+#include "helpids.h"
#include "strings.hrc"
#include "bitmaps.hlst"
#include "macros.hxx"
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index c371944f2a3f..bff4b4f2c6d6 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -32,7 +32,7 @@
#include "servicenames_charttypes.hxx"
#include "ResId.hxx"
#include "bitmaps.hlst"
-#include "HelpIds.hrc"
+#include "helpids.h"
#include <vcl/fixed.hxx>
#include <vcl/image.hxx>
diff --git a/chart2/source/controller/dialogs/ResourceIds.hrc b/chart2/source/controller/dialogs/TabPageIds.h
index dd027e2b025d..0058fd33e914 100644
--- a/chart2/source/controller/dialogs/ResourceIds.hrc
+++ b/chart2/source/controller/dialogs/TabPageIds.h
@@ -17,11 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_RESOURCEIDS_HRC
-#define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_RESOURCEIDS_HRC
-
-//for strings see Strings.hrc
-//for Bitmaps see bitmaps.hlst
+#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_TABPAGEIDS_H
+#define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_TABPAGEIDS_H
//TabPage Ids:
#define TP_LEGEND_POS 900
diff --git a/chart2/source/controller/dialogs/dlg_ChartType.cxx b/chart2/source/controller/dialogs/dlg_ChartType.cxx
index 95875642303a..a062e768fe5e 100644
--- a/chart2/source/controller/dialogs/dlg_ChartType.cxx
+++ b/chart2/source/controller/dialogs/dlg_ChartType.cxx
@@ -19,7 +19,7 @@
#include "dlg_ChartType.hxx"
#include "ResId.hxx"
-#include "ResourceIds.hrc"
+#include "TabPageIds.h"
#include "strings.hrc"
#include "tp_ChartType.hxx"
#include "macros.hxx"
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
index d2198e8653e9..180af39f4b56 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
@@ -21,7 +21,7 @@
#include "ResId.hxx"
#include "macros.hxx"
#include "strings.hrc"
-#include "HelpIds.hrc"
+#include "helpids.h"
#include "tp_ChartType.hxx"
#include "tp_RangeChooser.hxx"
diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx
index 28c5383915ec..d2b6c275e959 100644
--- a/chart2/source/controller/dialogs/dlg_DataSource.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx
@@ -23,7 +23,7 @@
#include "ChartTypeTemplateProvider.hxx"
#include "DiagramHelper.hxx"
#include "DialogModel.hxx"
-#include "HelpIds.hrc"
+#include "helpids.h"
#include "tp_RangeChooser.hxx"
#include "tp_DataSource.hxx"
diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
index 4ef50442f07c..93c1a7abfa6f 100644
--- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
@@ -21,7 +21,7 @@
#include "ResId.hxx"
#include "chartview/ChartSfxItemIds.hxx"
-#include "HelpIds.hrc"
+#include "helpids.h"
#include "ObjectNameProvider.hxx"
#include <svl/eitem.hxx>
diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index ff2ca208628a..07d8e5564dde 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -19,7 +19,7 @@
#include <svl/zforlist.hxx>
#include "dlg_ObjectProperties.hxx"
-#include "ResourceIds.hrc"
+#include "TabPageIds.h"
#include "strings.hrc"
#include "tp_AxisLabel.hxx"
#include "tp_DataLabel.hxx"
diff --git a/chart2/source/controller/dialogs/dlg_ShapeFont.cxx b/chart2/source/controller/dialogs/dlg_ShapeFont.cxx
index c8a6086b28b0..5b0c8ef2fec5 100644
--- a/chart2/source/controller/dialogs/dlg_ShapeFont.cxx
+++ b/chart2/source/controller/dialogs/dlg_ShapeFont.cxx
@@ -20,7 +20,7 @@
#include "dlg_ShapeFont.hxx"
#include "ViewElementListProvider.hxx"
#include "ResId.hxx"
-#include "ResourceIds.hrc"
+#include "TabPageIds.h"
#include <svl/intitem.hxx>
#include <sfx2/objsh.hxx>
diff --git a/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx b/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx
index a0f0987bf130..1cb58f49a779 100644
--- a/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx
+++ b/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx
@@ -19,7 +19,7 @@
#include "dlg_ShapeParagraph.hxx"
#include "ResId.hxx"
-#include "ResourceIds.hrc"
+#include "TabPageIds.h"
#include <svl/cjkoptions.hxx>
#include <svl/intitem.hxx>
diff --git a/chart2/source/controller/dialogs/dlg_View3D.cxx b/chart2/source/controller/dialogs/dlg_View3D.cxx
index a1988be2c8da..39f81f1bd5b5 100644
--- a/chart2/source/controller/dialogs/dlg_View3D.cxx
+++ b/chart2/source/controller/dialogs/dlg_View3D.cxx
@@ -19,7 +19,7 @@
#include "dlg_View3D.hxx"
#include "strings.hrc"
-#include "ResourceIds.hrc"
+#include "TabPageIds.h"
#include "ResId.hxx"
#include "tp_3D_SceneGeometry.hxx"
#include "tp_3D_SceneAppearance.hxx"
diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index 4e73d7c0ff9f..c3ddea101128 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -23,7 +23,7 @@
#include "RangeSelectionHelper.hxx"
#include "TabPageNotifiable.hxx"
#include "macros.hxx"
-#include "HelpIds.hrc"
+#include "helpids.h"
#include <rtl/math.hxx>
#include <vcl/dialog.hxx>
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
index 7b4c914ed99d..56b8f28c4d89 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
@@ -20,7 +20,7 @@
#include "tp_AxisLabel.hxx"
#include "ResId.hxx"
-#include "ResourceIds.hrc"
+#include "TabPageIds.h"
#include "chartview/ChartSfxItemIds.hxx"
#include <svx/chrtitem.hxx>
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
index 2ec01fff1e0c..6998113199cb 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
@@ -20,7 +20,7 @@
#include "tp_AxisPositions.hxx"
#include "ResId.hxx"
-#include "ResourceIds.hrc"
+#include "TabPageIds.h"
#include "strings.hrc"
#include "chartview/ChartSfxItemIds.hxx"
#include "AxisHelper.hxx"
diff --git a/chart2/source/controller/dialogs/tp_DataLabel.cxx b/chart2/source/controller/dialogs/tp_DataLabel.cxx
index 432290d78201..218caef5e66e 100644
--- a/chart2/source/controller/dialogs/tp_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_DataLabel.cxx
@@ -19,7 +19,7 @@
#include "tp_DataLabel.hxx"
-#include "ResourceIds.hrc"
+#include "TabPageIds.h"
#include "ResId.hxx"
namespace chart
diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.cxx b/chart2/source/controller/dialogs/tp_ErrorBars.cxx
index adac35ea9c87..24ae2b3fa1e2 100644
--- a/chart2/source/controller/dialogs/tp_ErrorBars.cxx
+++ b/chart2/source/controller/dialogs/tp_ErrorBars.cxx
@@ -19,7 +19,7 @@
#include "tp_ErrorBars.hxx"
#include "ResId.hxx"
-#include "ResourceIds.hrc"
+#include "TabPageIds.h"
#include "TabPageNotifiable.hxx"
#include <vcl/settings.hxx>
diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.cxx b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
index c6967e8cc3f5..659ffcb645af 100644
--- a/chart2/source/controller/dialogs/tp_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
@@ -19,7 +19,7 @@
#include "tp_LegendPosition.hxx"
#include "ResId.hxx"
-#include "ResourceIds.hrc"
+#include "TabPageIds.h"
#include "res_LegendPosition.hxx"
#include "chartview/ChartSfxItemIds.hxx"
#include <svx/chrtitem.hxx>
diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.cxx b/chart2/source/controller/dialogs/tp_PointGeometry.cxx
index a3925adbf5d9..34056ec9de3b 100644
--- a/chart2/source/controller/dialogs/tp_PointGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_PointGeometry.cxx
@@ -18,7 +18,7 @@
*/
#include "tp_PointGeometry.hxx"
-#include "ResourceIds.hrc"
+#include "TabPageIds.h"
#include "res_BarGeometry.hxx"
#include "ResId.hxx"
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
index 535ea60a1827..9e966778871c 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
@@ -20,9 +20,9 @@
#include "tp_TitleRotation.hxx"
#include "ResId.hxx"
-#include "ResourceIds.hrc"
+#include "TabPageIds.h"
#include "chartview/ChartSfxItemIds.hxx"
-#include "HelpIds.hrc"
+#include "helpids.h"
#include <editeng/eeitem.hxx>
#include <editeng/frmdiritem.hxx>
diff --git a/chart2/source/controller/dialogs/tp_Trendline.cxx b/chart2/source/controller/dialogs/tp_Trendline.cxx
index 34939d4a0d15..acc4c0ac67f8 100644
--- a/chart2/source/controller/dialogs/tp_Trendline.cxx
+++ b/chart2/source/controller/dialogs/tp_Trendline.cxx
@@ -19,7 +19,7 @@
#include "tp_Trendline.hxx"
#include "ResId.hxx"
-#include "ResourceIds.hrc"
+#include "TabPageIds.h"
#include <vcl/settings.hxx>
namespace chart
diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
index beeedc457cd0..a0e1b70ce273 100644
--- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
+++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
@@ -22,7 +22,7 @@
#include "res_Titles.hxx"
#include "res_LegendPosition.hxx"
#include "ResId.hxx"
-#include "HelpIds.hrc"
+#include "helpids.h"
#include "macros.hxx"
#include "ChartModelHelper.hxx"
#include "AxisHelper.hxx"
diff --git a/chart2/source/controller/inc/ShapeController.hrc b/chart2/source/controller/inc/ShapeController.h
index fbd1f6384380..392c28d2fe4c 100644
--- a/chart2/source/controller/inc/ShapeController.hrc
+++ b/chart2/source/controller/inc/ShapeController.h
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef CHART_SHAPECONTROLLER_HRC
-#define CHART_SHAPECONTROLLER_HRC
+#ifndef CHART_SHAPECONTROLLER_H
+#define CHART_SHAPECONTROLLER_H
//Command Ids:
#define COMMAND_ID_FORMAT_LINE 1
diff --git a/chart2/source/controller/inc/HelpIds.hrc b/chart2/source/controller/inc/helpids.h
index 48616bb29210..2867867d6323 100644
--- a/chart2/source/controller/inc/HelpIds.hrc
+++ b/chart2/source/controller/inc/helpids.h
@@ -16,8 +16,9 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef CHART_HELPIDS_HRC
-#define CHART_HELPIDS_HRC
+
+#ifndef CHART_HELPIDS_H
+#define CHART_HELPIDS_H
#define HID_SCH_WIN_DOCUMENT "CHART2_HID_SCH_WIN_DOCUMENT"
#define HID_SCH_ERROR_BARS_FROM_DATA "CHART2_SCH_ERROR_BARS_FROM_DATA"
diff --git a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
index 1a5a08f8209b..04094d243c1e 100644
--- a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
@@ -22,7 +22,7 @@
#include "macros.hxx"
#include "ItemPropertyMap.hxx"
#include "RelativeSizeHelper.hxx"
-#include <editeng/memberids.hrc>
+#include <editeng/memberids.h>
#include <editeng/eeitem.hxx>
#include <editeng/udlnitem.hxx>
#include <editeng/fontitem.hxx>
diff --git a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
index 9a775fc20c49..130f63957250 100644
--- a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
@@ -23,7 +23,7 @@
#include "ItemPropertyMap.hxx"
#include "PropertyHelper.hxx"
#include "CommonConverters.hxx"
-#include <editeng/memberids.hrc>
+#include <editeng/memberids.h>
#include <svx/xflclit.hxx>
#include <svx/xlnclit.hxx>
#include <svx/xflbmtit.hxx>
diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx
index dae7c1b6b8d8..c35cf55a067e 100644
--- a/chart2/source/controller/main/ChartWindow.cxx
+++ b/chart2/source/controller/main/ChartWindow.cxx
@@ -19,7 +19,7 @@
#include "ChartWindow.hxx"
#include "ChartController.hxx"
-#include "HelpIds.hrc"
+#include "helpids.h"
#include "uiobject.hxx"
#include <vcl/help.hxx>
diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx
index b68d2b7c0737..3d3803e4d266 100644
--- a/chart2/source/controller/main/DrawCommandDispatch.cxx
+++ b/chart2/source/controller/main/DrawCommandDispatch.cxx
@@ -18,7 +18,7 @@
*/
#include "DrawCommandDispatch.hxx"
-#include "DrawCommandDispatch.hrc"
+#include "DrawCommandDispatch.h"
#include "ChartController.hxx"
#include "DrawViewWrapper.hxx"
#include "chartview/DrawModelWrapper.hxx"
diff --git a/chart2/source/controller/main/DrawCommandDispatch.hrc b/chart2/source/controller/main/DrawCommandDispatch.h
index faf70bde1047..faf70bde1047 100644
--- a/chart2/source/controller/main/DrawCommandDispatch.hrc
+++ b/chart2/source/controller/main/DrawCommandDispatch.h
diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx
index ec3fc0a4c583..17b4aaf2b0ea 100644
--- a/chart2/source/controller/main/ShapeController.cxx
+++ b/chart2/source/controller/main/ShapeController.cxx
@@ -18,7 +18,7 @@
*/
#include "ShapeController.hxx"
-#include "ShapeController.hrc"
+#include "ShapeController.h"
#include "ChartController.hxx"
#include "ChartWindow.hxx"
#include "ViewElementListProvider.hxx"
diff --git a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
index 6a91b6cc8e20..a22074963513 100644
--- a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
@@ -27,7 +27,6 @@
#include "FDatabaseMetaDataResultSet.hxx"
#include <comphelper/types.hxx>
#include "TPrivilegesResultSet.hxx"
-#include "resource/conn_shared_res.hrc"
#include "strings.hxx"
using namespace ::comphelper;
diff --git a/connectivity/source/drivers/jdbc/JBigDecimal.cxx b/connectivity/source/drivers/jdbc/JBigDecimal.cxx
index 36a3518fb396..acffce89b759 100644
--- a/connectivity/source/drivers/jdbc/JBigDecimal.cxx
+++ b/connectivity/source/drivers/jdbc/JBigDecimal.cxx
@@ -19,7 +19,6 @@
#include "java/math/BigDecimal.hxx"
#include "java/tools.hxx"
-#include "resource/conn_shared_res.hrc"
using namespace connectivity;
//************ Class: java.lang.Boolean
diff --git a/connectivity/source/drivers/jdbc/JConnection.cxx b/connectivity/source/drivers/jdbc/JConnection.cxx
index 0f9ba8fb8f9e..ecd265d3f5dd 100644
--- a/connectivity/source/drivers/jdbc/JConnection.cxx
+++ b/connectivity/source/drivers/jdbc/JConnection.cxx
@@ -36,7 +36,6 @@
#include <connectivity/dbexception.hxx>
#include "java/util/Property.hxx"
#include "java/LocalRef.hxx"
-#include "resource/conn_shared_res.hrc"
#include <com/sun/star/uno/XComponentContext.hpp>
#include <jvmaccess/classpath.hxx>
#include <comphelper/namedvaluecollection.hxx>
diff --git a/connectivity/source/drivers/jdbc/JDriver.cxx b/connectivity/source/drivers/jdbc/JDriver.cxx
index 74513dd5ed76..c05372db4942 100644
--- a/connectivity/source/drivers/jdbc/JDriver.cxx
+++ b/connectivity/source/drivers/jdbc/JDriver.cxx
@@ -26,7 +26,6 @@
#include "java/tools.hxx"
#include <connectivity/dbexception.hxx>
#include <jvmfwk/framework.hxx>
-#include "resource/conn_shared_res.hrc"
#include "strings.hrc"
#include "resource/sharedresources.hxx"
#include <comphelper/processfactory.hxx>
diff --git a/connectivity/source/drivers/jdbc/JStatement.cxx b/connectivity/source/drivers/jdbc/JStatement.cxx
index fed0c3d7be15..6a66929c8fea 100644
--- a/connectivity/source/drivers/jdbc/JStatement.cxx
+++ b/connectivity/source/drivers/jdbc/JStatement.cxx
@@ -36,7 +36,6 @@
#include <com/sun/star/sdbc/ResultSetType.hpp>
#include <com/sun/star/sdbc/FetchDirection.hpp>
-#include "resource/conn_shared_res.hrc"
#include "strings.hxx"
#include <algorithm>
diff --git a/connectivity/source/drivers/jdbc/Object.cxx b/connectivity/source/drivers/jdbc/Object.cxx
index 3b819d94cb65..d90f94cf61e8 100644
--- a/connectivity/source/drivers/jdbc/Object.cxx
+++ b/connectivity/source/drivers/jdbc/Object.cxx
@@ -25,7 +25,6 @@
#include "java/sql/SQLException.hxx"
#include <osl/thread.h>
#include "java/LocalRef.hxx"
-#include "resource/conn_shared_res.hrc"
#include "strings.hxx"
#include <comphelper/logging.hxx>
diff --git a/connectivity/source/drivers/jdbc/PreparedStatement.cxx b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
index 6763c985283c..b64a9fade6c7 100644
--- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx
+++ b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
@@ -30,7 +30,6 @@
#include <connectivity/dbtools.hxx>
#include <connectivity/FValue.hxx>
#include <connectivity/dbexception.hxx>
-#include "resource/conn_shared_res.hrc"
#include "strings.hrc"
#include "resource/sharedresources.hxx"
#include "java/LocalRef.hxx"
diff --git a/connectivity/source/inc/resource/conn_shared_res.hrc b/connectivity/source/inc/resource/conn_shared_res.hrc
deleted file mode 100644
index 9008b45bb495..000000000000
--- a/connectivity/source/inc/resource/conn_shared_res.hrc
+++ /dev/null
@@ -1,65 +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 CONNECTIVITY_SHARED_RES_HRC
-#define CONNECTIVITY_SHARED_RES_HRC
-
-// = normal resource ids, per driver
-
-// Mozilla driver resource ids
-#define STR_MOZAB_BASE 1000
-// either mozab or mork is actually used
-#define STR_MORK_BASE 1000
-
-// common resource ids
-#define STR_COMMON_BASE 1200
-
-// Spreadsheet driver resource ids
-#define STR_CALC_BASE 1300
-
-// DBase driver resource ids
-#define STR_DBASE_BASE 1400
-
-// ADO driver resource ids
-#define STR_ADO_BASE 1450
-
-// EVOAB2 driver resource ids
-#define STR_EVOAB2_BASE 1500
-
-// FILE driver resource ids
-#define STR_FILE_BASE 1550
-
-// KAB driver resource ids
-#define STR_KAB_BASE 1600
-
-// MACAB driver resource ids
-#define STR_MACAB_BASE 1650
-
-// hsqldb driver resource ids
-#define STR_HSQLDB_BASE 1750
-
-// = resource ids for log messages
-#define STR_LOG_MESSAGE_BASE 10000
-
-// log messages for the jdbc driver
-#define STR_JDBC_LOG_MESSAGE_BASE STR_LOG_MESSAGE_BASE + 500
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/resource/jdbc_log.hrc b/connectivity/source/inc/resource/jdbc_log.hrc
deleted file mode 100644
index 06b2a81b3f3b..000000000000
--- a/connectivity/source/inc/resource/jdbc_log.hrc
+++ /dev/null
@@ -1,27 +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 CONNECTIVITY_RESOURCE_JDBC_LOG_HRC
-#define CONNECTIVITY_RESOURCE_JDBC_LOG_HRC
-
-#include "resource/conn_shared_res.hrc"
-
-#endif // CONNECTIVITY_RESOURCE_JDBC_LOG_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/resource/kab_res.hrc b/connectivity/source/inc/resource/kab_res.hrc
deleted file mode 100644
index 019e99449b9d..000000000000
--- a/connectivity/source/inc/resource/kab_res.hrc
+++ /dev/null
@@ -1,35 +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 CONNECTIVITY_RESOURCE_KAB_HRC
-#define CONNECTIVITY_RESOURCE_KAB_HRC
-
-#include "resource/conn_shared_res.hrc"
-#include "resource/common_res.hrc"
-
-// = the kab driver's resource strings
-
-#define STR_NO_KDE_INST ( STR_KAB_BASE + 0 )
-#define STR_KDE_VERSION_TOO_OLD ( STR_KAB_BASE + 1 )
-#define STR_KDE_VERSION_TOO_NEW ( STR_KAB_BASE + 2 )
-#define STR_KDE_VERSION_TOO_NEW_WORK_AROUND ( STR_KAB_BASE + 3 )
-
-#endif // CONNECTIVITY_RESOURCE_KAB_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/inc/treeopt.hrc b/cui/inc/treeopt.hrc
index 884a2543e543..aafb185e9f6f 100644
--- a/cui/inc/treeopt.hrc
+++ b/cui/inc/treeopt.hrc
@@ -20,6 +20,9 @@
#ifndef INCLUDED_CUI_INC_TREEOPT_HRC
#define INCLUDED_CUI_INC_TREEOPT_HRC
+#include <sal/types.h>
+#include <sfx2/pageids.hxx>
+
#define NC_(Context, String) (Context "\004" u8##String)
const std::pair<const char*, sal_uInt16> SID_GENERAL_OPTIONS_RES[] =
diff --git a/cui/source/customize/SvxMenuConfigPage.cxx b/cui/source/customize/SvxMenuConfigPage.cxx
index b51b319b5ae7..26a16baee01c 100644
--- a/cui/source/customize/SvxMenuConfigPage.cxx
+++ b/cui/source/customize/SvxMenuConfigPage.cxx
@@ -53,9 +53,8 @@
#include <toolkit/helper/vclunohelper.hxx>
#include <algorithm>
-#include <cuires.hrc>
#include <strings.hrc>
-#include "helpid.hrc"
+#include "helpids.h"
#include "acccfg.hxx"
#include "cfg.hxx"
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index bf83de09a634..b434ef282748 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -35,7 +35,6 @@
#include <sal/macros.h>
#include <vcl/builderfactory.hxx>
-#include "cuires.hrc"
#include "strings.hrc"
#include <sfx2/strings.hrc>
#include <svx/svxids.hrc>
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 41c9cf7b6687..b26e077347bf 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -53,8 +53,7 @@
#include <toolkit/helper/vclunohelper.hxx>
#include <algorithm>
-#include <cuires.hrc>
-#include "helpid.hrc"
+#include "helpids.h"
#include "strings.hrc"
#include "acccfg.hxx"
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 1c630c16bee1..cd86a24b8cbd 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -36,7 +36,7 @@
#include <com/sun/star/uno/RuntimeException.hpp>
#include <com/sun/star/ui/theUICategoryDescription.hpp>
-#include "helpid.hrc"
+#include "helpids.h"
#include <basic/sbx.hxx>
#include <basic/basicmanagerrepository.hxx>
#include <basic/sbstar.hxx>
@@ -44,7 +44,6 @@
#include <basic/sbmod.hxx>
#include <basic/basmgr.hxx>
#include <tools/urlobj.hxx>
-#include "cuires.hrc"
#include "strings.hrc"
#include "bitmaps.hlst"
#include <sfx2/app.hxx>
diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx
index 78bbdf3d95f3..a3ff1697629b 100644
--- a/cui/source/customize/eventdlg.cxx
+++ b/cui/source/customize/eventdlg.cxx
@@ -45,8 +45,7 @@
#include "macropg_impl.hxx"
#include <dialmgr.hxx>
-#include <cuires.hrc>
-#include "helpid.hrc"
+#include "helpids.h"
#include "cfgutil.hxx"
#include "cfg.hxx"
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 2b26eca0a0f1..a834f265978a 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -34,8 +34,7 @@
#include <dialmgr.hxx>
#include "cfgutil.hxx"
#include "cfg.hxx"
-#include "helpid.hrc"
-#include <cuires.hrc>
+#include "helpids.h"
#include "headertablistbox.hxx"
#include "macropg_impl.hxx"
#include <svx/dialogs.hrc>
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index d36cd93a4fed..3803c68731bd 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -44,7 +44,6 @@
#include <vcl/graph.hxx>
#include <vcl/builderfactory.hxx>
#include <osl/file.hxx>
-#include <cuires.hrc>
#include <editeng/optitems.hxx>
#include <editeng/svxenum.hxx>
#include <svx/SpellDialogChildWindow.hxx>
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
index 2a0e9053c819..500f0143e3ef 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -38,12 +38,12 @@
#include <comphelper/propertysequence.hxx>
#include <comphelper/dispatchcommand.hxx>
-#include <cuires.hrc>
#include <dialmgr.hxx>
#include "cuicharmap.hxx"
#include <sfx2/request.hxx>
#include <sfx2/sfxsids.hrc>
#include <sfx2/app.hxx>
+#include <editeng/editids.hrc>
#include <editeng/fontitem.hxx>
#include "strings.hrc"
#include "macroass.hxx"
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index b45300ef7bee..f8e6e46026e1 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -23,7 +23,6 @@
#include <dialmgr.hxx>
#include <sfx2/tabdlg.hxx>
#include <sfx2/app.hxx>
-#include <cuires.hrc>
#include <svx/fmsrccfg.hxx>
#include <svx/fmsrcimp.hxx>
#include "strings.hrc"
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index ebda6d05cdd8..fcd2937d10b4 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -33,7 +33,7 @@
#include <svx/gallery1.hxx>
#include <svx/galtheme.hxx>
#include "cuigaldlg.hxx"
-#include "helpid.hrc"
+#include "helpids.h"
#include "bitmaps.hlst"
#include <unotools/syslocale.hxx>
#include <com/sun/star/uno/Reference.hxx>
diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index 7f499c01a776..e7e86b987d47 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -25,7 +25,6 @@
#include <sfx2/request.hxx>
#include <dialmgr.hxx>
#include "cuigrfflt.hxx"
-#include <cuires.hrc>
#include <svx/dialogs.hrc>
diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx
index 374c4b99643d..e1da23aef776 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -102,16 +102,16 @@ SvxHpLinkDlg::SvxHpLinkDlg (vcl::Window* pParent, SfxBindings* pBindings)
aImage = Image(aBitmap);
}
aStrTitle = CuiResId( RID_SVXSTR_HYPERDLG_HLINETTP );
- pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_INTERNET, aStrTitle, imgVector[0], SvxHyperlinkInternetTp::Create );
+ pEntry = AddTabPage ( HyperLinkPageType::INTERNET, aStrTitle, imgVector[0], SvxHyperlinkInternetTp::Create );
pEntry->SetQuickHelpText( CuiResId( RID_SVXSTR_HYPERDLG_HLINETTP_HELP ) );
aStrTitle = CuiResId( RID_SVXSTR_HYPERDLG_HLMAILTP );
- pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_MAIL, aStrTitle, imgVector[1], SvxHyperlinkMailTp::Create );
+ pEntry = AddTabPage ( HyperLinkPageType::MAIL, aStrTitle, imgVector[1], SvxHyperlinkMailTp::Create );
pEntry->SetQuickHelpText( CuiResId( RID_SVXSTR_HYPERDLG_HLMAILTP_HELP ) );
aStrTitle = CuiResId( RID_SVXSTR_HYPERDLG_HLDOCTP );
- pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_DOCUMENT, aStrTitle, imgVector[2], SvxHyperlinkDocTp::Create );
+ pEntry = AddTabPage ( HyperLinkPageType::DOCUMENT, aStrTitle, imgVector[2], SvxHyperlinkDocTp::Create );
pEntry->SetQuickHelpText( CuiResId( RID_SVXSTR_HYPERDLG_HLDOCTP_HELP ) );
aStrTitle = CuiResId( RID_SVXSTR_HYPERDLG_HLDOCNTP );
- pEntry = AddTabPage ( RID_SVXPAGE_HYPERLINK_NEWDOCUMENT, aStrTitle, imgVector[3], SvxHyperlinkNewDocTp::Create );
+ pEntry = AddTabPage ( HyperLinkPageType::NEWDOCUMENT, aStrTitle, imgVector[3], SvxHyperlinkNewDocTp::Create );
pEntry->SetQuickHelpText( CuiResId( RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP ) );
// set OK/Cancel - button
@@ -127,25 +127,25 @@ SvxHpLinkDlg::SvxHpLinkDlg (vcl::Window* pParent, SfxBindings* pBindings)
SetInputSet (mpItemSet.get());
//loop through the pages and get their max bounds and lock that down
- ShowPage(RID_SVXPAGE_HYPERLINK_NEWDOCUMENT);
+ ShowPage(HyperLinkPageType::NEWDOCUMENT);
VclBox *pBox = get_content_area();
Size aMaxPrefSize(pBox->get_preferred_size());
- ShowPage(RID_SVXPAGE_HYPERLINK_DOCUMENT);
+ ShowPage(HyperLinkPageType::DOCUMENT);
Size aSize(pBox->get_preferred_size());
aMaxPrefSize.Width() = std::max(aMaxPrefSize.Width(), aSize.Width());
aMaxPrefSize.Height() = std::max(aMaxPrefSize.Height(), aSize.Height());
- ShowPage(RID_SVXPAGE_HYPERLINK_MAIL);
+ ShowPage(HyperLinkPageType::MAIL);
aSize = pBox->get_preferred_size();
aMaxPrefSize.Width() = std::max(aMaxPrefSize.Width(), aSize.Width());
aMaxPrefSize.Height() = std::max(aMaxPrefSize.Height(), aSize.Height());
- ShowPage(RID_SVXPAGE_HYPERLINK_INTERNET);
+ ShowPage(HyperLinkPageType::INTERNET);
aSize = pBox->get_preferred_size();
aMaxPrefSize.Width() = std::max(aMaxPrefSize.Width(), aSize.Width());
aMaxPrefSize.Height() = std::max(aMaxPrefSize.Height(), aSize.Height());
pBox->set_width_request(aMaxPrefSize.Width());
pBox->set_height_request(aMaxPrefSize.Height());
- SetCurPageId(RID_SVXPAGE_HYPERLINK_INTERNET);
+ SetCurPageId(HyperLinkPageType::INTERNET);
// Init Dialog
Start();
@@ -301,7 +301,7 @@ IMPL_LINK_NOARG(SvxHpLinkDlg, ClickCloseHdl_Impl, Button*, void)
void SvxHpLinkDlg::SetPage ( SvxHyperlinkItem* pItem )
{
- sal_uInt16 nPageId = RID_SVXPAGE_HYPERLINK_INTERNET;
+ sal_uInt16 nPageId = HyperLinkPageType::INTERNET;
OUString aStrURL(pItem->GetURL());
INetURLObject aURL(aStrURL);
@@ -311,17 +311,17 @@ void SvxHpLinkDlg::SetPage ( SvxHyperlinkItem* pItem )
{
case INetProtocol::Http :
case INetProtocol::Ftp :
- nPageId = RID_SVXPAGE_HYPERLINK_INTERNET;
+ nPageId = HyperLinkPageType::INTERNET;
break;
case INetProtocol::File :
- nPageId = RID_SVXPAGE_HYPERLINK_DOCUMENT;
+ nPageId = HyperLinkPageType::DOCUMENT;
break;
case INetProtocol::Mailto :
- nPageId = RID_SVXPAGE_HYPERLINK_MAIL;
+ nPageId = HyperLinkPageType::MAIL;
break;
default :
if (aStrURL.startsWith("#"))
- nPageId = RID_SVXPAGE_HYPERLINK_DOCUMENT;
+ nPageId = HyperLinkPageType::DOCUMENT;
else
{
// not valid
diff --git a/cui/source/dialogs/cuiimapwnd.cxx b/cui/source/dialogs/cuiimapwnd.cxx
index 99c71350124b..bb358632e5f1 100644
--- a/cui/source/dialogs/cuiimapwnd.cxx
+++ b/cui/source/dialogs/cuiimapwnd.cxx
@@ -28,7 +28,6 @@
#include <svl/urlbmk.hxx>
#include <svx/xoutbmp.hxx>
#include <dialmgr.hxx>
-#include <cuires.hrc>
#include <cuiimapwnd.hxx>
#include <svx/svdpage.hxx>
#include <svx/svdorect.hxx>
diff --git a/cui/source/dialogs/cuitbxform.cxx b/cui/source/dialogs/cuitbxform.cxx
index b54de7fe8e31..868e0e984ec4 100644
--- a/cui/source/dialogs/cuitbxform.cxx
+++ b/cui/source/dialogs/cuitbxform.cxx
@@ -25,7 +25,6 @@
#include <vcl/toolbox.hxx>
#include <vcl/fixed.hxx>
#include <dialmgr.hxx>
-#include <cuires.hrc>
#include "cuitbxform.hxx"
#include <sfx2/viewfrm.hxx>
#include <sfx2/viewsh.hxx>
diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx
index cedbf7e14f6c..bfbe9fac7c40 100644
--- a/cui/source/dialogs/dlgname.cxx
+++ b/cui/source/dialogs/dlgname.cxx
@@ -18,9 +18,6 @@
*/
#include <vcl/msgbox.hxx>
-
-#include <cuires.hrc>
-
#include "dlgname.hxx"
#include "defdlgname.hxx"
#include <dialmgr.hxx>
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index d5a16bd468aa..c83fd7332e0a 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -20,8 +20,7 @@
#include "hangulhanjadlg.hxx"
#include <dialmgr.hxx>
-#include <cuires.hrc>
-#include "helpid.hrc"
+#include "helpids.h"
#include "strings.hrc"
#include <algorithm>
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index 34c2d9a5fb73..7b97044d26f4 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -39,7 +39,6 @@
#include <toolkit/helper/vclunohelper.hxx>
#include "svtools/treelistentry.hxx"
-#include <cuires.hrc>
#include <strings.hrc>
#include "hlmarkwn.hxx"
#include "hltpbase.hxx"
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index 07277d1fed98..520d0e017d2c 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -21,6 +21,7 @@
#include <sal/config.h>
#include <osl/file.hxx>
+#include <sfx2/event.hxx>
#include <sfx2/frame.hxx>
#include <sfx2/viewfrm.hxx>
#include <sot/formats.hxx>
@@ -31,7 +32,6 @@
#include "hltpbase.hxx"
#include "macroass.hxx"
#include <svx/svxdlg.hxx>
-#include <cuires.hrc>
#include <strings.hrc>
#include <bitmaps.hlst>
#include <vcl/builderfactory.hxx>
diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx
index 63a0ad81bd95..c7f02a1f51d7 100644
--- a/cui/source/dialogs/hyphen.cxx
+++ b/cui/source/dialogs/hyphen.cxx
@@ -18,7 +18,6 @@
*/
#include "hyphen.hxx"
-#include "cuires.hrc"
#include "dialmgr.hxx"
#include <editeng/splwrap.hxx>
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 2b0214810e75..63a93180149d 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -23,8 +23,7 @@
#include "iconcdlg.hxx"
-#include "helpid.hrc"
-#include <cuires.hrc>
+#include "helpids.h"
#include <unotools/viewoptions.hxx>
#include <svtools/apearcfg.hxx>
#include <vcl/mnemonic.hxx>
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index bc68c29d278f..be4eef5cfa18 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -54,7 +54,6 @@
#include <svl/ownlist.hxx>
#include <comphelper/seqstream.hxx>
-#include "cuires.hrc"
#include "strings.hrc"
#include <osl/file.hxx>
diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx
index d0a36050babb..527070967e35 100644
--- a/cui/source/dialogs/insrc.cxx
+++ b/cui/source/dialogs/insrc.cxx
@@ -19,7 +19,6 @@
#include <dialmgr.hxx>
#include <svx/svxdlg.hxx>
-#include <cuires.hrc>
#include <strings.hrc>
#include "insrc.hxx"
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index 961ff4f7ad18..e65aee2ed72c 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -19,7 +19,7 @@
#include <linkdlg.hxx>
#include <vcl/svapp.hxx>
-#include "helpid.hrc"
+#include "helpids.h"
#include <tools/urlobj.hxx>
#include <svtools/svmedit.hxx>
diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx
index 7edc03f8b2db..7bc05a3cdc43 100644
--- a/cui/source/dialogs/multipat.cxx
+++ b/cui/source/dialogs/multipat.cxx
@@ -27,7 +27,6 @@
#include "multipat.hxx"
#include <dialmgr.hxx>
-#include <cuires.hrc>
#include <strings.hrc>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/cui/source/dialogs/newtabledlg.cxx b/cui/source/dialogs/newtabledlg.cxx
index 50e752789f95..d018d6161b2c 100644
--- a/cui/source/dialogs/newtabledlg.cxx
+++ b/cui/source/dialogs/newtabledlg.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "cuires.hrc"
#include "dialmgr.hxx"
#include "newtabledlg.hxx"
diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx
index 408613465d23..f002b32ef474 100644
--- a/cui/source/dialogs/passwdomdlg.cxx
+++ b/cui/source/dialogs/passwdomdlg.cxx
@@ -19,7 +19,6 @@
#include "passwdomdlg.hxx"
-#include "cuires.hrc"
#include "strings.hrc"
#include "dialmgr.hxx"
diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx
index 057198527390..871b6475eff7 100644
--- a/cui/source/dialogs/postdlg.cxx
+++ b/cui/source/dialogs/postdlg.cxx
@@ -29,12 +29,11 @@
#include <comphelper/processfactory.hxx>
#include <svx/svxids.hrc>
-#include <cuires.hrc>
#include <svx/postattr.hxx>
#include "postdlg.hxx"
#include <dialmgr.hxx>
-#include "helpid.hrc"
+#include "helpids.h"
// class SvxPostItDialog -------------------------------------------------
diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx b/cui/source/dialogs/screenshotannotationdlg.cxx
index 6060252b4152..4966b1fc2b1d 100644
--- a/cui/source/dialogs/screenshotannotationdlg.cxx
+++ b/cui/source/dialogs/screenshotannotationdlg.cxx
@@ -19,7 +19,6 @@
#include "screenshotannotationdlg.hxx"
-#include "cuires.hrc"
#include "strings.hrc"
#include "dialmgr.hxx"
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 6dcba4d31f36..999ffacfedee 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -26,7 +26,6 @@
#include <vcl/builderfactory.hxx>
#include <o3tl/make_unique.hxx>
-#include <cuires.hrc>
#include <strings.hrc>
#include <bitmaps.hlst>
#include "scriptdlg.hxx"
diff --git a/cui/source/dialogs/sdrcelldlg.cxx b/cui/source/dialogs/sdrcelldlg.cxx
index d6e9244cb738..e64f01f31a8d 100644
--- a/cui/source/dialogs/sdrcelldlg.cxx
+++ b/cui/source/dialogs/sdrcelldlg.cxx
@@ -19,7 +19,6 @@
#include <svl/cjkoptions.hxx>
#include <svx/flagsdef.hxx>
-#include "cuires.hrc"
#include "sdrcelldlg.hxx"
#include "dialmgr.hxx"
#include "cuitabarea.hxx"
diff --git a/cui/source/dialogs/splitcelldlg.cxx b/cui/source/dialogs/splitcelldlg.cxx
index f786644b9ba6..8a4a4bc8d4ff 100644
--- a/cui/source/dialogs/splitcelldlg.cxx
+++ b/cui/source/dialogs/splitcelldlg.cxx
@@ -22,7 +22,6 @@
#include <svl/eitem.hxx>
#include "dialmgr.hxx"
#include "splitcelldlg.hxx"
-#include "cuires.hrc"
namespace {
class NoApplyDialog : public SvxStandardDialog
diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx
index 5ccaa5dd1101..7af454f67fb3 100644
--- a/cui/source/dialogs/srchxtra.cxx
+++ b/cui/source/dialogs/srchxtra.cxx
@@ -22,7 +22,6 @@
#include <svl/cjkoptions.hxx>
#include <svl/whiter.hxx>
#include <sfx2/objsh.hxx>
-#include <cuires.hrc>
#include <svx/svxitems.hrc>
#include <svx/dialmgr.hxx>
#include <svx/strarray.hxx>
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index 0bf69e5329ce..5299fbde0d44 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -19,7 +19,6 @@
#include "thesdlg.hxx"
#include "thesdlg_impl.hxx"
-#include "cuires.hrc"
#include "strings.hrc"
#include "dialmgr.hxx"
diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx
index a93d18ff01f8..056b757b357e 100644
--- a/cui/source/dialogs/zoom.cxx
+++ b/cui/source/dialogs/zoom.cxx
@@ -22,9 +22,6 @@
#include <sfx2/objsh.hxx>
#include <vcl/layout.hxx>
#include <vcl/msgbox.hxx>
-
-#include <cuires.hrc>
-
#include "zoom.hxx"
#include <sfx2/zoomitem.hxx>
#include <svx/viewlayoutitem.hxx>
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index ed48d45f94ed..05c834392c11 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -20,10 +20,10 @@
#include "align.hxx"
#include "dlgfact.hxx"
-#include <sfx2/basedlgs.hxx>
#include <sfx2/app.hxx>
+#include <sfx2/basedlgs.hxx>
+#include <sfx2/pageids.hxx>
#include <sfx2/request.hxx>
-#include <cuires.hrc>
#include <svx/dialogs.hrc>
#include "numfmt.hxx"
#include "splitcelldlg.hxx"
@@ -808,7 +808,7 @@ VclPtr<VclAbstractDialog> AbstractDialogFactory_Impl::CreateVclDialog( vcl::Wind
VclPtr<Dialog> pDlg;
switch ( nResId )
{
- case RID_DEFAULTABOUT:
+ case SID_ABOUT:
{
pDlg = VclPtr<AboutDialog>::Create(pParent);
break;
diff --git a/cui/source/inc/cuihyperdlg.hxx b/cui/source/inc/cuihyperdlg.hxx
index 03461d7d5f86..9d7b6954b284 100644
--- a/cui/source/inc/cuihyperdlg.hxx
+++ b/cui/source/inc/cuihyperdlg.hxx
@@ -32,6 +32,15 @@
#include "iconcdlg.hxx"
+// hyperlink dialog
+enum HyperLinkPageType
+{
+ INTERNET,
+ MAIL,
+ DOCUMENT,
+ NEWDOCUMENT
+};
+
/*************************************************************************
|*
|* Hyperlink-Dialog
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpids.h
index 6ac5734602ba..6ac5734602ba 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpids.h
diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx
index 310942d6ddb4..ef2661a7187c 100644
--- a/cui/source/inc/hltpbase.hxx
+++ b/cui/source/inc/hltpbase.hxx
@@ -38,9 +38,8 @@
#include <dialmgr.hxx>
#include <sfx2/docfile.hxx>
-#include <cuires.hrc>
#include <com/sun/star/frame/XFrame.hpp>
-#include "helpid.hrc"
+#include "helpids.h"
#include <svx/hlnkitem.hxx>
#include "hlmarkwn.hxx"
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index 09e5b109ffc3..025300b9964b 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -35,6 +35,8 @@
#include <svtools/ctrlbox.hxx>
#include <vcl/dialog.hxx>
+#define MN_GALLERY_ENTRY 100
+
class SvxColorListBox;
class SvxNumRule;
class SvxBmpNumValueSet;
diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx
index 9ea41a5161c7..202866e284f9 100644
--- a/cui/source/options/certpath.cxx
+++ b/cui/source/options/certpath.cxx
@@ -13,7 +13,6 @@
#include <osl/thread.h>
#include "svtools/treelistentry.hxx"
#include <unotools/securityoptions.hxx>
-#include <cuires.hrc>
#include "certpath.hxx"
#include "dialmgr.hxx"
diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx
index 4e8666cdac1a..d1ff39a6fb19 100644
--- a/cui/source/options/cfgchart.cxx
+++ b/cui/source/options/cfgchart.cxx
@@ -21,7 +21,6 @@
#include <tools/stream.hxx>
#include "cfgchart.hxx"
#include <dialmgr.hxx>
-#include <cuires.hrc>
#include <strings.hrc>
#define ROW_COLOR_COUNT 12
diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index ae3a2538d386..e076e3ca2311 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -23,8 +23,7 @@
#include <vcl/builderfactory.hxx>
#include "connpoolsettings.hxx"
#include <svl/eitem.hxx>
-#include <cuires.hrc>
-#include "helpid.hrc"
+#include "helpids.h"
#include <strings.hrc>
#include <dialmgr.hxx>
diff --git a/cui/source/options/cuisrchdlg.cxx b/cui/source/options/cuisrchdlg.cxx
index 0b3bf50120df..8ee9ac426723 100644
--- a/cui/source/options/cuisrchdlg.cxx
+++ b/cui/source/options/cuisrchdlg.cxx
@@ -33,8 +33,6 @@
#include "cuisrchdlg.hxx"
-#include <cuires.hrc>
-
#include <svl/srchitem.hxx>
#include <svx/pageitem.hxx>
#include <dialmgr.hxx>
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index df307e814396..a2590311aae3 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -21,10 +21,9 @@
#include "dbregistersettings.hxx"
#include "connpooloptions.hxx"
#include <svl/filenotation.hxx>
-#include "helpid.hrc"
+#include "helpids.h"
#include <svtools/editbrowsebox.hxx>
#include "svtools/treelistentry.hxx"
-#include <cuires.hrc>
#include <strings.hrc>
#include <bitmaps.hlst>
#include <vcl/field.hxx>
diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx
index 6bb15f5b3aae..c7ab9a2983e9 100644
--- a/cui/source/options/doclinkdialog.cxx
+++ b/cui/source/options/doclinkdialog.cxx
@@ -21,7 +21,6 @@
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
#include <comphelper/processfactory.hxx>
-#include <cuires.hrc>
#include <strings.hrc>
#include <svl/filenotation.hxx>
#include <vcl/layout.hxx>
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index 103d03fc3ef4..d667c943dd8e 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -27,8 +27,7 @@
#include <svtools/fontsubstconfig.hxx>
#include "fontsubs.hxx"
#include <dialmgr.hxx>
-#include "helpid.hrc"
-#include <cuires.hrc>
+#include "helpids.h"
#include <o3tl/make_unique.hxx>
/*********************************************************************/
diff --git a/cui/source/options/optaccessibility.cxx b/cui/source/options/optaccessibility.cxx
index fe0e37aae829..517fb17a683f 100644
--- a/cui/source/options/optaccessibility.cxx
+++ b/cui/source/options/optaccessibility.cxx
@@ -19,7 +19,6 @@
#include <optaccessibility.hxx>
#include <dialmgr.hxx>
-#include <cuires.hrc>
#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
#include <officecfg/Office/Common.hxx>
diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx
index f814ad27e3b7..2c011898d484 100644
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -24,7 +24,6 @@
#include <editeng/unolingu.hxx>
#include <o3tl/any.hxx>
#include <dialmgr.hxx>
-#include <cuires.hrc>
#include <i18nlangtag/mslangid.hxx>
#include <svl/asiancfg.hxx>
#include <com/sun/star/lang/Locale.hpp>
diff --git a/cui/source/options/optbasic.cxx b/cui/source/options/optbasic.cxx
index 632ccb923404..9795c1d9dd4f 100644
--- a/cui/source/options/optbasic.cxx
+++ b/cui/source/options/optbasic.cxx
@@ -21,7 +21,6 @@
#include <basic/codecompletecache.hxx>
#include <iostream>
#include <officecfg/Office/BasicIDE.hxx>
-#include <cuires.hrc>
SvxBasicIDEOptionsPage::SvxBasicIDEOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet )
: SfxTabPage(pParent, "OptBasicIDEPage", "cui/ui/optbasicidepage.ui", &rSet)
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index 00ba47e4e0b9..975f1d64e3ec 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -18,7 +18,6 @@
*/
#include <unotools/pathoptions.hxx>
-#include <cuires.hrc>
#include "optchart.hxx"
#include <dialmgr.hxx>
#include <vcl/builderfactory.hxx>
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 1a64c728eddb..7d70a458dc79 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -35,10 +35,9 @@
#include <vcl/settings.hxx>
#include <vcl/builderfactory.hxx>
#include <svx/svxdlg.hxx>
-#include <helpid.hrc>
+#include <helpids.h>
#include <dialmgr.hxx>
#include "optcolor.hxx"
-#include <cuires.hrc>
#include <strings.hrc>
#include <svx/dlgutil.hxx>
diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx
index 4f258008d0cb..ca8e9137ae8b 100644
--- a/cui/source/options/optctl.cxx
+++ b/cui/source/options/optctl.cxx
@@ -19,7 +19,6 @@
#include "optctl.hxx"
#include <dialmgr.hxx>
-#include <cuires.hrc>
#include <svl/ctloptions.hxx>
// class SvxCTLOptionsPage -----------------------------------------------------
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index 9f0f8bd434a4..9d1bfcf90825 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -33,7 +33,6 @@
#include <svx/dialogs.hrc>
#include <linguistic/misc.hxx>
-#include <cuires.hrc>
#include <strings.hrc>
#include "optdict.hxx"
#include <dialmgr.hxx>
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index 6964977d3a39..cd39dcac4e54 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -21,8 +21,7 @@
#include <unotools/moduleoptions.hxx>
#include <unotools/fltrcfg.hxx>
#include "optfltr.hxx"
-#include <cuires.hrc>
-#include "helpid.hrc"
+#include "helpids.h"
#include "strings.hrc"
#include <dialmgr.hxx>
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 180f6f185bfa..84ecbb97fb83 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -54,7 +54,6 @@
#include <svx/xpool.hxx>
#include <svx/dlgutil.hxx>
#include "cuitabarea.hxx"
-#include <cuires.hrc>
#include <editeng/unolingu.hxx>
#include <editeng/langitem.hxx>
#include <comphelper/processfactory.hxx>
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index 991041917020..7f9e975007eb 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -26,7 +26,6 @@
#include <vcl/edit.hxx>
#include <vcl/settings.hxx>
-#include <cuires.hrc>
#include <unotools/useroptions.hxx>
#include "cuioptgenrl.hxx"
#include <dialmgr.hxx>
diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx
index 2f449abbddd3..2b47d835870f 100644
--- a/cui/source/options/opthtml.cxx
+++ b/cui/source/options/opthtml.cxx
@@ -20,8 +20,7 @@
#include <svtools/langtab.hxx>
#include <svtools/htmlcfg.hxx>
#include "opthtml.hxx"
-#include <cuires.hrc>
-#include "helpid.hrc"
+#include "helpids.h"
#include <dialmgr.hxx>
#include <sal/macros.h>
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index db2ff453dbd4..434462ca04a7 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -49,8 +49,7 @@
#include <dialmgr.hxx>
#include "optinet2.hxx"
#include <svx/svxdlg.hxx>
-#include <cuires.hrc>
-#include "helpid.hrc"
+#include "helpids.h"
#include <svx/ofaitem.hxx>
#include <sfx2/htmlmode.hxx>
#include <svx/svxids.hrc>
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 8141a5b4ccc0..1fc450aa1217 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -31,8 +31,7 @@
#include <officecfg/Office/Common.hxx>
#include <svtools/miscopt.hxx>
-#include <cuires.hrc>
-#include "helpid.hrc"
+#include "helpids.h"
#include <strings.hrc>
#include <vcl/svapp.hxx>
#include <vcl/help.hxx>
diff --git a/cui/source/options/optjsearch.cxx b/cui/source/options/optjsearch.cxx
index bbe587a61a67..0c709cc57aa8 100644
--- a/cui/source/options/optjsearch.cxx
+++ b/cui/source/options/optjsearch.cxx
@@ -19,7 +19,6 @@
#include <unotools/searchopt.hxx>
#include <i18nutil/transliteration.hxx>
-#include <cuires.hrc>
#include <dialmgr.hxx>
#include <optjsearch.hxx>
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 1c85f8469c07..0f4d942194a6 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -56,8 +56,7 @@
#include <editeng/optitems.hxx>
#include "optlingu.hxx"
#include <dialmgr.hxx>
-#include <cuires.hrc>
-#include "helpid.hrc"
+#include "helpids.h"
#include <strings.hrc>
#include <ucbhelper/content.hxx>
diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx
index 27cb5b48f383..be9d6606c881 100644
--- a/cui/source/options/optmemory.cxx
+++ b/cui/source/options/optmemory.cxx
@@ -54,8 +54,7 @@
#include "cuitabarea.hxx"
#include "optmemory.hxx"
#include <svx/ofaitem.hxx>
-#include <cuires.hrc>
-#include "helpid.hrc"
+#include "helpids.h"
#include <dialmgr.hxx>
#include <limits>
diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx
index 0fb1e1a172ee..731f385976be 100644
--- a/cui/source/options/optopencl.cxx
+++ b/cui/source/options/optopencl.cxx
@@ -34,7 +34,6 @@
#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
#include <com/sun/star/util/XChangesBatch.hpp>
-#include <cuires.hrc>
#include <strings.hrc>
#include <dialmgr.hxx>
#include "optopencl.hxx"
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 08b0243a6f02..683683cd8e74 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -34,8 +34,7 @@
#include "optpath.hxx"
#include <dialmgr.hxx>
-#include <cuires.hrc>
-#include "helpid.hrc"
+#include "helpids.h"
#include "strings.hrc"
#include <comphelper/configuration.hxx>
#include <comphelper/processfactory.hxx>
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index fc9fb88fa9be..763d902cbd03 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -19,10 +19,6 @@
#include <svl/eitem.hxx>
#include <svl/intitem.hxx>
-
-#include "optsave.hrc"
-#include <cuires.hrc>
-
#include "optsave.hxx"
#include <dialmgr.hxx>
#include <comphelper/processfactory.hxx>
@@ -36,6 +32,7 @@
#include <com/sun/star/container/XEnumeration.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/util/XFlushable.hpp>
+#include <sfx2/sfxsids.hrc>
#include <sfx2/docfilt.hxx>
#include <vcl/fixed.hxx>
#include <unotools/configitem.hxx>
diff --git a/cui/source/options/optsave.hrc b/cui/source/options/optsave.hrc
deleted file mode 100644
index 485d35ed7765..000000000000
--- a/cui/source/options/optsave.hrc
+++ /dev/null
@@ -1,35 +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 INCLUDED_CUI_SOURCE_OPTIONS_OPTSAVE_HRC
-#define INCLUDED_CUI_SOURCE_OPTIONS_OPTSAVE_HRC
-
-// defines ------------------------------------------------------------------
-
-#define APP_WRITER 0
-#define APP_WRITER_WEB 1
-#define APP_WRITER_GLOBAL 2
-#define APP_CALC 3
-#define APP_IMPRESS 4
-#define APP_DRAW 5
-#define APP_MATH 6
-#define APP_COUNT 7
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx
index b30d8c6f0c41..f6957eede0c9 100644
--- a/cui/source/options/optsave.hxx
+++ b/cui/source/options/optsave.hxx
@@ -26,6 +26,15 @@
#include <vcl/lstbox.hxx>
#include <sfx2/tabdlg.hxx>
+#define APP_WRITER 0
+#define APP_WRITER_WEB 1
+#define APP_WRITER_GLOBAL 2
+#define APP_CALC 3
+#define APP_IMPRESS 4
+#define APP_DRAW 5
+#define APP_MATH 6
+#define APP_COUNT 7
+
namespace com { namespace sun { namespace star {
namespace beans {
struct PropertyValue;
diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx
index fef9e395d7f9..e5576efbcb4d 100644
--- a/cui/source/options/optupdt.cxx
+++ b/cui/source/options/optupdt.cxx
@@ -23,7 +23,6 @@
#include <svl/zforlist.hxx>
#include "optupdt.hxx"
#include <dialmgr.hxx>
-#include <cuires.hrc>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/configuration/theDefaultProvider.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx
index 9594e6c644c0..60228c8a9550 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -28,7 +28,6 @@
#include <vcl/graphicfilter.hxx>
#include <vcl/mnemonic.hxx>
#include <dialmgr.hxx>
-#include "cuires.hrc"
#include "strings.hrc"
#include "personalization.hrc"
diff --git a/cui/source/options/securityoptions.cxx b/cui/source/options/securityoptions.cxx
index d849d3e77056..0b9d6dd7c94e 100644
--- a/cui/source/options/securityoptions.cxx
+++ b/cui/source/options/securityoptions.cxx
@@ -19,7 +19,6 @@
#include <unotools/securityoptions.hxx>
#include <dialmgr.hxx>
-#include <cuires.hrc>
#include "securityoptions.hxx"
namespace
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 685d2a49e2a0..f3f75e8c60cb 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -22,10 +22,9 @@
#include <svx/dialogs.hrc>
-#include "cuires.hrc"
#include "strings.hrc"
#include "treeopt.hrc"
-#include "helpid.hrc"
+#include "helpids.h"
#include "cfgchart.hxx"
#include "connpoolconfig.hxx"
diff --git a/cui/source/options/tsaurls.cxx b/cui/source/options/tsaurls.cxx
index b1db289d4b13..ea206fb44fd8 100644
--- a/cui/source/options/tsaurls.cxx
+++ b/cui/source/options/tsaurls.cxx
@@ -9,7 +9,6 @@
#include <officecfg/Office/Common.hxx>
#include <svx/svxdlg.hxx>
-#include <cuires.hrc>
#include <comphelper/sequence.hxx>
#include "tsaurls.hxx"
diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx
index b7717221c8af..f6b3aa614f80 100644
--- a/cui/source/options/webconninfo.cxx
+++ b/cui/source/options/webconninfo.cxx
@@ -19,7 +19,6 @@
#include "webconninfo.hxx"
#include <dialmgr.hxx>
-#include <cuires.hrc>
#include <sal/macros.h>
#include <com/sun/star/task/InteractionHandler.hpp>
#include <com/sun/star/task/PasswordContainer.hpp>
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index dfa4a531870d..34b33726acea 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -21,7 +21,6 @@
#include <editeng/svxenum.hxx>
#include <svx/dialogs.hrc>
-#include <cuires.hrc>
#include <strings.hrc>
#include <bitmaps.hlst>
#include <svx/rotmodit.hxx>
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index def8d3de5013..308fa651eb78 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -48,11 +48,10 @@
#include <o3tl/make_unique.hxx>
#include "autocdlg.hxx"
-#include "helpid.hrc"
+#include "helpids.h"
#include <editeng/acorrcfg.hxx>
#include <editeng/svxacorr.hxx>
#include "cuicharmap.hxx"
-#include "cuires.hrc"
#include "strings.hrc"
#include <editeng/unolingu.hxx>
#include <dialmgr.hxx>
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 343e4ff2722f..2ac62da42ad3 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -31,10 +31,9 @@
#include <svx/dialogs.hrc>
#include <svx/strings.hrc>
-#include <cuires.hrc>
#include <strings.hrc>
#include <svx/dialmgr.hxx>
-#include <editeng/memberids.hrc>
+#include <editeng/memberids.h>
#include <editeng/eerdll.hxx>
#include <editeng/brushitem.hxx>
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index dbcb814ced3e..5dde954380bb 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx